Commit Graph

17452 Commits

Author SHA1 Message Date
Oliver Brakmann
618ba6342c Fix not being able to select enemy units 2015-07-27 13:07:07 +02:00
Paul Chote
d9d37d54c8 Merge pull request #8782 from Mailaender/ts-tmpl
Added the Tiberian Sun Temple of Nod
2015-07-26 11:07:29 +01:00
Paul Chote
3dfd6360ac Merge pull request #8793 from atlimit8/SandwormNoLzay
Remove unnecessary Lazy<>s from Sandworm.cs
2015-07-26 11:06:44 +01:00
Oliver Brakmann
bb40d57944 Merge pull request #8791 from penev92/bleed_cancelActivity
Fix an NRE when cancelling repair orders on units at the wrong time
2015-07-26 11:09:56 +02:00
Matthias Mailänder
4d81cc262c Merge pull request #8783 from obrakmann/reenable-mission-replays
Re-enable mission replays
2015-07-26 09:44:19 +02:00
Matthias Mailänder
2119b26e18 Merge pull request #8790 from pchote/restore-aircraft-height
Revert "Lower aircraft altitude"
2015-07-26 08:51:31 +02:00
atlimit8
cc3b286fa6 Remove unnecessary Lazy<>s from Sandworm.cs 2015-07-25 23:10:42 -05:00
Pavel Penev
cccf5c5931 Check if the inner activity is null before trying to cancel it 2015-07-26 02:15:38 +03:00
Paul Chote
04a71f4dc5 Revert "Fix fallrates for parachutable things to match lowered release altitude"
This reverts commit f7a02eeca5.
2015-07-25 23:31:38 +01:00
Paul Chote
2a93a95245 Revert "Lower aircraft altitude"
This reverts commit d53cfafde9.
2015-07-25 23:27:06 +01:00
Oliver Brakmann
b749548e76 Re-enable replays for missions 2015-07-25 20:51:39 +02:00
Oliver Brakmann
4de03e991c Remove revealing views from observer mode in missions 2015-07-25 20:51:39 +02:00
Matthias Mailänder
a56ecc3f6b add Temple of Nod 2015-07-25 20:30:41 +02:00
Oliver Brakmann
808bbb8d2e Merge pull request #8105 from deniz1a/scrollafterend
Removes LeaveMap window.
2015-07-25 18:13:57 +02:00
Oliver Brakmann
a77e9c0d87 Delay loading the observer UI until the game is actually over 2015-07-25 18:56:25 +03:00
Oliver Brakmann
a725d63b0c Remove World.ObserveAfterWinOrLose
Fixes RenderPlayer for "All Players" view.
2015-07-25 18:56:24 +03:00
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
deniz1a
ef143e5f8a Freezes map after game ends.
Adds newline.

Disables keyboard hotkeys for units after game ends.
2015-07-25 18:56:23 +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
reaperrr
65c95eb2ee Adapted WithHarvestAnimation to account for damage stages 2015-07-25 16:17:08 +02:00
Paul Chote
537c252e83 Merge pull request #8779 from GraionDilach/fix-gameover
Fix Observers/players using the nofogcheat crashing during win/lose the game.
2015-07-25 14:47:28 +01:00
penev92
4616828b28 Deprecate PlayerProperties.Race 2015-07-25 16:43:34 +03:00
Pavel Penev
4ad9067f51 Merge pull request #8776 from pchote/editor-path-fix
Create the user map directory if required.
2015-07-25 16:36:24 +03:00
Zimmermann Gyula
8f43ae96ae Fix Observers crashing during win/lose the game. 2015-07-25 14:04:47 +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
Paul Chote
c70ebfab74 Create the user map directory if required.
Fixes #8772.
2015-07-25 09:36:29 +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
reaperrr
74b948342e Fix WithSpriteBody PlayCustomAnimationRepeating
Lacked damage stage awareness.
2015-07-25 10:28:05 +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
7c1ef2231d Rename RaceInit to FactionInit 2015-07-25 00:39:31 +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
penev92
dc30e5a46d Rename LobbyCountry to LobbyFaction 2015-07-25 00:20:58 +03:00
Oliver Brakmann
6467593124 Remove ESC hotkey from lobby 'Back' button 2015-07-24 23:09:30 +02:00
Oliver Brakmann
7d56209f3b Merge pull request #8680 from deniz1a/textfields
Some text field improvements.
2015-07-24 23:00:12 +02:00
deniz1a
f5b4befc75 Resets chat text field in lobby when Esc is pressed. 2015-07-24 23:21:37 +03:00
deniz1a
7337afcfeb Improves player name text field in game lobby.
Esc key resets text field to unmodified value and yields focus.
2015-07-24 23:13:17 +03:00
deniz1a
a51cc27fb5 Improves frame limit and player name text fields in settings menu.
Esc key resets text field to unedited value and yields focus.
2015-07-24 23:09:16 +03:00
deniz1a
4fcf73921f Improves filter text field in asset browser.
Text field takes keyboard focus by default.
Esc key resets filter or closes window if text field is empty.
2015-07-24 23:09:15 +03:00
deniz1a
d8c996f74a Fixes spelling in comment. 2015-07-24 23:09:15 +03: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
6fb60f4d99 Merge pull request #8762 from RoosterDragon/filesystem-dispose
Release file handles when unmounting file system
2015-07-24 20:46:35 +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
RoosterDragon
ce73bb909e Make IFolder interface inherently IDisposable.
Fix up implementations to ensure they dispose any stream they acquire, and ensure the constructor will not leave a stream open if it fails. Dispose folders when unmounting them in GlobalFileSystem.
2015-07-23 22:31:20 +01:00
Oliver Brakmann
1e7da8514a Merge pull request #8735 from reaperrr/safe-pf-changes
Minor pathfinder-related changes (preparation for mobile refactor)
2015-07-22 14:42:52 +02:00
Oliver Brakmann
5a1b6bb644 Merge pull request #8622 from reaperrr/hv-refactor2
Refactored harvester resource search
2015-07-22 14:26:31 +02:00