1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

599 Commits

Author SHA1 Message Date
OpenRCT2 git bot
4019dee3ca Merge Localisation/master into OpenRCT2/develop. 2016-02-01 04:00:15 +00:00
Ted John
d299dca475 Merge pull request #2844 from janisozaur/network-version
Decouple network version from OpenRCT2 version
2016-01-30 22:37:30 +00:00
Michał Janiszewski
e814cdd271 Decouple network version from OpenRCT2 version
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
2016-01-30 22:44:43 +01:00
OpenRCT2 git bot
083ec35362 Merge Localisation/master into OpenRCT2/develop. 2016-01-30 04:00:12 +00:00
OpenRCT2 git bot
b23c27c6e9 Merge Localisation/master into OpenRCT2/develop. 2016-01-29 04:00:13 +00:00
OpenRCT2 git bot
7a6cdbcfed Merge Localisation/master into OpenRCT2/develop. 2016-01-28 04:00:13 +00:00
OpenRCT2 git bot
cc40a8292c Merge Localisation/master into OpenRCT2/develop. 2016-01-27 04:00:12 +00:00
OpenRCT2 git bot
c79541a3a7 Merge Localisation/master into OpenRCT2/develop. 2016-01-26 04:00:13 +00:00
Michał Janiszewski
dd37ca05c3 Disable opening cheats window in MP
When connecting to a server, also reset cheats.

This should fix #2811
2016-01-25 21:44:09 +01:00
Chad Anderson
bc92446d32 New Game Option
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
2016-01-25 13:15:26 -07:00
OpenRCT2 git bot
233e3ff058 Merge Localisation/master into OpenRCT2/develop. 2016-01-25 04:00:13 +00:00
Aaron van Geffen
2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John
6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer
MP groups and permissions
2016-01-24 12:29:27 +00:00
zsilencer
85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
zsilencer
db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer
5a43e313b5 add can't kick host error 2016-01-23 13:29:17 -07:00
zsilencer
5f7c81083e add separate Clear Landscape action and fix a bug 2016-01-23 13:19:17 -07:00
zsilencer
de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
zsilencer
ef4fc84634 consolidate actions list 2016-01-23 11:34:05 -07:00
OpenRCT2 git bot
1b2edef980 Merge Localisation/master into OpenRCT2/develop. 2016-01-23 04:00:13 +00:00
zsilencer
c557f02f4b fix issue with incorrect game_command_playerid 2016-01-22 16:57:00 -07:00
zsilencer
1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer
7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -07:00
zsilencer
6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
OpenRCT2 git bot
d4864108a6 Merge Localisation/master into OpenRCT2/develop. 2016-01-20 04:00:14 +00:00
Ted John
cee61f8929 Merge Localisation/master into OpenRCT2/develop. 2016-01-18 04:00:18 +00:00
Ted John
805b0dbb05 Merge Localisation/master into OpenRCT2/develop. 2016-01-17 04:00:18 +00:00
Ted John
57420cbc66 Merge Localisation/master into OpenRCT2/develop. 2016-01-15 04:00:19 +00:00
Ted John
0450aa0057 Merge Localisation/master into OpenRCT2/develop. 2016-01-14 04:00:19 +00:00
Marijn van der Werf
a85b2d3982 Show ALT as OPTION in keyboard shortcut list 2016-01-12 23:05:03 +01:00
Marijn van der Werf
dd8239f684 Add space after 'CMD + ' 2016-01-12 22:52:34 +01:00
Marijn van der Werf
72739e8cd8 Allow setting CMD as shortcut key 2016-01-12 22:29:36 +01:00
Ted John
16537ada4a Merge Localisation/master into OpenRCT2/develop. 2016-01-11 04:00:17 +00:00
Gymnasiast
24448f2734 Show names of missing expansion packs and use localised names; cleanup 2016-01-09 22:55:10 +01:00
Ted John
73b0e403c4 Merge Localisation/master into OpenRCT2/develop. 2016-01-07 04:00:19 +00:00
Ted John
de99a6c3dc Merge Localisation/master into OpenRCT2/develop. 2016-01-06 04:00:20 +00:00
Ted John
79b7913b78 Merge Localisation/master into OpenRCT2/develop. 2016-01-05 04:00:19 +00:00
Ted John
e4052b332f Merge Localisation/master into OpenRCT2/develop. 2016-01-04 04:00:18 +00:00
IntelOrca
ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
Gymnasiast
4c6dbd0702 Add entries for RCT1/AA/LL scenarios 2016-01-02 21:05:58 +00:00
IntelOrca
82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
Aaron van Geffen
f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen
15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen
448d4fb657 New string ids for scenario select screen. 2016-01-02 21:00:02 +00:00
Ted John
c1d33e7308 Merge Localisation/master into OpenRCT2/develop. 2016-01-02 04:00:17 +00:00
Hielke Morsink
829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink
ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink
389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink
64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink
d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00