Commit Graph

246 Commits

Author SHA1 Message Date
Oliver Brakmann
d741c86ed8 Merge pull request #9549 from pchote/lobby-music
Add a music player to the game lobby.
2015-10-08 21:40:04 +02:00
Matthias Mailänder
d199ba5048 Merge pull request #9520 from obrakmann/make-scroll-keys-remappable
Add hotkey configuration for scroll keys
2015-10-08 20:15:55 +02:00
Paul Chote
73adfe0bfc Add music player to lobby. 2015-10-05 22:43:19 +01:00
abcdefg30
36b7524d37 Merge pull request #9491 from cjshmyr/gameinprogress
Fix incorrect "In progress" time shown in server browser
2015-10-05 16:34:13 +02:00
Curtis Shmyr
2b3432e68e Fix incorrect gametime in progress shown in server browser 2015-10-04 17:08:10 -06:00
gitTerebi
86c57a270b Add hotkey configuration for scroll keys 2015-10-04 22:04:44 +02:00
Paul Chote
c6740b1bcb Inherit lobby bin size from the root. 2015-10-04 17:26:38 +01:00
Paul Chote
b73f775ef2 Move the player bin header to lobby-players.yaml. 2015-10-04 17:26:32 +01:00
Joppy Furr
07273fa666 Add support for Tiberian Sun style right-click-and-drag scrolling
This patch introduces support for the right-click-and-drag scrolling that
is available in Tiberian Sun and Red Alert 2. It can be enabled by
selecting "Joystick" scrolling in the Input settings.

The speed of the scroll is proportional to the product of the distance of
the drag, and the Scroll Speed selected in the Input settings menu.

A side-effect of this is that events previously tied to right clicks on
the world are now based on the release of the click rather than the press.

The "Middle-Mouse Scrolling:" option is renamed
to "Mouse Scrolling Method:"
2015-10-04 16:22:55 +13:00
Oliver Brakmann
8c6872fff0 Merge pull request #9387 from pchote/mission-gamespeed
Add game speed dropdown to the mission browser.
2015-09-28 21:05:30 +02:00
Paul Chote
3322f34e7b Add game speed option for missions. 2015-09-27 10:28:34 +01:00
Pavel Penev
642468ce0c Add MapGrid class
MapGrid is a mod Manifest field which includes (and thus makes redundant) TileSize, TileShape, SubCells info and MaximumTerrainHeight.
2015-09-27 04:14:43 +03:00
Paul Chote
7ceb283034 Merge pull request #9263 from penev92/assetInstallation
Move asset installation to the ModChooser
2015-09-26 10:40:04 +01:00
abcdefg30
e989ce2ef2 Fix possible crashes in the MapChooserLogic 2015-09-24 16:57:03 +02:00
Pavel Penev
c41446e022 Merge pull request #9139 from Mailaender/editor-cash-counter
Added a total resource cash counter to the map editor
2015-09-24 15:07:15 +03:00
Pavel Penev
2c27452a44 Merge pull request #9386 from atlimit8/FinishWrappingActorInfoTraits
Finish wrapping ActorInfo.Traits
2015-09-24 14:40:07 +03:00
atlimit8
8e0f5bb943 Merge pull request #9361 from visav/player-count-map-filter
Extends MapChooserLogic.mapFilter to match against PlayerCount
2015-09-23 18:46:45 -05:00
Pavel Penev
50ea12723c Streamline mod changing after installation
- Don't return to the ModChooser after a successful installation.
 - Don't reload the ModChooser after a cancelled installation.
2015-09-23 15:33:06 +03:00
Pavel Penev
4401e1aa0c Pipe mod music installation through the ModChooser 2015-09-23 15:33:03 +03:00
Pavel Penev
0e7122acad Enable mod asset installation from CD from the modchooser 2015-09-23 15:33:00 +03:00
Pavel Penev
bdcb0fee58 Enable mod asset package downloading from the modchooser 2015-09-23 15:32:57 +03:00
Pavel Penev
d472805fc6 Add mod asset checks to ModBrowserLogic 2015-09-23 15:32:37 +03:00
atlimit8
9acf121eb1 Replace ActorInfo.Traits.WithInterface with ActorInfo.TraitInfos<T>() 2015-09-21 15:50:57 -05:00
atlimit8
6e39a5e264 Replace .WithInterface<T>().Any() => .HasTraitInfo<T>() 2015-09-21 15:50:57 -05:00
Visa Varjus
b9f7fb4ebc adds map filtering by PlayerCount 2015-09-20 22:06:46 +03:00
Paul Chote
ef55d646f7 Unstatic the Sound class. 2015-09-20 14:11:06 +01:00
Matthias Mailänder
fea59346a5 add a total resource cash counter to the map editor 2015-09-19 18:21:07 +02:00
abcdefg30
97346e1833 Merge pull request #9355 from ChaoticMind/socket_crash
Catch exception when hosting server on busy port
2015-09-19 17:27:11 +02:00
abcdefg30
6cbcd66b87 Merge pull request #9215 from LipkeGu/upnp_externalip_fix
Move NAT Logic from ClientTooltipLogic into its own Function at LobbyUtils.
2015-09-19 17:22:02 +02:00
atlimit8
09984683a7 Add ActorInfo.TraitInfo[OrDefault]<T>() requiring ITraitIfo types 2015-09-19 09:56:14 -05:00
atlimit8
6970959ef1 .Trait[OrDefault]<Trait> => .Info.Traits.Get[OrDefault]<TraitInfo> where applicable 2015-09-19 09:49:24 -05:00
atlimit8
8162fa27ab Add ActorInfo.HasTraitInfo<T>() requiring ITraitInfo types 2015-09-19 09:49:24 -05:00
atlimit8
85fab45451 Remove Actor.HasTrait<T>() 2015-09-19 09:49:23 -05:00
Kevin Azzam
f4461b292e Generalize error message when creating a server fails 2015-09-17 20:03:05 +02:00
Kevin Azzam
89f2a479bf Catch exception when hosting server on busy port
Closes #9354
2015-09-16 13:08:23 +02:00
Guido L
8a1a6945f1 Fix and move Logic into its own Function in LobbyUtils 2015-09-14 23:19:50 +02:00
abcdefg30
f78aea4f90 Merge pull request #8636 from Mailaender/irc
Added the in-game IRC client again
2015-09-13 17:14:36 +02:00
Matthias Mailänder
dae3b62d2a add a simple in-game IRC client 2015-09-09 20:56:05 +02:00
Paul Chote
1109ec53d1 Update UI timers for variable game speed. 2015-09-06 17:48:42 +01:00
Paul Chote
301b698c81 Add game speed dropdown to the lobby. 2015-09-06 17:48:41 +01:00
atlimit8
8250f223c4 More HashSet trait fields & Lint support 2015-09-05 16:59:30 -05:00
abcdefg30
67966ad704 Merge pull request #8731 from deniz1a/simplify-lobby-logic
Simplifies Start button logic in lobby
2015-08-24 21:27:05 +02:00
Pavel Penev
dec2696e76 Change "Change faction" lobby command 2015-08-22 23:34:40 +03:00
Pavel Penev
05e081043b Rename last usages of "race" in UI YAML files 2015-08-22 23:34:38 +03:00
Pavel Penev
09f67d18bb Some internal "race" to "faction" renaming 2015-08-22 23:34:36 +03:00
Matthias Mailänder
9a861bdfba Merge pull request #8700 from deniz1a/rename-disable-shroud
Renames "Disable Shroud & Fog" debug option to "Observer view".
2015-08-20 20:41:01 +02:00
Matthias Mailänder
41698ab8bb show the current coordinate at the top 2015-08-17 21:21:52 +02:00
abcdefg30
dae70321c2 Merge pull request #8792 from deniz1a/reveal-shroud
Changes shroud lobby setting from disabling shroud to revealing it.
2015-08-12 22:04:15 +02:00
deniz1a
e59cd78322 Fixes observer widgets being loaded multiple times at game end. 2015-08-11 12:31:23 +03:00
Matthias Mailänder
88b98fa8ef Merge pull request #8975 from penev92/bleed_rename
Some more renaming from "country" and "race" to "faction"
2015-08-08 16:13:16 +02:00