Commit Graph

5073 Commits

Author SHA1 Message Date
Matthias Mailänder
5029ac705f Update to .NET 4.5 2016-05-19 21:24:21 +02:00
Tamás Viszkok
522e937597 Hotkeys for move viewport to map edge 2016-05-16 20:26:59 +02:00
reaperrr
9707cd9be9 Merge pull request #11299 from reaperrr/dmgstate-upgrade
Introduce trait granting upgrades at specified DamageStates
2016-05-16 20:00:53 +02:00
reaperrr
407a061c0a Merge pull request #11176 from pchote/lobby-trait-checkbox-prep
Query lobby checkbox state via their owning traits.
2016-05-16 19:00:35 +02:00
reaperrr
9cca92942e Merge pull request #11130 from viszkoktamas/viewportBookmark
Add hotkeys for save areas of the map
2016-05-16 18:37:56 +02:00
Viszkok Tamás
a89376daf0 Added hotkeys for save areas of the map 2016-05-16 14:01:49 +02:00
reaperrr
dcd057d032 Make DamageStates flags 2016-05-16 02:41:10 +02:00
Matthias Mailänder
b4cbb52d27 Merge pull request #11206 from evgeniysergeev/spatial
SpatiallyPartitioned fixup for d2
2016-05-15 14:46:53 +02:00
Paul Chote
35af6b5b91 Apply minor style fixes to DeveloperMode. 2016-05-14 18:54:44 +01:00
Paul Chote
7e49ae7eb0 Prepare DeveloperMode code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
1eba0bea13 Prepare Shroud code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
a0b5b5ce66 Move initial map exploration to Shroud. 2016-05-14 18:54:44 +01:00
reaperrr
f31ea658ef Merge pull request #11148 from pchote/improve-scroll-input
Expose separate middle and right mouse scroll config.
2016-05-13 22:44:18 +02:00
evgeniysergeev
7e7b3f505d SpatiallyPartitioned fixup for d2
BoundsToBinRowsAndCols fixup for negative width or height

Using Math.Min and Math.Max utils instead of '?:'
2016-05-10 22:39:46 +03:00
abcdefg30
4fbb3334bf Merge pull request #11238 from obrakmann/fix-globalchat-nre
Fix a spurious NRE in GlobalChat
2016-05-08 14:02:12 +02:00
reaperrr
eb6157f81e Merge pull request #11197 from pchote/add-sysinfo-opt-out-prompt
Add sysinfo opt out prompt
2016-05-08 13:10:55 +02:00
Oliver Brakmann
d049413c26 Fix a spurious NRE in GlobalChat 2016-05-08 12:35:50 +02:00
Matthias Mailänder
1bc4200128 Merge pull request #11136 from SzabKel/musicButtons
Added music controlling hotkeys. Closes #3231
2016-05-03 07:16:05 +02:00
Paul Chote
98faa15d62 Add an opt-out prompt for system information collection. 2016-04-27 22:14:26 +01:00
abcdefg30
a717ab6763 Merge pull request #11135 from obrakmann/fix11127_zoom-pxldbl-interaction
Fix PixelDoubling not working properly after zooming with mousewheel
2016-04-23 11:55:53 +02:00
reaperrr
b28f588733 Merge pull request #11124 from pchote/tileset-depth
Add tileset depth metadata support.
2016-04-21 22:59:42 +02:00
Oliver Brakmann
77ba2b4f13 Fix PixelDoubling not working properly after zooming with mousewheel
I decided to write it this way (instead of setting `Game.Settings.Graphics.PixelDouble` in `Viewport.Zoom` appropriately) because I see the double pixel setting as the user's preference that the game uses at the start of a match and which should not be changed only because the user decided to zoom in a bit.
2016-04-21 22:04:39 +02:00
Paul Chote
756d2428d9 Add depth support to TileSet. 2016-04-21 17:23:08 +01:00
RoosterDragon
178fcfaf8c Use Contains method on Selection when possible.
This allows the set to be utilized for a fast check, rather than degrading to a linear search via LINQ.
2016-04-19 21:19:36 +01:00
Matthias Mailänder
6f151d8096 Merge pull request #11084 from cjshmyr/chatprefix
Move Spectators & Team chat labels before player nickname
2016-04-18 15:23:17 +02:00
Paul Chote
9d02c53638 Expose separate middle and right mouse scroll config. 2016-04-17 21:27:20 -04:00
Oliver Brakmann
2051976f5b Merge pull request #11138 from Mailaender/dispose-xccdb
Made XccGlobalDatabase disposable
2016-04-17 21:27:49 +02:00
Oliver Brakmann
0df7e2361b Merge pull request #11140 from Mailaender/map-preview-package-nre
Fixed NullReferenceExceptions if package opening fails.
2016-04-17 20:23:59 +02:00
szabkel
1b4a42d3d9 Added MusicControllerLogic, now we can handle audio buttons anywhere in the game. 2016-04-17 16:11:42 +02:00
Matthias Mailänder
48ea9dc300 Fix NRE if package download fails or is corrupted. 2016-04-17 15:57:00 +02:00
Matthias Mailänder
4719a085bb Dispose global mix database.dat properly. 2016-04-17 14:09:52 +02:00
Matthias Mailänder
e127ada598 Merge pull request #11098 from pchote/vertex-secondary-texcoords
Replace SheetType.DualIndexed with secondary texture coordinates on Vertex.
2016-04-17 10:22:57 +02:00
Paul Chote
d59488d496 Merge pull request #11076 from obrakmann/low-funds-warning-2
Fix issues with the insufficient funds warning
2016-04-16 18:00:40 +01:00
Paul Chote
95a5689b9e Merge pull request #11104 from obrakmann/fix11074-lobby-ready-map-install
Fix ready checkbox in the lobby being unusable after installing a map
2016-04-16 17:42:04 +01:00
Paul Chote
5d0990f1c6 Removing remaining SheetType.DualIndexed plumbing. 2016-04-15 16:53:37 -04:00
Paul Chote
3a37551812 Remove SheetType.DualIndexed from terrain rendering. 2016-04-15 16:53:37 -04:00
Paul Chote
b68fee9521 Remove SheetType.DualIndexed from voxel rendering. 2016-04-15 16:46:47 -04:00
Paul Chote
7c67b10d28 Add a secondary texture coordinate to Vertex. 2016-04-15 16:46:47 -04:00
Paul Chote
2915db67c4 Add depth buffer support to sprites and sequences. 2016-04-15 09:42:29 -04:00
Paul Chote
2634643d91 Write z data to the depth buffer. 2016-04-15 09:42:29 -04:00
Oliver Brakmann
b25eb81a42 Fix ready checkbox in the lobby being unusable after installing a map 2016-04-12 18:30:37 +02:00
Oliver Brakmann
87e1acfc9f Re-implement the insufficient funds warning in a simpler manner 2016-04-11 19:06:18 +02:00
Matthias Mailänder
3a3be979f3 Merge pull request #11081 from pchote/fix-left-click-orders
Fix left click orders
2016-04-10 17:32:14 +02:00
reaperrr
0861c9f6fa Merge pull request #11058 from pchote/terrain-vertex-depth
Use vertex depths for rendering terrain depth preview.
2016-04-10 16:13:50 +02:00
Paul Chote
7315ffbcb7 Fix outdated file headers. 2016-04-10 09:41:12 -04:00
Paul Chote
dabea59b7d Pass depth scale factors to vertex shaders. 2016-04-10 09:41:01 -04:00
Paul Chote
c00ef40151 Add float3 support to TerrainSpriteLayer. 2016-04-10 09:41:01 -04:00
Paul Chote
19a276da2b Replace float[] with float3 in voxel renderer. 2016-04-10 09:41:01 -04:00
Paul Chote
a8dda39a72 Introduce float3 type. 2016-04-10 09:41:01 -04:00
Curtis Shmyr
6a492035fc Move Spectators and Team chat labels before nicknames 2016-04-09 16:37:35 -06:00