mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,888 Commits 9 Branches 41 Tags 390 MiB
Commit Graph

3888 Commits

Author SHA1 Message Date
Michael Steenbeek 2c64609903 Properly differentiate between the Twister RC track and the Twister RC vehicle. 
Stops two different rides from showing up as 'Twister RC'.
 2015-07-05 11:01:20 +02:00
Ted John 8fe245721b Merge Localisation/master into OpenRCT2/develop. 2015-07-05 04:00:14 +01:00
Ted John 2146a30a80 Merge pull request #1543 from duncanspumpkin/ride_funcs_p 
Implemented track block get next and previous.
 2015-07-04 23:51:40 +01:00
IntelOrca f0bba54e79 uncapped FPS: fix viewport chopiness and reset after park load 2015-07-04 23:51:23 +01:00
Duncan Frost e0ea2d9817 Implemented track block get next and previous. 
Minor refactor of ride functions as well.
 2015-07-04 22:50:48 +01:00
Ted John 69a2d4a775 Merge pull request #1542 from zsilencer/uncapfps 
add option to uncap fps, and fix #1470
 2015-07-04 20:44:35 +01:00
zsilencer 76b231c150 add option to uncap fps, and fix #1470 2015-07-04 13:14:14 -06:00
Duncan f3cc003691 Merge pull request #1535 from Gymnasiast/fix-new-ride-selection 
Fix selecting a newly invented ride when the user has selection by track type enabled
 2015-07-04 18:34:09 +01:00
Duncan d1e3f842b2 Merge pull request #1541 from warp-10/develop 
Fixed #1538 "Meeting the condition of having x guests..."
 2015-07-04 10:38:27 +01:00
Chris 930ab6ac53 Removed comment 
As requested
 2015-07-04 03:37:38 -06:00
Chris f230033eb0 Fixed #1538 "Meeting the condition of having x guests..." 2015-07-04 02:54:40 -06:00
Ted John 392c302d96 Merge Localisation/master into OpenRCT2/develop. 2015-07-04 04:00:14 +01:00
Duncan 74cd9ae3ff Merge pull request #1531 from duncanspumpkin/track_place_p 
Implement track_place.
 2015-07-03 21:45:29 +01:00
Duncan Frost b947d11442 Fix animated track elements. 2015-07-03 21:40:26 +01:00
Duncan Frost 709a2c5ef1 Implement track_place. 2015-07-03 21:14:26 +01:00
IntelOrca f3ca205902 fix test-path prebuild mistake. 2015-07-03 18:07:29 +01:00
Duncan 2e05279278 Merge pull request #1532 from mzmiric5/improve-build 
Move all libs to dependencies builds
 2015-07-03 17:48:01 +01:00
Gymnasiast 97ce46dc04 Fix selecting a newly invented ride when the user has selection by track type enabled. 2015-07-03 12:57:25 +02:00
Miso Zmiric (Mike Squinter) ae4b2277cd link pthread on linux so that dlls don't have to be copied form elsewhere 2015-07-03 10:54:42 +01:00
Miso Zmiric (Mike Squinter) 76fd00c18f use curl instead of wget for the libs download, since travis installed wget can't handle sni tlsv1_2 certs :( 2015-07-03 09:03:13 +01:00
Miso Zmiric (Mike Squinter) 2dda7e9f94 fix old bug in unix build where we built g2 before symlinking 2015-07-03 08:54:35 +01:00
Miso Zmiric (Mike Squinter) ca4f2d0fa3 remove libs from orct repo, add dependencies pull to prebuilds, update unix scripts 2015-07-03 08:45:56 +01:00
IntelOrca f729ed028f change callproc to actual implementation 2015-07-02 18:55:14 +01:00
IntelOrca 3d6988b0f7 isolate callprocs in rct1.c and add reset cash function 2015-07-02 18:39:32 +01:00
IntelOrca b66b503be8 isolate remaining callprocs in peep.c 2015-07-02 18:22:49 +01:00
Duncan 251121f041 Merge pull request #1530 from duncanspumpkin/fix_object_tab 
Prevent tab 0 from trying to be animated.
 2015-07-02 17:50:07 +01:00
Duncan Frost a757f39a8c Prevent tab 0 from trying to be animated. Fixes #1529 2015-07-02 17:41:17 +01:00
IntelOrca 30c1e4b6c9 Merge branch 'finish-map-window' into develop 2015-07-02 17:01:53 +01:00
IntelOrca 46178bb44f implement finish-map-window part 6 2015-07-02 17:00:39 +01:00
Duncan e54e74257d Merge pull request #1515 from MaikelS11/build-ride-improvement 
Back button on "Select Design" list #1346
 2015-07-02 12:45:45 +01:00
Ted John cbbf127185 Merge Localisation/master into OpenRCT2/develop. 2015-07-02 04:00:20 +01:00
IntelOrca 55c509590f implement finish-map-window part 5 2015-07-02 01:50:13 +01:00
IntelOrca 6de7a38f53 implement finish-map-window part 4 2015-07-02 00:37:55 +01:00
IntelOrca 693e6127da implement finish-map-window part 3 2015-07-01 19:06:42 +01:00
IntelOrca c441ee2d1b implement finish-map-window part 2 2015-07-01 15:17:25 +01:00
Ted John c0b45d8651 Merge Localisation/master into OpenRCT2/develop. 2015-07-01 04:00:15 +01:00
IntelOrca 7be91a5fac implement finish-map-window part 1 2015-07-01 00:58:13 +01:00
Duncan Frost 0b60465b65 Fix map element reorganise crash. 
Fixes #1518. I've also refactored the code slightly. Issue was caused by memsetting the wrong buffer.
 2015-06-30 18:08:49 +01:00
IntelOrca cc54171443 remove / isolate several CALLPROCs 2015-06-30 17:13:34 +01:00
Ted John ea88ae41a6 Merge Localisation/master into OpenRCT2/develop. 2015-06-30 04:00:16 +01:00
Maikel Stuivenberg 05e9cdd339 Tab to spaces (txt) and move item to end of list (strings_id) 2015-06-29 22:44:15 +02:00
Ted John 7b71b18433 Merge pull request #1522 from zsilencer/decompiling 
implement game_command_set_water_height
 2015-06-29 19:12:30 +01:00
zsilencer 9578606251 implement game_command_set_water_height 2015-06-29 11:49:17 -06:00
IntelOrca 19edd8a3bb refactor game command enum 2015-06-29 17:36:07 +01:00
IntelOrca 40ba6a3efa remove various callprocs 2015-06-29 17:22:01 +01:00
IntelOrca c3d5d5f6c2 implement game_command_set_ride_vehicles 2015-06-29 16:14:56 +01:00
IntelOrca 4ada15c972 implement ride_update_max_vehicles 2015-06-29 15:13:42 +01:00
Ted John 380d459dfb Merge Localisation/master into OpenRCT2/develop. 2015-06-29 04:00:15 +01:00
IntelOrca c6e84181cb implement ride_entry_get_train_layout 2015-06-29 01:24:07 +01:00
IntelOrca 0da767fcea implement peep update real names and update ride vehicle colours 2015-06-29 00:51:03 +01:00