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

2376 Commits

Author SHA1 Message Date
Ted John e570eca31e Merge pull request #619 from halfbro/master 
Partially Fix #551
 2014-12-05 17:14:07 +00:00
Matt Lagarenne 84a431f352 Merge pull request #1 from duncanspumpkin/fix_rain 
Fixed the buffer overflow. Increased the number of pixels again
 2014-12-05 09:57:57 -05:00
IntelOrca 98348cd539 set default config option confirm prompt to false 2014-12-04 21:20:11 +00:00
Duncan Frost c5c9609b37 Fixed the buffer overflow. Increased the number of pixels again 2014-12-04 20:39:49 +00:00
halfbro 4902bad9b9 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-12-04 00:57:41 -05:00
halfbro 242bee9a07 Update rain pixels to use own global variable 2014-12-04 00:51:58 -05:00
Ted John 1be2f16cd3 Merge pull request #616 from duncanspumpkin/ride_crash 
Fix Ride Construction Crash
 2014-12-03 21:14:15 +00:00
Duncan Frost ef0b29d996 Fixed issue preventing rides from being destroyed 2014-12-03 20:37:38 +00:00
Duncan Frost ee35f9fb4f Fix #615. Issue caused by variables not being set 2014-12-03 20:19:02 +00:00
Ted John 719d7893e6 Merge pull request #614 from duncanspumpkin/ride_construct 
Added enough of ride_construction to fix #601
 2014-12-02 18:53:12 +00:00
Duncan Frost f11f2f270f Added enough of ride_construction to fix #601 2014-12-02 18:09:13 +00:00
Ted John fc845cb081 Merge pull request #611 from duncanspumpkin/bug_fix 
Bug fixes
 2014-12-01 17:30:13 +00:00
Duncan Frost d1c49ee32b Fix #600. Issue caused by not passing model_type argument 2014-12-01 17:16:30 +00:00
Duncan Frost a11f7fbd7c Fix #610. Pause toggle display issue. 2014-12-01 17:04:47 +00:00
IntelOrca 325c5243e8 change plugin.dat to be saved in user directory and stop repeated load of title screen when failed 2014-11-30 22:16:42 +00:00
IntelOrca 424164523f Merge branch 'duncanspumpkin-fix_543' 2014-11-30 22:09:03 +00:00
IntelOrca 38184aa995 Merge branch 'fix_543' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_543 2014-11-30 22:08:57 +00:00
Duncan Frost cbd7e0c096 Reversed 684ac3 2014-11-30 22:00:41 +00:00
IntelOrca 0960071d52 Merge branch 'duncanspumpkin-object_load_list' 2014-11-30 21:55:57 +00:00
Duncan Frost 8354304299 Added object_load_list. Fixes various object loading related bugs 2014-11-30 21:16:36 +00:00
IntelOrca d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +00:00
Ted John 30e2235b5e Merge pull request #607 from duncanspumpkin/fix_543_p 
Possible fix to #543
 2014-11-30 19:29:13 +00:00
Duncan Frost 743e27040f Possible fix to #543 2014-11-30 18:42:51 +00:00
IntelOrca 31ebf03c30 implement enter name on scenario complete, closes #605 2014-11-30 02:17:01 +00:00
IntelOrca 88b425f6a7 implement ride open station and ride open vehicle, partial fix for #601 2014-11-29 15:55:44 +00:00
IntelOrca 0492c966d7 fix ride shop item colouring in ride window, fixes #602 2014-11-29 13:54:53 +00:00
IntelOrca 1266f19a5c fix ride profit calculation, fixes #603 2014-11-29 13:33:39 +00:00
halfbro 47a307d50a Fix rain not drawing on high resolutions 2014-11-29 00:40:53 -05:00
IntelOrca 35145f897b optimise writing of checksum on save scenario 2014-11-28 18:00:18 +00:00
IntelOrca 0a51752bd9 fix map shortcut, fixes #599 2014-11-26 21:47:11 +00:00
IntelOrca 47329713e1 remove temporary debug argument 2014-11-26 17:56:28 +00:00
IntelOrca cc36cafcaa remove redundant variable from encode_chunk_repeat 2014-11-26 16:30:41 +00:00
IntelOrca 85c41488ce implement RLECOMPRESSED chunk encoding, closes #598 2014-11-26 16:27:21 +00:00
IntelOrca 4b897ae1a3 implement saving of games and scenarios 2014-11-26 00:51:26 +00:00
IntelOrca e6fc8cacf8 implement scenario_prepare_rides_for_save 2014-11-25 22:38:47 +00:00
IntelOrca aee1b3825e fix object_free_scenario_text problem in window_editor_object_selection 2014-11-25 21:49:05 +00:00
IntelOrca 8072dc14fb fix climate_reset, not setting current climate variables, fixes #595 2014-11-25 21:40:43 +00:00
IntelOrca d9e0f8ff6a implement save scenario and fix various load / save dialog issues, fixes #433 2014-11-25 02:06:26 +00:00
IntelOrca 8e3ee3f7e9 implement bare minimum so that close button is implemented on object selection window, partial fix for #433 2014-11-24 23:05:35 +00:00
Ted John 6a58f6597b Merge pull request #593 from mzmiric5/bug_resize-while-rain-crashes-game 
fixes #590, prevents crash on resize while raining
 2014-11-24 22:13:09 +00:00
Miso Zmiric (Mike Squinter) b75612467a rename to follow convention and add the hack comment 2014-11-24 22:07:28 +00:00
Miso Zmiric (Mike Squinter) 1f60018acd fix crash on window size decrease 2014-11-24 22:02:04 +00:00
Ted John eb83dfa4d5 Merge pull request #591 from mzmiric5/cheat-window-remap-to-keystroke 
closes #588, adds minor fixes
 2014-11-24 17:39:55 +00:00
Miso Zmiric (Mike Squinter) a7f015669a fix erroneous position calculation due to additional offset 2014-11-24 17:37:45 +00:00
IntelOrca 5190862573 fixes #337 - shortcut keys on title screen propagating to game 2014-11-24 17:18:21 +00:00
Miso Zmiric (Mike Squinter) 1e6c9ddfd8 map cheat window to shortcut, hide fast forward button, fix toolbar autolayout 2014-11-24 16:38:19 +00:00
IntelOrca 73a6b1acea implement editor_read_s6, partial fix for #433 2014-11-24 02:58:48 +00:00
IntelOrca adb5f84f55 implement editor_convert_save_to_scenario 2014-11-23 23:03:59 +00:00
Ted John ced6a66b1a Merge pull request #589 from Gymnasiast/patch-2 
Added missing Dutch cheat window strings
 2014-11-23 18:39:19 +00:00
Gymnasiast c8c9817308 Missing Dutch cheat window strings 2014-11-23 17:37:48 +01:00