Commit Graph

10866 Commits

Author SHA1 Message Date
Matthias Mailänder
c62788a9a6 Merge pull request #4031 from pchote/sdl2
Add a SDL2-GL renderer.
2013-10-31 11:48:50 -07:00
Matthias Mailänder
cf1f7e0d1e Merge pull request #4037 from Phrohdoh/EngineerFalseAttackWarning
Fixes #3963
2013-10-31 10:58:34 -07:00
Taryn Hill
dd17a99ab5 Checks to make sure Attacker is not null.
Ignores self-attacking.
Ignores friendly-fire that does <= 0 damage (repairs).
2013-10-31 11:56:01 -04:00
Matthias Mailänder
094d5929b1 Merge pull request #4023 from pchote/map-fixes
Map changes
2013-10-30 15:45:37 -07:00
Matthias Mailänder
9146efa0ed compressed regular maps without custom rules to oramap 2013-10-31 08:46:30 +13:00
Paul Chote
1870e31662 Double clicking a map in the chooser now selects it. 2013-10-31 08:46:16 +13:00
Paul Chote
773c0a0356 Fix player spawns in Deterring Democracy. 2013-10-31 08:46:16 +13:00
Paul Chote
dea5bf852f Add Haos Ridges C&C map.
Includes minor tweaks to the description and Options.
2013-10-31 08:46:15 +13:00
Paul Chote
b1a60eface Add SDL2 renderer based on SDL2# wrapper. Closes #3315.
SDL2# binary was built from commit 70af91f84493a924a3c1da46ae6209bb5f7222e3.
2013-10-30 22:52:18 +13:00
Paul Chote
71c6124c10 Tidy renderer dependencies. 2013-10-30 22:31:34 +13:00
Paul Chote
d1c9c6d76d Split text input into its own event. 2013-10-30 20:08:02 +13:00
Paul Chote
ae8475620d Tidy IInputHandler. 2013-10-30 20:07:04 +13:00
Paul Chote
5722d2226a Merge pull request #4021 from cjshmyr/capturing
Renamed Capture traits to ExternalCapture & LegacyCapture traits to Capture
2013-10-27 23:10:42 -07:00
Paul Chote
d9b6106da5 Merge pull request #4022 from cjshmyr/infantrytab
Move Zombie up in the RA infantry tab build palette order
2013-10-27 23:06:02 -07:00
Paul Chote
7deb34e625 Merge pull request #3917 from Mailaender/map-folders
Removed hard-coded map folders
2013-10-27 23:03:14 -07:00
Curtis Shmyr
888bab8753 Move Zombie up in the infantry tab build palette order 2013-10-27 18:02:20 -06:00
Curtis Shmyr
2229bbf985 Rename LegacyCapture related traits to Capture 2013-10-27 17:25:44 -06:00
Curtis Shmyr
c1e5be380e Rename Capture related traits to ExternalCapture 2013-10-27 17:25:44 -06:00
Matthias Mailänder
b86ddbf66b Merge pull request #4019 from cjshmyr/tilesetfix
Fixes #3865
2013-10-27 12:32:39 -07:00
Curtis Shmyr
0eaf1bb289 Use proper tile ID for RA anthills 2013-10-27 13:20:50 -06:00
Matthias Mailänder
74692bde66 load maps only from MapFolders defined separately in mod.yaml 2013-10-27 09:22:10 +01:00
Matthias Mailänder
b5186c00b7 Merge pull request #4015 from pchote/weapon-polish
C&C weapon polish
2013-10-27 01:08:29 -07:00
Paul Chote
e4bc965776 Add grenade toss sound (from C&C demo). 2013-10-27 20:38:40 +13:00
Paul Chote
686ea378dd Remove building explosion sound from MLRS. 2013-10-27 20:38:40 +13:00
Paul Chote
c66a0d2cca Split MLRS damage across 8 rockets for nicer visuals. 2013-10-27 20:38:40 +13:00
Matthias Mailänder
c87c4cfda2 translate ^ and ~ as FileSystem.Mount does 2013-10-27 08:02:05 +01:00
Matthias Mailänder
166b727c0b StyleCop cleanup 2013-10-27 08:02:05 +01:00
Matthias Mailänder
0b73491e3f CamelCase for FileSystem folder 2013-10-27 08:02:05 +01:00
Matthias Mailänder
32851e624c specify map folders in mod.yaml
closes #3544
2013-10-27 08:02:05 +01:00
Matthias Mailänder
ee9b64595a Merge pull request #4014 from pchote/engineer-buildings
Allow engineers to repair buildings (C&C)
2013-10-26 23:52:18 -07:00
Paul Chote
2241fa851b Allow engineers to repair structures. 2013-10-27 18:11:04 +13:00
Paul Chote
e57cc2b250 Fix biolab ownership in East vs West 3.
Change Creeps -> Neutral to prevent units from attacking it by default.
2013-10-27 18:10:54 +13:00
Paul Chote
d478ae462a Merge pull request #4009 from Mailaender/deb-rm-fail
cleaned up the DEB packaging script
2013-10-26 13:43:38 -07:00
Paul Chote
6eef03227f Merge pull request #4011 from Mailaender/uibits
Additional polishing for UI buttons
2013-10-26 13:42:01 -07:00
Matthias Mailänder
3f708aea3f replaced the yellow highlighted placeholder everywhere 2013-10-26 12:07:09 +02:00
Matthias Mailänder
a71f861638 darker wine red for the highlighted button 2013-10-26 12:07:09 +02:00
Matthias Mailänder
83dffd2720 disabled art for textfields 2013-10-26 12:06:59 +02:00
Matthias Mailänder
afc5db6843 Merge pull request #4008 from pchote/r8-fix
Improved R8 support.
2013-10-26 01:19:43 -07:00
Matthias Mailänder
4132c6f9a9 Merge pull request #4006 from pchote/alternate-stand-animations
Alternate stand animations
2013-10-26 00:54:13 -07:00
Matthias Mailänder
dfb4b1c54c removed pointless sed for .desktop for DEB
we don't hard-code the path to the binaries anymore
2013-10-26 09:20:11 +02:00
Paul Chote
536013f2d2 Rescale the custom palette from 0-128. 2013-10-26 19:15:05 +13:00
Paul Chote
ff21ec1605 Add PaletteFromR8 for loading embedded palettes.
The frames that define a custom palette are:
Frame range ->  offset (mem offset)
         38 ->   12007 (22063136)
        178 ->  159947 (21859680)
3494 - 3501 -> 2437846 (23366680)
3502 - 3509 -> 2443858 (23422744)
3510 - 3511 -> 2459105 (23363608)
3621 - 3625 -> 2572352 (23550488)
3739 - 3742 -> 2676956 (23534796)
2013-10-26 17:54:56 +13:00
Paul Chote
3fe3b4d088 Fieldloader support for longs. 2013-10-26 17:54:56 +13:00
Paul Chote
84ffb0de05 Add Subtractive blend mode for d2k move-flash. 2013-10-26 17:54:56 +13:00
Paul Chote
5cd29f999d Palette header comes *after* the frame. Fixes #3728. 2013-10-26 17:54:56 +13:00
Paul Chote
5af03db4e1 Merge pull request #4007 from pchote/fixes
Fix playtest breakages.
2013-10-25 16:46:12 -07:00
Paul Chote
cc3ca217af Fix RPM build. 2013-10-26 12:23:53 +13:00
Paul Chote
f2a0614622 Fix chat for defeated players. 2013-10-26 12:20:50 +13:00
Paul Chote
11b131e70b Hook up RA infantry. 2013-10-26 11:05:08 +13:00
Paul Chote
7f0922b034 Hook up C&C infantry. 2013-10-26 11:05:07 +13:00