Commit Graph

580 Commits

Author SHA1 Message Date
Paul Chote
6628bc046f Add a Map reference to LobbyLogic. 2016-02-06 22:30:46 +00:00
Paul Chote
4ec3997be6 Rename LobbyPreview.Map to LobbyLogic.MapPreview. 2016-02-06 22:30:25 +00:00
Paul Chote
7a5678ec39 Move MapVisibility to MapPreview. 2016-02-06 22:28:35 +00:00
Oliver Brakmann
a6e98620c0 Merge pull request #10650 from pchote/remove-fragile-diplomacy
Remove fragile diplomacy.
2016-02-06 22:55:55 +01:00
Paul Chote
4a12e7bafc Load mod yaml via the virtual filesystem. 2016-02-06 16:30:23 +00:00
Oliver Brakmann
bb044a34d5 Merge pull request #10670 from RockyTV/rockytv
Disable 1 human versus bots games
2016-02-06 15:36:22 +01:00
Alexandre Oliveira
989bf4f807 Disable 1 human versus bots games
Changed the Server.LockBots setting to Server.DisableSinglePlayer.

If the setting is enabled, and there is only one client in the server,
the game won't start.
2016-02-03 20:32:34 -02:00
Paul Chote
00945dc9ef Tidy IReadOnlyPackage interface and implementations. 2016-02-01 22:49:12 +00:00
abcdefg30
1cc8330c51 Merge pull request #10535 from pchote/mix-type-autodetection
Auto-detect mix hash type.
2016-01-31 22:57:14 +01:00
Oliver Brakmann
5fdce51699 Merge pull request #10551 from RockyTV/rockytv
Change CONNECTIONFAILED_PANEL title if server requires password
2016-01-31 16:14:21 +01:00
Matthias Mailänder
10ebd7e48d Merge pull request #10649 from obrakmann/radar-team-colors
Added option to show team colors on radar map
2016-01-30 21:53:14 +01:00
Paul Chote
73b3f20921 Remove fragile alliances feature. 2016-01-30 20:47:50 +00:00
Paul Chote
ab921682c4 Rewrite yaml merger. 2016-01-30 15:03:56 +00:00
DArcy Rush
eb795909da Implement player stance colors
Adds an option to display actors on radar and
support weapon timers in colors denoting the
diplomatic stance toward the player.
2016-01-30 15:46:55 +01:00
reaperrr
c19383472f Merge pull request #10624 from pchote/overhaul-color-validator
Fix color validator issues and increase color picker palette size.
2016-01-29 23:57:46 +01:00
Paul Chote
31cc399579 Remove unused package annotations. 2016-01-29 20:41:20 +00:00
Paul Chote
f90b21b1b7 Fix D2K installation on case sensitive filesystems. 2016-01-29 19:56:17 +00:00
Paul Chote
cc4ca839d9 Bind color mixer to validator range. 2016-01-27 21:43:55 +00:00
Matthias Mailänder
7aa6921c72 Merge pull request #10557 from abcdefg30/queueCleanup
More cleanup in the production logic
2016-01-23 10:52:33 +01:00
Oliver Brakmann
97d10da39b Merge pull request #10478 from pchote/fix-replay-support-timers
Sync replay support timers to original game time.
2016-01-22 23:19:25 +01:00
abcdefg30
ed3f3706f9 Reduce trait lookups further by adding a BuildableInfo parameter to GetBuildTime 2016-01-21 22:29:01 +01:00
abcdefg30
17daac11a1 Avoid unnecessary lookups in the production logic
by improving the GetBuildTime method and moving lookups around.
2016-01-21 22:24:49 +01:00
abcdefg30
6bbab081d1 Fix wrong indentation in ProductionPaletteWidget.cs 2016-01-21 15:41:34 +01:00
Alexandre Oliveira
6f715a6a4e Change CONNECTIONFAILED_PANEL title if server requires password
If the server requires a password, display Password Required instead of the usual Connection Error title.
2016-01-20 18:44:36 -02:00
abcdefg30
d416138cec Merge pull request #10542 from RoosterDragon/simplify
General Cleanup
2016-01-18 11:37:30 +01:00
Matthias Mailänder
40debbde28 Merge pull request #10508 from pchote/cancel-tooltip-on-menu
Cancel tooltips when opening the ingame menu.
2016-01-18 07:30:11 +01:00
RoosterDragon
8e89a6a696 Simplify names, remove unused usings, remove redundant casts. 2016-01-17 21:35:36 +00:00
Oliver Brakmann
aaeb715006 Merge pull request #10246 from penev92/terrainPalettes
Allow tile templates to define their own palette
2016-01-17 21:39:28 +01:00
Pavel Penev
288de5284e Fix TerrainTemplatePreviewWidget to use proper palettes 2016-01-17 19:02:18 +02:00
Pavel Penev
861d1368a4 Unhardcode internal terrain palette name from all over the codebase 2016-01-17 19:02:16 +02:00
Oliver Brakmann
addbe6d564 Merge pull request #10472 from Mailaender/guard-refactor
Cleaned up the Guard code
2016-01-16 23:09:19 +01:00
Matthias Mailänder
56313e6d8a Merge pull request #10525 from pchote/split-package-interfaces
Split IPackage into IReadOnlyPackage and IReadWritePackage
2016-01-16 14:19:54 +01:00
Matthias Mailänder
5fc6af6566 Merge pull request #10493 from pchote/fix-menu-hover
Update button mouseover when switching menus.
2016-01-16 14:10:24 +01:00
abcdefg30
2ccf142ce9 Merge pull request #10492 from pchote/fix-mission-order
Sort missions by their order in missions.yaml
2016-01-16 13:26:26 +01:00
abcdefg30
aa23928e7b Merge pull request #10514 from pchote/blink-install-button
Blink install map button.
2016-01-16 13:16:31 +01:00
abcdefg30
ee1cf5ff87 Merge pull request #10523 from pchote/fix-pbog-gameover-crash
Fix a crash if an order generator is active when a game ends.
2016-01-16 12:04:45 +01:00
Paul Chote
f8d0b97e8d Split IPackage into IReadOnlyPackage and IReadWritePackage. 2016-01-16 10:37:21 +00:00
Paul Chote
24570f0bdf Merge pull request #10490 from penev92/packages
Some renaming from "folder" to "package"
2016-01-15 22:40:02 +00:00
Paul Chote
99ba155a16 Fix a crash if an order generator is active when a game ends. 2016-01-15 21:13:22 +00:00
Paul Chote
44b1402080 Update button mouseover when switching menus. 2016-01-15 20:57:39 +00:00
Paul Chote
4bf887a905 Extract a helper method for switching menu types. 2016-01-15 20:57:39 +00:00
Oliver Brakmann
8ebee425ab Merge pull request #10264 from whinis/bleed
Restart button for missions
2016-01-15 21:55:02 +01:00
Whinis
9059e3e2c8 Changes to the RestartGame function to make it more streamlined
Removal of PromptAbortAction and inclusion into PromptConfirmAction
Changes to prevent a restart button being required for all mods
ConfirmAction
Addtion of named parameters to PromptConfirmAction
Moved StartGame from MissionBrowserLogic.cs to Game.cs
2016-01-15 15:34:00 -05:00
RoosterDragon
999965fc82 Merge pull request #10491 from pchote/fix-country-overflow
Fix MP browser country name overflow
2016-01-15 19:54:09 +00:00
RoosterDragon
db520a8560 Merge pull request #10476 from pchote/sound-device-labels
Truncate SoundDevice label at the UI level.
2016-01-15 19:53:42 +00:00
Pavel Penev
e3f5697f7e Some more renaming from "folder" to "package" 2016-01-14 22:08:49 +02:00
Oliver Brakmann
da4f04acfb Merge pull request #10509 from pchote/cancel-pbog-on-menu
Cancel custom input modes when opening the menu.
2016-01-14 20:29:30 +01:00
Alexander Heinz
e0c033fe99 restart button added for singleplayer in cnc, ra, d2k 2016-01-14 11:53:31 -05:00
Paul Chote
6d017b09f3 Blink install map button. 2016-01-14 00:27:30 +00:00
Paul Chote
a639d9587d Disable slot admin dropdown when empty. 2016-01-13 23:45:25 +00:00