Commit Graph

6130 Commits

Author SHA1 Message Date
deniz1a
5546298866 Merges LeaveMapLogic into GameInfoLogic.
Opens options menu when game ends.

Closes settings or music window before opening options menu.

Moves game end video playback logic from GameInfoLogic to
LoadIngamePlayerOrObserverUILogic.

Improves menu buttons.

Stop video from playing on fatal lua script error
2015-07-25 18:56:24 +03:00
Pavel Penev
ea3a680eda Merge pull request #8725 from reaperrr/bye-rendersimple-pr1
Step towards removing RenderSimple and its derivatives (Part 1)
2015-07-25 18:43:13 +03:00
Oliver Brakmann
8c766a4a79 Merge pull request #8721 from penev92/bleed_rename
Some more Country -> Faction renaming
2015-07-25 17:10:35 +02:00
Oliver Brakmann
229a059e06 Merge pull request #8771 from deniz1a/support-power-bounds
Aligns observer support power timers to the left edge of the screen.
2015-07-25 13:13:00 +02:00
Paul Chote
655f4d30ff Merge pull request #8769 from obrakmann/lobby-esc-hotkey
Remove ESC hotkey from lobby 'Back' button
2015-07-25 10:12:50 +01:00
reaperrr
2e9a4b78a3 Refactor RenderEditorOnly into RenderSpritesEditorOnly + WithSpriteBody 2015-07-25 10:28:07 +02:00
reaperrr
fe346e5401 Replace RenderBuilding where already possible 2015-07-25 10:28:06 +02:00
deniz1a
32e2a06743 Aligns observer support power timers to the left edge of the screen. 2015-07-25 03:20:44 +03:00
Pavel Penev
ded5a2b16a Merge pull request #8742 from abcdefg30/withpalettedeath
Support multiple WithDeathAnimation traits
2015-07-25 03:10:43 +03:00
penev92
b34810c1d3 Rename AddRaceSuffixLogic to AddFactionSuffixLogic 2015-07-25 00:39:29 +03:00
penev92
9a36bf6bcd Rename CountryTooltipLogic to FactionTooltipLogic 2015-07-25 00:20:59 +03:00
Oliver Brakmann
6467593124 Remove ESC hotkey from lobby 'Back' button 2015-07-24 23:09:30 +02:00
Paul Chote
34ffb3772f Merge pull request #8728 from reaperrr/wgb
Replaced RenderGunboat with WithGunboatBody
2015-07-24 20:54:55 +01:00
Paul Chote
0c360b5bd0 Merge pull request #8743 from GraionDilach/remove-outtakes
Remove Outtakes (the blooper song) from C&C.
2015-07-24 20:20:06 +01:00
Matthias Mailänder
a0dc38c252 Merge pull request #8752 from obrakmann/optional-target-lines
Added option to turn off rendering of target lines in the settings
2015-07-20 22:05:05 +02:00
Matthias Mailänder
0296d4e6c7 Merge pull request #8720 from abcdefg30/parashadow
Use the correct ShadowPalette for d2k paradrops
2015-07-20 21:56:50 +02:00
figrita
ab3ab6f230 Added option to turn off rendering of target lines in the settings 2015-07-20 00:05:29 +02:00
Oliver Brakmann
30696ea23d Merge pull request #8693 from abcdefg30/difficultyA02
Add different difficulties for allies02
2015-07-19 23:33:29 +02:00
Oliver Brakmann
e4521c7e15 Remove shellmap script from d2k 2015-07-19 19:40:44 +02:00
abcdefg30
a5f921e843 Merge pull request #8726 from GraionDilach/d2k-menumusic
Restore the original setup of the menu and score musics in the D2k mod.
2015-07-19 13:48:21 +02:00
abcdefg30
df1cdca0dc Add die4 and "fix" ExplosionDeath 2015-07-19 11:30:15 +02:00
abcdefg30
4cf045bdd8 Fix TS death animation palettes 2015-07-19 11:30:14 +02:00
Zimmermann Gyula
40f116a452 Remove Outtakes (the blooper song) from C&C. 2015-07-19 11:28:31 +02:00
Oliver Brakmann
d5c65b59b0 Fix scripted paradrops
A recent PR changed ParaDrop from an Effect to an Activity. Idle triggers in the mission scripts however have already queued activities for the paradropped units, so the ParaDrop activity would only run once the first activity had finished (which could never happen).
2015-07-18 21:22:40 +02:00
abcdefg30
3e7134ae6b Fix bogus paradropping in survival01 2015-07-18 21:22:39 +02:00
abcdefg30
df02604a9a Fix WithParachute on ^Vehicle 2015-07-18 21:22:39 +02:00
reaperrr
abec89fa26 Replaced RenderGunboat with WithGunboatBody
Based on WithSpriteBody.
2015-07-18 18:21:10 +02:00
Matthias Mailänder
d174d0065e choose a color with better contrast against background 2015-07-18 17:23:45 +02:00
Matthias Mailänder
860bfdadc4 extract server browser colors to configurable yaml 2015-07-18 17:22:39 +02:00
Zimmermann Gyula
2de5bbe02b Restore the original setup of the menu and score musics in the D2k mod. 2015-07-16 16:56:04 +02:00
Oliver Brakmann
1d9c6251c0 Merge pull request #8658 from matija-hustic/higher_level_timed_upgrades
Higher level timed upgrades
2015-07-15 20:51:51 +02:00
Matija Hustić
25ce915a0c Fixes D2K regression due to unspecified sprite file name. 2015-07-15 10:32:42 +01:00
Oliver Brakmann
2e1c1533a5 Merge pull request #8339 from matija-hustic/paradrop_activity
Step in the direction of RA2 paratroopers
2015-07-14 22:29:02 +02:00
Oliver Brakmann
c8c564fac5 Merge pull request #8714 from matija-hustic/spy_veterancy_leftovers
Spy veterancy leftovers
2015-07-14 22:17:11 +02:00
Matija Hustić
2f01c389cf Manually upgraded YAMLs. 2015-07-14 20:39:09 +01:00
Matija Hustić
71d73ac738 Automatically upgraded YAMLs. 2015-07-14 20:39:08 +01:00
Oliver Brakmann
f7327418e4 Merge pull request #8712 from Phrohdoh/fix#rename-pwl
Rename ProduceableWithLevel to ProducibleWithLevel.
2015-07-14 21:22:57 +02:00
Oliver Brakmann
2a248471a9 Merge pull request #8715 from abcdefg30/ownerrow
Remove OwnerRow from explosive barrels
2015-07-14 21:14:00 +02:00
abcdefg30
5ddf94e624 HIJACKER can not be build by allies 2015-07-14 21:12:41 +02:00
abcdefg30
384a67def5 Add different difficulties to allies02 2015-07-14 21:12:40 +02:00
abcdefg30
4556a6ebb3 Adjust the objectives in allies02 2015-07-14 21:12:40 +02:00
abcdefg30
958d839802 Remove Ukraine from allies02 2015-07-14 21:12:39 +02:00
Matija Hustić
0a1a53bb4b Disables veterancy when infiltrating war factory in Allies05. 2015-07-14 20:11:34 +01:00
Oliver Brakmann
380cf22477 Merge pull request #8661 from penev92/bleed_renameCountry
Rename the Country trait to Faction
2015-07-14 21:05:52 +02:00
Oliver Brakmann
4ed7a4ce8a Merge pull request #8659 from penev92/bleed_playerReference
Rename PlayerReference.Race to Faction
2015-07-14 20:15:56 +02:00
abcdefg30
a273e2fc99 Remove OwnerRow from explosive barrels 2015-07-14 19:16:03 +02:00
penev92
0f0497b74d Add an upgrade rule for Country -> Faction 2015-07-14 18:50:41 +03:00
Matija Hustić
b2a26c57bc Adjusted other users of timed upgrades. 2015-07-14 03:08:48 +01:00
Taryn Hill
a3d740aa44 Rename ProduceableWithLevel to ProducibleWithLevel. 2015-07-13 21:04:26 -05:00
Oliver Brakmann
b58d1037ea Merge pull request #8666 from GraionDilach/revert-emp-targeting
Reverted friendly units' immunity to EMP.
2015-07-13 22:24:08 +02:00