mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,678 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

3678 Commits

Author SHA1 Message Date
Robert Jordan f988e990ea Reset selection when changing ride tab 2015-06-14 14:43:01 -04:00
Robert Jordan 7f98dba63a Filters sort properly now 2015-06-14 14:41:27 -04:00
Ted John 9f0c8afb4b Merge pull request #1339 from trigger-death/develop 
Added ride filters in object selection
 2015-06-14 18:07:56 +01:00
Robert Jordan 3ad9a1a74a Removed printf's 2015-06-14 12:25:41 -04:00
Robert Jordan 9ae22b5938 Fixed merge conflicts 2015-06-14 12:21:13 -04:00
Robert Jordan cbf27687cb Added ride filters in object selection 2015-06-14 12:19:54 -04:00
Ted John bb5293b57b Merge pull request #1338 from Gymnasiast/sandbox-large-scenery 
Allow building large scenery outside park borders in sandbox mode.
 2015-06-14 15:29:59 +01:00
Gymnasiast 95966f6346 Allow building large scenery outside park borders in sandbox mode. 2015-06-14 15:07:08 +02:00
Ted John 12d6f3b20c Merge pull request #1337 from zsilencer/decompile 
game_command_place_large_scenery
 2015-06-14 13:20:59 +01:00
zsilencer d2b565b283 game_command_place_large_scenery 2015-06-14 05:56:41 -06:00
IntelOrca beb2b23afb use log functions instead of printf and RCT2_ERROR (now removed) 2015-06-14 12:03:32 +01:00
Ted John 949d195c95 Merge pull request #1335 from duncanspumpkin/bugs 
Fix incorrect string text colour.
 2015-06-14 09:49:32 +01:00
Duncan Frost adea7cb9ad Fix incorrect string text colour. 
With the change in how text box colouring is done during the first drawing of any window it would default to the wrong colour due to not calling invalidate before setting the window colour global variables.
 2015-06-14 09:10:56 +01:00
Ted John ba36150d1b Merge Localisation/master into OpenRCT2/develop. 2015-06-14 04:00:14 +01:00
Ted John 74784cd7f3 Merge pull request #1330 from rd3k/window-flags 
Tidy window flags
 2015-06-13 22:28:33 +01:00
rd3k 628a586ea2 Tidy window flags 2015-06-13 22:16:14 +01:00
IntelOrca ee7a2c47f4 refactor map size 2015-06-13 19:11:26 +01:00
Ted John 411d5f0752 Merge pull request #1328 from rd3k/cheat-window-titles 
Add cheat window per-tab titles
 2015-06-13 19:03:42 +01:00
rd3k 6f28010e87 Add cheat window per-tab titles 2015-06-13 18:59:38 +01:00
Ted John 9b6eaa25d6 Merge pull request #1327 from trigger-death/tile-inspector-cursor 
Tile Inspector Appropriate Cursor
 2015-06-13 16:10:10 +01:00
Robert Jordan 89a2cc9468 Tile Inspector Appropriate Cursor 2015-06-13 11:05:56 -04:00
IntelOrca b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
Ted John b84322ad62 Merge Localisation/master into OpenRCT2/develop. 2015-06-13 04:00:13 +01:00
IntelOrca 26abb73b8e implement update_cursor_position 2015-06-12 23:29:26 +01:00
IntelOrca f316b423c4 fix scroll H&V issue 2015-06-12 20:10:27 +01:00
Ted John 285240a20b Merge pull request #1316 from trigger-death/input-scroll 
Decompiled input_scroll Functions
 2015-06-12 19:51:30 +01:00
Robert Jordan 927a2a48b5 decompiled input_scroll functions 2015-06-12 14:34:54 -04:00
Ted John 6c09276fd4 Merge pull request #1313 from aputlock/develop 
Autosave no longer changes scenario name to "autosave"
 2015-06-12 17:57:26 +01:00
Ted John e9d5489758 Merge Localisation/master into OpenRCT2/develop. 2015-06-12 04:00:14 +01:00
Andrew Putlock a785ff3cad Autosave no longer changes scenario name to "autosave" 2015-06-11 19:36:56 -04:00
Ted John 543a99a930 Merge pull request #1312 from LRFLEW/autoplace 
Automatic staff placement
 2015-06-11 22:34:16 +01:00
LRFLEW 09d6d9be1c Automatic staff placement 
This will automatically place hired staff near a random guest (with
fallbacks if no guests are in the park). The setting can be toggled in
the options or by holding SHIFT when hiring.
 2015-06-11 15:39:47 -05:00
Ted John ae8464d31f Merge pull request #1310 from rd3k/debug-inspector 
Add debug toolbar menu, start tile inspector
 2015-06-11 21:15:42 +01:00
rd3k fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
Ted John 6b72aa0019 Merge pull request #1311 from duncanspumpkin/fix_gfx 
Fix graphical glitch when zoomed.
 2015-06-11 19:49:01 +01:00
Duncan Frost 499b5413f0 Fix graphical glitch when zoomed. 
Fixes #1088. I'm not completely sure why it works but it does.
 2015-06-11 19:33:48 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +01:00
IntelOrca 9dec3b09f4 reserve string IDs for new title sequence 2015-06-11 12:41:01 +01:00
Ted John b10dffeac8 Merge Localisation/master into OpenRCT2/develop. 2015-06-11 04:00:15 +01:00
IntelOrca 2547d38807 fix #1307 2015-06-11 02:27:19 +01:00
Ted John 65a706fcdd Merge pull request #1304 from trigger-death/fix-black-caption-bar 
Fixed black caption bar being green
 2015-06-10 21:32:06 +01:00
Robert Jordan 029f7cf664 One colour off 2015-06-10 16:13:32 -04:00
Robert Jordan 35cce1a4df Fixed black caption bar being green 2015-06-10 15:55:15 -04:00
IntelOrca 0d6afb97c0 Merge branch 'Gymnasiast-build-in-pause-mode-3' into develop 2015-06-10 18:44:50 +01:00
IntelOrca 125c01a147 Merge branch 'build-in-pause-mode-3' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-build-in-pause-mode-3 
Conflicts:
	data/language/english_uk.txt
 2015-06-10 18:44:38 +01:00
Ted John f65ceff1d3 Merge pull request #1301 from runelaenen/develop 
Fixed Clear Loan cheat
 2015-06-10 18:39:19 +01:00
Gymnasiast e719ee02f9 Also update string ID 2015-06-10 19:38:24 +02:00
Gymnasiast 732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Runelaenen 829e0712e4 Fixed Clear Loan cheat 
The function already existed in the codebase. I've fixed it and added a
button.
 2015-06-10 19:23:10 +02:00
Ted John 8a71ade8c6 Merge pull request #1300 from duncanspumpkin/fix_profit 
Fix profit
 2015-06-10 18:11:28 +01:00