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

5949 Commits

Author SHA1 Message Date
Marijn van der Werf 94e47be3e3 Use `ride_type_has_flag` for checking ride type flags 2016-01-15 21:02:39 +01:00
Marijn van der Werf 6568798af7 Use globals instead of addresses where applicable 2016-01-15 21:01:49 +01:00
Marijn van der Werf 98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
Ted John 57420cbc66 Merge Localisation/master into OpenRCT2/develop. 2016-01-15 04:00:19 +00:00
Ted John 45225cfa06 Merge pull request #2718 from OpenRCT2/normalise-platform-guards 
Normalise platform guards with SDL2
 2016-01-14 21:53:27 +00:00
IntelOrca f1f0b76a2b remove cdecl original call macros 2016-01-14 20:21:10 +00:00
IntelOrca 730463dbbb remove rct2_malloc, rct2_realloc and rct2_free 2016-01-14 20:18:55 +00:00
IntelOrca b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
IntelOrca cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
duncanspumpkin e68ae821db Fix #2717. Total air time now reset before testing. 
This would cause total air time to become a very large number if you made changes to a ride and retested it
 2016-01-14 18:56:29 +00:00
duncanspumpkin 937de36e49 Fix #2719. Vehicles getting stuck in unloading passengers mode 2016-01-14 18:41:15 +00:00
duncanspumpkin 23dbde38e2 Refactor. Split golf vehicle update code into seperate function 2016-01-14 18:25:41 +00:00
duncanspumpkin d3cb8c4ef6 Fix #2720. Golf peeps no longer walk incorrectly to the hole. 2016-01-14 18:04:07 +00:00
duncanspumpkin f2b70b74aa Fix incorrect common format offset causing issues when changing colour scheme 2016-01-14 17:47:06 +00:00
Ted John 0450aa0057 Merge Localisation/master into OpenRCT2/develop. 2016-01-14 04:00:19 +00:00
Ted John 608c90db12 Merge pull request #2707 from marijnvdwerf/share-currency-detection 
Merge currency detection and add missing currencies
 2016-01-13 20:47:23 +00:00
Marijn van der Werf 0825b9bf62 Share currency detection across platforms 2016-01-13 21:38:10 +01:00
Ted John 370a06f74a Merge pull request #2716 from marijnvdwerf/min-window-size 
Set minimal window size to 720×480
 2016-01-13 18:56:33 +00:00
Marijn van der Werf 452acd7627 Set minimal window size 2016-01-13 19:55:35 +01:00
Ted John 69bc5e1c94 Merge pull request #2715 from janisozaur/build-id 
Drop number from build ID.
 2016-01-13 18:07:21 +00:00
Michał Janiszewski 1e5f59df29 Drop number from build ID. 2016-01-13 14:33:19 +01:00
Ted John 38c52e28dc Merge pull request #2711 from marijnvdwerf/add-cmd-modifier 
Allow using CMD as shortcut modifier
 2016-01-13 12:45:21 +00:00
Ted John 56b5bd1ace Merge pull request #2713 from janisozaur/ride-validity 
Check for ride validity in game commands
 2016-01-13 12:45:07 +00:00
Marijn van der Werf 138f0139c8 Add `PLATFORM_MODIFIER` as alias for CMD/CTRL 2016-01-13 11:06:25 +01:00
Michał Janiszewski ff2cdd4b1d Check for ride validity in game commands 2016-01-13 10:51:43 +01:00
Ted John a557179b06 Merge pull request #2709 from OpenRCT2/set-rct2-path 
Add ability to set RCT2 path by command line.
 2016-01-13 00:04:49 +00:00
IntelOrca 3751c2b014 use SDL2 for Stopwatch class 2016-01-13 00:04:27 +00:00
IntelOrca 1c063e74b0 fix peep.c warnings 2016-01-12 23:54:01 +00:00
IntelOrca ebd78799c2 correct UK spelling of Haunted Harbour RCT1AA scenario 2016-01-12 23:51:38 +00:00
LRFLEW 02c03d225c Added Path class to Xcode project 2016-01-12 23:10:19 +00:00
IntelOrca 8cf53c12af add ability to set RCT2 path by command line 2016-01-12 23:10:18 +00:00
IntelOrca df2b793c0a refactor console error output 2016-01-12 23:10:17 +00:00
Marijn van der Werf df9880247a Add bugfix to changelog 2016-01-12 23:18:24 +01:00
Marijn van der Werf a85b2d3982 Show ALT as OPTION in keyboard shortcut list 2016-01-12 23:05:03 +01:00
Marijn van der Werf 2d53c28342 Use CMD for default shortcuts on OS X 2016-01-12 22:59:29 +01:00
Marijn van der Werf 623952d966 Only perform command key state detection on OS X 2016-01-12 22:53:01 +01:00
Marijn van der Werf dd8239f684 Add space after 'CMD + ' 2016-01-12 22:52:34 +01:00
Marijn van der Werf 72739e8cd8 Allow setting CMD as shortcut key 2016-01-12 22:29:36 +01:00
duncanspumpkin d8d706cc58 Fix #2700. Friction sound no longer goes very quite at high speeds. 
Also labelled friction_sound_id and small refactor
 2016-01-12 17:55:19 +00:00
duncanspumpkin 75ed781a5c Fix part of #2700. Reverse freefall now correctly slows down on reverse. 2016-01-12 17:43:47 +00:00
duncanspumpkin b5b6e93a03 Fix #2701. Rotated trains no longer disobey physics when crashing. 2016-01-12 17:32:16 +00:00
Duncan e2e749d644 Merge pull request #2697 from marijnvdwerf/get-ride-entry 
Minimise direct usage of `RCT2_ADDRESS_RIDE_ENTRIES`
 2016-01-11 23:09:43 +00:00
Ted John cdc2bec135 Merge pull request #2703 from janisozaur/config 
Make sure config.ini gets created
 2016-01-11 22:36:19 +00:00
Ted John 6bdc5fc978 Merge pull request #2648 from rubdos/POSIX_platform 
Implement several POSIX methods.
 2016-01-11 22:24:30 +00:00
Michał Janiszewski bcc3580d41 Report improper "game_path" with useful information 2016-01-11 22:59:05 +01:00
Michał Janiszewski 54f7f93ab9 Make sure config.ini gets created 
This commit makes sure config.ini gets created even when RCT2 path is
not selected.

This makes for a better out-of-box experience on Linux, where no
directory selector is provided yet, as we provide default config file
and state in the error message how to fix it.
 2016-01-11 22:46:29 +01:00
Marijn van der Werf ef9ac11e52 Remove direct usage of `RCT2_ADDRESS_LARGE_SCENERY_ENTRIES` 2016-01-11 21:00:22 +01:00
Ted John 1ddad61d2c Merge pull request #2699 from zsilencer/bugfixes 
Fix #2693: Chat caret
 2016-01-11 18:49:18 +00:00
duncanspumpkin 27ec97d3c5 Fix #2694. Multi tile block breaks (i.e. cable lifts) now correctly unstop. 
Issue was caused by looking at the wrong tile to unstop
 2016-01-11 18:35:36 +00:00
IntelOrca 0087e5c2d6 fix importing of legacy scenario scores 
only one would ever be imported because of a break loop that shouldn't be there
 2016-01-11 18:30:58 +00:00