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

3614 Commits

Author SHA1 Message Date
Gymnasiast c3b394b7ef Don't stop sounds on canceling exit prompt 2015-06-10 12:25:14 +02:00
Ted John 472d546542 Merge pull request #1288 from trigger-death/force-ride-breakdown 
Force ride breakdown and fix ride options
 2015-06-10 10:34:59 +01:00
Gymnasiast 5b0ada3100 Fix sound continuing in title screen (hopefully) 2015-06-10 10:49:32 +02:00
Robert Jordan d7a4474bcd Removed irrelevant comments stating false facts 2015-06-09 23:18:20 -04:00
Robert Jordan 32b79ea216 Fix ride works for all breakdown types 2015-06-09 23:17:08 -04:00
Robert Jordan 98501a51f3 Fix Ride is greyed out when it doesn't work 2015-06-09 23:05:43 -04:00
Ted John 90d5c07b88 Merge Localisation/master into OpenRCT2/develop. 2015-06-10 04:00:14 +01:00
Robert Jordan e7332b2d94 Fixed maintenance bar 2015-06-09 22:43:14 -04:00
Robert Jordan bf2ac564fb Fixed merge conflicts 2015-06-09 20:19:19 -04:00
Robert Jordan 10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
Ted John d040e8bb52 Merge pull request #1287 from LRFLEW/explode 
EXPLODE!!!
 2015-06-10 01:00:18 +01:00
LRFLEW 816944f78b EXPLODE!!! 
Because why not
 2015-06-09 18:14:28 -05:00
Ted John dbb7ae8e15 Merge pull request #1284 from trigger-death/decompile-toggle-price 
Decompiled toggle ride price and fixed ride price
 2015-06-09 23:07:20 +01:00
Ted John 92daca54b8 Merge pull request #1283 from Gymnasiast/sound-settings-remnants 
Force best sound quality and software buffering
 2015-06-09 23:06:44 +01:00
Ted John 21d6697ff8 Merge pull request #1286 from mzmiric5/develop 
add missing log_info deffintion for the non ms build systems
 2015-06-09 23:06:19 +01:00
Miso Zmiric (Mike Squinter) ce7b671a3b add missing log_info deffintion for the non ms build systems 2015-06-09 22:41:00 +01:00
Robert Jordan 0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
Gymnasiast a62e1c02c2 Force best sound quality and software buffering 2015-06-09 22:56:47 +02:00
Ted John fa49e5745e Merge pull request #1281 from mzmiric5/develop 
closes #1204, add log_info
 2015-06-09 20:17:43 +01:00
Miso Zmiric (Mike Squinter) 628e634199 closes #1204, add log_info 2015-06-09 20:10:37 +01:00
Ted John 74ec48364b Merge pull request #1279 from Gymnasiast/patch-1 
Correct newline in tooltip
 2015-06-09 19:46:58 +01:00
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