Commit Graph

16092 Commits

Author SHA1 Message Date
abcdefg30
3f333b0f0a Merge pull request #7948 from penev92/bleed_fixCarryalls
Fix carryalls unreserving issue
2015-04-17 20:47:00 +02: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
penev92
cc73ba09ab Fix flag-related crash for scripted "players" 2015-04-13 23:36:29 +03: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
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
RoosterDragon
84dffce7c1 Added an extension method to clone bitmaps with a 32bbpArgb pixel format. 2015-04-11 21:05:46 +01:00
RoosterDragon
c1787a8368 Don't process images with the wrong pixel format in MapCache. 2015-04-11 15:20:16 +01:00
Oliver Brakmann
1a21421217 Merge pull request #7921 from ScottNZ/balance-stuff
Move ra silo to defense queue
2015-04-11 11:39:49 +02:00
ScottNZ
79ca6a401a Move ra silo to defense queue 2015-04-11 17:10:47 +12:00
Oliver Brakmann
b6f015641e Fix path to freetype library in SharpFont's .dll mapping for OS X 2015-04-11 00:11:52 +02:00
RoosterDragon
7883355481 Validate PixelFormat of source bitmap argument in FastCopyIntoSprite. 2015-04-10 19:54:03 +01:00
RoosterDragon
5dfcc3e9d0 Convert custom map previews that are not using PixelFormat.Format32bppArgb. 2015-04-10 19:54:02 +01:00
Matthias Mailänder
03e25c73d8 Merge pull request #7910 from obrakmann/make-docs-with-version
Set version before creating docs
2015-04-10 20:22:33 +02:00
reaperrr
6e14d96815 Merge pull request #7912 from Mailaender/ts-missile-silo-owner-fix
Fixed the missile silo being visible to GDI commanders
2015-04-10 13:17:18 +02:00
reaperrr
b45dd32242 Merge pull request #7914 from penev92/bleed_authors
Add penev92 to AUTHORS
2015-04-10 12:49:28 +02:00
Oliver Brakmann
8bb19defd6 Only set the version once in appveyor.yaml 2015-04-10 12:10:12 +02:00
penev92
fd674962e3 Add penev92 to AUTHORS 2015-04-10 09:19:02 +03:00
Matthias Mailänder
7a4f7527a4 fix missile silo being visible to GDI commanders 2015-04-10 06:36:36 +02:00
Oliver Brakmann
9aa16c95da Set version before creating docs
Since the version string gets embedded into the created documentation.
2015-04-10 00:13:19 +02:00
Pavel Penev
87b7cc4527 Merge pull request #7906 from reaperrr/public-classes
Made JamsMissiles and Hovers classes public
2015-04-09 07:10:01 -07:00
reaperrr
94c5ef7260 Make JamsMissiles and Hovers classes public 2015-04-09 15:38:49 +02:00
Pavel Penev
6a66cea01f Merge pull request #7903 from obrakmann/fix_allies01_power
Fix issues in Allies01 and Monster Tank Madness
2015-04-08 10:23:24 -07:00
Oliver Brakmann
f5579bc749 Fix tooltips in mission Monster Tank Madness 2015-04-08 15:55:00 +02:00
Oliver Brakmann
1c1a9f3065 Fix power levels in mission Allies01 2015-04-08 15:54:34 +02:00
Pavel Penev
0617eb2e59 Merge pull request #7881 from ScottNZ/balance-stuff
Misc ra balance changes, pt. 2
2015-04-07 16:12:38 -07:00
Pavel Penev
37ec903c67 Merge pull request #7896 from reaperrr/missile-hit
Tweaks RA and TD helicopter weapon minimum ranges
2015-04-07 16:07:47 -07:00
reaperrr
7ddd6aab93 Make helicopters move backwards when target is too close
'Too close' as in closer than weapons' MinRange.
2015-04-08 00:51:24 +02:00