Commit Graph

17375 Commits

Author SHA1 Message Date
Pavel Penev
9df371b393 Merge pull request #7970 from obrakmann/fix-rgb-map-previews
Fix RGB map previews
2015-04-18 14:15:53 +03:00
Oliver Brakmann
cda7310b25 Convert RGB map preview image files to RGBA 2015-04-18 11:35:01 +02:00
Oliver Brakmann
b363c2c51e Don't unnecessarily discard 24bpp map previews
Those images now get converted on-the-fly by the game.
2015-04-18 11:27:23 +02:00
Matthias Mailänder
7157cc0a9f unhardcode and self-document render sequences 2015-04-18 08:44:43 +02:00
abcdefg30
2ebd2cac98 Remove bogus hotkey ("Hothey") definition 2015-04-17 22:19:34 +02:00
abcdefg30
e7724eeb2e Correct TRNSPORT prerequisites 2015-04-17 22:19:33 +02:00
abcdefg30
dab0cd7bda Added BuildLimit: 1 to GHOST and HMEC 2015-04-17 22:19:32 +02:00
abcdefg30
03e81f9739 Fix HMEC walking animation 2015-04-17 22:19:31 +02:00
abcdefg30
6b9a359bce Adjust some selection bounds
No idea what regressed them.
2015-04-17 22:18:57 +02:00
penev92
b4112dc2c3 Change RA harv.shp 2015-04-17 23:12:21 +03:00
Oliver Brakmann
fe8b3d91b1 Merge pull request #7951 from RoosterDragon/fix-browser-images
Fix mod browser previews
2015-04-17 21:52:38 +02:00
Pavel Penev
8f05d8a931 Merge pull request #7966 from obrakmann/fix7927
Allow players locked to unplayable factions in the lobby
2015-04-17 12:37:49 -07:00
Oliver Brakmann
28310ce2fc Allow players locked to unplayable factions in the lobby 2015-04-17 20:50:15 +02:00
abcdefg30
3f333b0f0a Merge pull request #7948 from penev92/bleed_fixCarryalls
Fix carryalls unreserving issue
2015-04-17 20:47:00 +02:00
RoosterDragon
9c93001c84 Convert to 32bbp internally in FastCopyIntoSprite.
This avoids the need for callers to ensure the pixel format is correct, but ensures that the copying succeeds when the format is different.
2015-04-17 18:50:49 +01:00
Oliver Brakmann
f77d6f6044 Merge pull request #7959 from Rydra/upstream/pathfinderFix
BugFix for #7955
2015-04-16 22:22:26 +02:00
abcdefg30
cfa59d611a Merge pull request #7844 from reaperrr/ts-rules-split
Split TS rules for infantry, structures and vehicles
2015-04-16 22:00:38 +02:00
reaperrr
62bb9677a6 Remove obsolete gagreen sequence
and removed a superflous newline
2015-04-16 21:47:38 +02:00
Pavel Penev
0dfbc7b651 Merge pull request #7961 from reaperrr/fix-preview-bpp
Convert TD and D2k previews to 32bpp
2015-04-16 10:49:23 -07:00
reaperrr
8b07c0826b Convert TD and D2k previews to 32bpp 2015-04-16 19:12:16 +02:00
David Jiménez
6d96a43341 Fixes #7955. Improves pathfinder performance a bit. 2015-04-15 23:43:14 +02:00
Matthias Mailänder
012226c481 Merge pull request #7952 from RoosterDragon/cache-render-traits
Cache render traits in Actor
2015-04-15 07:01:22 +02:00
penev92
665c82305e Fix carryalls telling carryables to unreserve when they are reserved for a different carryall;
Reserve carryable in FreeActorWithDelivery
2015-04-15 00:40:06 +03:00
RoosterDragon
106816a547 Cache the IRenderModifier and IRender traits in Actor.
Previously we just cached the query object, but now we cache the full results. This avoids having to re-evaluate them every render.
2015-04-14 20:15:45 +01:00
abcdefg30
af1dfd3d17 Merge pull request #7947 from penev92/bleed_diplomacyWindow
Fix flag-related crash for scripted "players"

Closes: #7929
2015-04-14 15:20:39 +02:00
LunaticEdit
575b568c6a EndOfStream first chance exceptions on server
The server class reads the memory stream in a forever loop until an
EndOfStreamException occurs. This causes repeated first chance
exceptions due to EndOfStreamException. This change verifies that the
memory stream's reader position is not past the length of the memory
stream.
2015-04-13 19:09:32 -04:00
penev92
cc73ba09ab Fix flag-related crash for scripted "players" 2015-04-13 23:36:29 +03:00
Moshe Schmidt
7d6f367d84 Added CnC: gdi05b 2015-04-13 22:31:51 +02:00
reaperrr
fbb245d569 Removes armament pistol from TS civilian default
Adds pistols to civ1 and civ3.
2015-04-13 17:31:49 +02:00
reaperrr
f7a20ceb62 Clean up infantry sequences 2015-04-13 17:11:52 +02:00
Taryn Hill
0717ca57ea Implement DeployToUpgrade.
Expose some deploy-related cursors to yaml.
2015-04-13 10:04:03 -05:00
reaperrr
24057ee5bb Clean up structure sequences
Now that we have tileset codes, those bitrotted file name definitions are no longer needed.
2015-04-13 17:00:01 +02:00
Robin Neatherway
2dba45ebac Remove version information from NuGet folder names
This makes the names consistent and prevents changes in versions of
dependencies from breaking the build.
2015-04-13 15:41:17 +01:00
Paul Chote
03572ecb3a Remove binaries from thirdparty/osx dir. 2015-04-12 21:22:26 +01:00
Paul Chote
85cd7308b4 Replace OSX launcher with a native-code version.
- Binary files hosted externally.
- Fixes dialogs hijacking Finder.
- Fixes dock icon being lost when restarting.
- Adds openra:// url handling.
- Adds .orarep file handling.
- Minimum OS X version is now 10.6.
2015-04-12 21:21:46 +01:00
reaperrr
1c06f43924 Redistribute defense/support structure rules for more consistency 2015-04-12 19:10:51 +02:00
reaperrr
cebdcdddc9 Rename yamls for actors available to both sides from player-* to shared-* 2015-04-12 19:10:51 +02:00
reaperrr
194fe8d926 Improve rules yaml order in mod.yaml a little 2015-04-12 19:10:50 +02:00
reaperrr
71b9665ad6 structures.yaml split into faction-specific structure and defense yamls 2015-04-12 19:10:49 +02:00
reaperrr
bc7af30ae9 Split TS vehicles.yaml into gdi-, nod- and player-vehicles.yaml 2015-04-12 18:59:55 +02:00
reaperrr
4fe72d95c3 Rename civilian.yaml to civilian-structures.yaml
Move Sandbags to civilian structures.
Remove GAGREEN.
2015-04-12 18:59:54 +02:00
reaperrr
f1cb333d6b Split TS infantry.yaml into gdi-, nod- and player-infantry.yaml 2015-04-12 18:59:53 +02:00
Paul Chote
70c9bca847 Merge pull request #7936 from obrakmann/fix7935_random_factions_in_missions
Allow non-selectable factions for players if LockRace is set
2015-04-12 17:49:39 +01:00
abcdefg30
8b090423a3 Merge pull request #7924 from Mailaender/windmill
Added the windmill to the Red Alert civilian buildings
2015-04-12 18:30:58 +02:00
Oliver Brakmann
7b1b17df4a Allow non-selectable factions for players if LockRace is set 2015-04-12 15:27:25 +02:00
Matthias Mailänder
cae7d7cffa add the windmill 2015-04-12 13:31:56 +02:00
abcdefg30
83e9c51940 Merge pull request #7923 from Mailaender/lighthouse
Added a lighthouse to the Red Alert civilian buildings
2015-04-12 13:13:43 +02:00
Matthias Mailänder
18064370ee Merge pull request #7919 from RoosterDragon/fix-previews
Fix custom map previews
2015-04-12 12:52:25 +02:00
Matthias Mailänder
fc0ad15a5b Merge pull request #7915 from obrakmann/fix7911_osx_freetype_lib_path
Fix path to freetype library in SharpFont's .dll mapping for OS X
2015-04-12 12:50:25 +02:00
Matthias Mailänder
0cde0c1224 add the light house 2015-04-12 08:11:13 +02:00