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

8887 Commits

Author SHA1 Message Date
Ted John 4a82cd0696 Centre keyboard shortcut key change window 2016-09-05 21:06:56 +01:00
Ted John 2dc315f228 Integrate gKeyboardShortcutChangeId 2016-09-05 21:04:22 +01:00
Ted John 3c5d4adcf0 Remove RCT2_GLOBALs from staff window 2016-09-05 20:59:38 +01:00
Ted John eebdf8be7f x64: Fix set sign name by removing RCT2_GLOBAL use 2016-09-05 20:57:30 +01:00
Ted John d10fdd4904 Remove unread variable 2016-09-05 20:54:22 +01:00
Ted John 9d49dbd782 Integrate gCurrentCursor 2016-09-05 20:53:30 +01:00
Ted John 1338f7cedd Remove mouse state globals, use parameters instead 2016-09-05 20:50:33 +01:00
Ted John 029da58459 Integrate _clickRepeatTicks 2016-09-05 20:42:08 +01:00
Ted John 9966ee9092 Clean up game_handle_input 2016-09-05 20:30:06 +01:00
Ted John 3b8e2436c2 Clean up window_map_place_park_entrance_tool_down 2016-09-05 20:26:33 +01:00
Ted John aa15ff6ed9 Fix #4379: x64: Crash when clicking audio device dropdown 
The dropdown arguments are limited to 8 bytes which was not enough for STRING and the 64-bit address for the string. A similar issue also for the dropdown text field. Changed to same solution as other dropdowns.
 2016-09-05 00:05:48 +01:00
Ted John 35fd831d57 Remove unread variable 2016-09-04 21:58:25 +01:00
Ted John a3c14b59dc Integrate _unk_F1AEF0 2016-09-04 21:56:56 +01:00
Ted John a9f17a5ded Integrate _unk_F1AEF1 2016-09-04 21:55:06 +01:00
Ted John 3d4b938be2 Integrate local in peep_update_fixing_sub_state_9 2016-09-04 21:53:19 +01:00
Ted John 925358134a Integrate locals in get_ride_queue_end 2016-09-04 21:50:41 +01:00
Ted John 2cd16a6fe5 Remove unread variable 2016-09-04 21:47:05 +01:00
Ted John 826585c3fc Integrate _peepRideConsideration 2016-09-04 21:43:37 +01:00
Ted John 147493f85a Integrate distanceThreshold local 2016-09-04 21:39:11 +01:00
Ted John 10cafb479c Integrate _peepRideEntranceExitElement 2016-09-04 21:36:01 +01:00
Ted John b4d2d27c9a Integrate _unk_F1EE18 2016-09-04 21:33:27 +01:00
Ted John 27a26a616a Merge pull request #4378 from janisozaur/integrate 
Integrations
 2016-09-04 21:15:07 +01:00
Ted John bf16890489 Use util_rand as there is no srand for rand to work 2016-09-04 20:22:27 +01:00
Michał Janiszewski 0f6f23d588 Integrate gBanners 2016-09-04 21:19:19 +02:00
Michał Janiszewski bfe1a7b58f Drop RCT2_GLOBAL from regular pointer 2016-09-04 21:19:19 +02:00
Michał Janiszewski cd7b8f1de9 Remove unneeded check around 0x009AC06C 2016-09-04 21:19:19 +02:00
Michał Janiszewski ab1af70106 Integrate gCurrentAwards 2016-09-04 21:19:19 +02:00
Michał Janiszewski 0d9fa13dc9 Integrate gTotalRideValue, gSamePriceThroughoutParkA and B 2016-09-04 21:19:19 +02:00
Michał Janiszewski b7497f6654 Reduce inclusions of addresses.h 2016-09-04 21:19:19 +02:00
Duncan 42c5c5b8dd Merge pull request #4370 from duncanspumpkin/jr_rc_fix 
Fix Jr RC Bound Boxes
 2016-09-04 19:32:00 +01:00
duncanspumpkin 8c5395cbd1 Fix jr rc left/right half banked helix up/down small bound boxes 2016-09-04 18:07:27 +01:00
duncanspumpkin b449ed16ec Fix jr rc left quarter turn 5 tiles 25 deg up bound boxes 
And right quarter turn 5 tiles 25 deg down
 2016-09-04 17:41:04 +01:00
duncanspumpkin b7e72cec36 Fix jr rc left/right quarter turn 5 tiles bound box 2016-09-04 17:28:09 +01:00
duncanspumpkin 5494dcd0e7 Fix jr rc right/left quarter turn 3 tile bank bound boxes 2016-09-04 16:58:51 +01:00
duncanspumpkin c4a20ec6ae Fix jr rc left/right s bend bound boxes 2016-09-04 16:58:50 +01:00
duncanspumpkin 292f7f87ef Fix jr rc left/right diag bank bound boxes 2016-09-04 16:58:49 +01:00
duncanspumpkin 47f4722e84 Fix jr rc Right/left Eigth Bank to Diag Bound Box 2016-09-04 16:58:49 +01:00
duncanspumpkin fbb1f740df Fix jr rc left bank bounding boxes 2016-09-04 16:58:48 +01:00
Michał Janiszewski 279c2f15b9 Merge pull request #4368 from janisozaur/launchpad-test 
Fixes for launchpad builds
 2016-09-04 15:42:51 +00:00
Michał Janiszewski 27799bc187 Remove unnecessary compiler options 2016-09-04 17:29:43 +02:00
Michał Janiszewski 47e343a88d Fix PIC options for mingw 2016-09-04 17:27:53 +02:00
Michał Janiszewski cdc447e92a Refactor compiler flags in CMakeLists.txt 2016-09-04 17:27:53 +02:00
Michał Janiszewski f6e9216b7d Use PIC/pie flags to satisfy Launchpad 2016-09-04 17:27:53 +02:00
Michał Janiszewski 640aaad3f8 Fix quotes 2016-09-04 17:27:53 +02:00
Michał Janiszewski 4481859898 Fix Launchpad builds 2016-09-04 17:27:53 +02:00
Ted John 6a665330c2 Integrate gCommonStringFormatBuffer 2016-09-04 15:55:37 +01:00
Ted John b38416426f x64: Fix game_command_set_banner_name 2016-09-04 15:51:52 +01:00
Ted John d86153e575 Integrate gMarketingCampaignDaysLeft, gMarketingCampaignRideIndex 2016-09-04 15:47:56 +01:00
Ted John ae0eb1804c Integrate gParkRatingCasualtyPenalty 2016-09-04 15:44:59 +01:00
Ted John 9478e0a53e Integrate gHistoricalProfit 2016-09-04 15:36:39 +01:00