Ted John
6e22877ced
Merge pull request #2803 from janisozaur/fixes
...
Game commands' argument validation
2016-01-24 19:37:20 +00:00
Michał Janiszewski
95e3895b89
Game commands' argument validation
2016-01-24 19:31:40 +01:00
Ted John
80550ca365
Merge pull request #2752 from Broxzier/fix_money_invalidation
...
Fix #2750 invalidate top toolbar when toggling the use of money.
2016-01-24 16:10:50 +00:00
IntelOrca
0360a808c3
fix shortcut reading and defaults
2016-01-24 16:09:45 +00:00
Ted John
d0a95bc7b7
Merge pull request #2796 from AaronVanGeffen/shortcut_options
...
Allow assigning a shortcut to the options window
2016-01-24 15:52:15 +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
duncanspumpkin
7cf156a86a
Fix #2771 . Observation towers now spin correctly.
...
Issue was caused by mistyping the variable name
2016-01-24 08:15:10 +00:00
duncanspumpkin
b39a48a792
Fix cable lift data logging
2016-01-24 08:04:13 +00:00
zsilencer
5aec23e2b0
forgot to include default group in grouplist packet
2016-01-23 18:57:56 -07:00
zsilencer
0e00c1e3ce
load and save groups
2016-01-23 18:05:53 -07:00
zsilencer
8c608b6f6c
fix issues with a few game commands
2016-01-23 17:33:08 -07:00
Ted John
b5f9fa4bc4
Merge pull request #2801 from LRFLEW/osx-focus
...
Regain window focus on OS X file dialog close
2016-01-24 00:30:52 +00:00
LRFLEW
44dd98135d
Regain window focus on OS X file dialog close
2016-01-23 17:25:32 -07:00
Ted John
e316fa60b2
Merge pull request #2800 from LRFLEW/espanol
...
Allow mixed language configuration in Xcode project
2016-01-24 00:06:32 +00:00
zsilencer
85d77bb838
show last action in player window
2016-01-23 16:46:52 -07:00
LRFLEW
6576878540
Allow mixed language configuration in Xcode project
2016-01-23 16:36:55 -07:00
zsilencer
845c7ad067
disallow peep pickup if group does not have permission
2016-01-23 16:36:16 -07:00
IntelOrca
eb29b14681
Merge branch 'Giantaxe-develop' into develop
2016-01-23 21:54:20 +00:00
robin clemens
6db4536da9
1. Added --password=<str> to headless server mode to configure a password.
...
2. added default_password under [network] to configure a default password for headless server mode
2016-01-23 21:53:02 +00:00
zsilencer
5a72cb02f1
fix small issue caused by some RCT2_ADDRESS_COMMAND_MAP being used as 32 bit vars
2016-01-23 14:42:36 -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
Ted John
75b9e4a653
Merge pull request #2793 from OpenRCT2/implement-ride-create-vehicles
...
Implement ride create vehicles
2016-01-23 19:13:09 +00:00
IntelOrca
4c1605f268
refactor and format old C++ code
2016-01-23 18:58:31 +00:00
duncanspumpkin
a79a6969eb
Fixed miss centered vehicles. Fixed incorrect starting track progress. Fix newlines.
2016-01-23 18:50:36 +00:00
zsilencer
ef4fc84634
consolidate actions list
2016-01-23 11:34:05 -07:00
Ted John
36a4cd2fa0
Merge pull request #2798 from janisozaur/lodepng-cleanup
...
Cleanup unused lodepng stuff
2016-01-23 16:49:12 +00:00
Michał Janiszewski
8599468760
Cleanup unused lodepng stuff
2016-01-23 17:13:15 +01:00
Ted John
d621fafb3e
Merge pull request #2795 from AaronVanGeffen/invalidate_ride_window
...
Repopulate ride list when invalidating the ride construction window
2016-01-23 14:51:48 +00:00
Aaron van Geffen
18a8ef0924
Repopulate ride list when invalidating the ride construction window.
...
When toggling the 'select by track type' option with the ride construction window open,
the ride list would not be repopulated until the player switched tabs. This commit
adds repopulation on window invalidation, too.
2016-01-23 23:43:13 +09:00
IntelOrca
62eeaaf405
fix severe regression from #2787 , use object entry array instead of ride entry array
2016-01-23 12:47:04 +00:00
duncanspumpkin
a4ccea81e9
Fix issue with curved track. Use new getter functions.
...
Also fixed an issue with cable lifts spamming the log
2016-01-23 08:07:50 +00:00
duncanspumpkin
a04417f61d
Fix bugs in create vehicles
2016-01-23 07:23:07 +00:00
duncanspumpkin
8316e7e1a4
Fix merge mistakes
2016-01-23 07:23:06 +00:00
IntelOrca
554567d012
implement ride_create_vehicles
2016-01-23 07:23:05 +00:00
Duncan
660eca56b2
Merge pull request #2791 from LRFLEW/develop
...
Fixed Uploading Builds
2016-01-23 06:49:48 +00:00
OpenRCT2 git bot
1b2edef980
Merge Localisation/master into OpenRCT2/develop.
2016-01-23 04:00:13 +00:00
LRFLEW
d585f85267
Fixed Uploading Builds
2016-01-22 19:21:45 -07:00
Ted John
8ad5827c57
Merge pull request #2789 from LRFLEW/develop
...
(Temp) Fix Travis OS X Build
2016-01-23 01:17:09 +00:00
LRFLEW
394c0423f6
(Temp) Fix Travis OS X Build
2016-01-22 18:09:07 -07:00
Ted John
729e9f0481
Merge pull request #2787 from janisozaur/ride-refactor
...
Refactor rides to be only accessible with getters
2016-01-23 00:25:26 +00:00
IntelOrca
d81fd0c4ea
fix #2786 : use gfx_draw_string_centred_wrapped which centres line by line
2016-01-23 00:24:02 +00:00
zsilencer
6d81369e1a
fix issue with same price throughout park
2016-01-22 17:19:15 -07:00
Michał Janiszewski
6d6f9f3c23
Refactor rides to be only accessible with getters
...
This changes how rides are accessed from macros to getter functions.
2016-01-23 01:13:36 +01:00
zsilencer
62c1780d65
fix couple other issues mentioned in pull request
2016-01-22 17:08:06 -07:00
Ted John
f64f258e02
Merge pull request #2788 from LRFLEW/security
...
Fixed a theoretical security issue for OS X and Linux
2016-01-23 00:07:18 +00:00
zsilencer
c557f02f4b
fix issue with incorrect game_command_playerid
2016-01-22 16:57:00 -07:00