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

3593 Commits

Author SHA1 Message Date
Michael Steenbeek 340627859a Correct newline in tooltip 2015-06-09 20:39:32 +02:00
Ted John 59e2080c64 Merge pull request #1278 from duncanspumpkin/bugs 
Change order of load_save code
 2015-06-09 19:35:00 +01:00
Ted John d0c0170858 Merge pull request #1277 from Gymnasiast/sandbox-mode-4 
Rework land ownership cheat into sandbox mode
 2015-06-09 19:34:46 +01:00
Gymnasiast afb49855dd Correct &-operation not in brackets 2015-06-09 20:11:48 +02:00
Duncan Frost 1fde5e53f9 Change order of load_save code 
This prevents the window from appearing for a millisecond when you press x.
Fixes #1264
 2015-06-09 19:05:59 +01:00
IntelOrca 95d6bbaa43 fix dropdowns 2015-06-09 18:37:24 +01:00
Ted John e0d480fa6b Merge pull request #1276 from duncanspumpkin/bugs 
Bugs
 2015-06-09 18:31:05 +01:00
IntelOrca 0dd749baac refactor window event calls 2015-06-09 18:29:02 +01:00
Duncan Frost 322d45a5dd Prevent invalid sprite coordinates from breaking sprite list. 
Fixes @Gymnasiast 's issues in sandbox
 2015-06-09 18:16:27 +01:00
Duncan Frost 5184564e84 Fixed crash when entrance/exits have been moved by 8cars 
Code defaults to 0 direction if the entrance/exit was not found. Fixes #1258.
 2015-06-09 17:35:16 +01:00
Duncan Frost 62bdd8a0ab Fix options disabled_widgets 
There was a bug that caused the first widget on each page to appear disabled due to not being reset when changing page / invalidating. Fixes #1275
 2015-06-09 17:14:57 +01:00
Gymnasiast 7ed434a804 Rework land ownership cheat into sandbox mode 2015-06-09 17:19:05 +02:00
IntelOrca 72de8ad103 implement draw_string_centred_raw 2015-06-09 15:42:25 +01:00
IntelOrca dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
IntelOrca ed86db0635 fix sign issues with selection rectangle 2015-06-09 14:47:26 +01:00
Ted John 4a3cb63c5c Merge pull request #1274 from oli414/develop 
Fixed crash when using land/water tool outside map
 2015-06-09 13:43:48 +01:00
oli414 a09b103895 Fixed crash when using land/water tool outside map 2015-06-09 14:24:02 +02:00
Ted John aae1288332 Merge Localisation/master into OpenRCT2/develop. 2015-06-09 04:00:13 +01:00
Ted John 22c13f9f93 Merge pull request #1271 from trigger-death/decompile-ride-prices 
Decompiled Ride Prices
 2015-06-09 02:38:32 +01:00
IntelOrca eb654a220d implement sub_6A7594 2015-06-09 02:36:02 +01:00
Robert Jordan fcbe561ad8 Decompiled Ride Prices 2015-06-08 21:28:07 -04:00
IntelOrca 12b01d6521 implement footpath_remove_litter and footpath_interrupt_peeps 2015-06-09 02:09:18 +01:00
IntelOrca 8cfc71ccae fix #1269 2015-06-09 01:24:02 +01:00
IntelOrca acfcf2c33b implement a bit of sub_66397F for sandbox mode 2015-06-08 22:19:06 +01:00
IntelOrca 2888494faa implement three functions used in save scenario 2015-06-08 21:35:09 +01:00
IntelOrca 999488d38c refactor scenario update and checks 2015-06-08 20:48:29 +01:00
Ted John 1934435ae1 Merge pull request #1267 from trigger-death/develop 
Switch RCT1 and RCT2 theme order
 2015-06-08 19:52:20 +01:00
Robert Jordan 8e526ac525 Switch RCT1 and RCT2 theme order 2015-06-08 14:21:07 -04:00
IntelOrca 909060b964 implement language fallback to English (UK) 2015-06-08 17:16:37 +01:00
Ted John 37471ee1b9 Merge Localisation/master into OpenRCT2/develop. 2015-06-08 04:00:12 +01:00
Ted John 8086a86aab Merge pull request #1263 from trigger-death/new-themes-system 
Fixed themes features tab glitch
 2015-06-08 02:17:56 +01:00
Robert Jordan e471592d16 Fixed themes features tab glitch 2015-06-07 21:11:47 -04:00
Ted John d46c3fe009 Merge pull request #1262 from trigger-death/new-themes-system 
Fixed open button y
 2015-06-08 01:59:55 +01:00
Robert Jordan 21734bd71f Fixed open button y 2015-06-07 20:56:31 -04:00
Ted John 2f91a768f9 Merge pull request #1261 from trigger-death/new-themes-system 
New Themes System
 2015-06-08 01:46:45 +01:00
Robert Jordan 9960c8d901 Fixed merge conflicts 2015-06-07 20:37:56 -04:00
Robert Jordan e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
Ted John b2dfad5f1b Merge pull request #1244 from LRFLEW/develop 
A fix for #1231
 2015-06-07 23:25:52 +01:00
LRFLEW c0f376aa77 fixed naming convention 2015-06-07 17:20:46 -05:00
LRFLEW d3a6965f95 Made window_loadsave_open accept a default file name 
This fixes #1231, #1245, and adds room for future work, such as porting
track saving.
 2015-06-07 17:12:17 -05:00
LRFLEW 75903ec2d9 Fixed opening save game not changing recommended name 
It was originally handled by load_game(), but was changed when the
loadsave window was implemented.
 2015-06-07 15:20:46 -05:00
LRFLEW 73acb02946 Code Cleanup 
thanks trigger-death
 2015-06-07 15:20:45 -05:00
LRFLEW 66bf2abd37 A fix for #1231 
This has the side-effect of incorrect default names in the scenario
editor, but that can be patched separately.
 2015-06-07 15:20:45 -05:00
Ted John 3cd961a3a0 Merge pull request #1257 from zsilencer/bugfixing 
fix whizzed screenshots
 2015-06-07 21:08:11 +01:00
zsilencer fbebd6527b fix whizzed screenshots 2015-06-07 13:02:17 -06:00
Ted John f8173f996e Merge pull request #1256 from duncanspumpkin/research 
Refactor and fix Research
 2015-06-07 19:42:41 +01:00
Duncan Frost 4f03b0c997 Refactor of research. 
Fix bug that would cause a crash on a scenario that had rides with same base type
 2015-06-07 19:19:17 +01:00
Duncan Frost 9ad775625a Fix small bugs in the inventions window. 
I think there might have been a case where the list could get corrupted that this may prevent.
 2015-06-07 19:19:16 +01:00
Duncan Frost 97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
Duncan Frost cd22f9bd08 Implement the reset ride research function 2015-06-07 19:18:50 +01:00