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

3858 Commits

Author SHA1 Message Date
Ted John 99c4ccc811 Merge pull request #1557 from mzmiric5/libs-versioning 
Libs versioning
 2015-07-05 23:00:30 +01:00
Miso Zmiric (Mike Squinter) 87ea04c002 add libversion checks to mingw build 2015-07-05 22:39:35 +01:00
Duncan ac100179a8 Merge pull request #1554 from duncanspumpkin/refactor 
Refactor and bug fix of track remove
 2015-07-05 21:08:42 +01:00
Miso Zmiric (Mike Squinter) 946811068f add local libversion checks for VS (via powershell) 2015-07-05 21:08:16 +01:00
Duncan Frost da0368d1a3 Fix bug in track remove. 
Fixes #1552
 2015-07-05 20:57:14 +01:00
Duncan Frost f42ac4715a Refactor ride_get_refund_price 2015-07-05 20:31:25 +01:00
Duncan eec8696452 Merge pull request #1550 from zsilencer/bugfixes 
fix bugs introduced in last commit
 2015-07-05 19:09:31 +01:00
zsilencer 520d7840c0 fix bugs introduced in last commit 2015-07-05 09:50:03 -06:00
Duncan Frost 66430b41db Fix opening function passing incorrect parameters. 
Fixes #1526
 2015-07-05 16:44:51 +01:00
Duncan Frost f3ab7b6654 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2015-07-05 16:13:11 +01:00
Duncan Frost b374899bc8 Fix finance issues. Small refactor. 
Fixes #1524
 2015-07-05 16:13:04 +01:00
Ted John c0220df0ac Merge pull request #1549 from zsilencer/bugfixes 
fix #1002
 2015-07-05 16:07:01 +01:00
zsilencer 9eb4958dde fix #1002 2015-07-05 08:57:01 -06:00
Duncan Frost 79c8044156 Fix peep expenditure not adding to the correct type. 
Fixes #1547
 2015-07-05 15:34:15 +01:00
Duncan Frost 4acb73abfe Fix incorrect refund price for tracks. 
Fixes #1548.
 2015-07-05 15:22:56 +01:00
IntelOrca 57e059b167 fix invalidation issues with uncapped FPS 2015-07-05 12:12:55 +01:00
Duncan 5f9b98ce55 Merge pull request #1546 from duncanspumpkin/track_funcs_p 
Implemented track_remove
 2015-07-05 11:56:44 +01:00
Duncan Frost 20f6b8731f Implemented track_remove 2015-07-05 11:50:43 +01:00
Ted John 88746cd446 Merge pull request #1545 from Gymnasiast/patch-2 
Properly differentiate between the Twister RC track and the Twister RC vehicle
 2015-07-05 11:26:00 +01:00
Duncan Frost dfb63ebe88 Fix track previous from not selecting corkscrews. 
Issue was caused by wrong order of adding up the z coordinates of the previous track block
 2015-07-05 10:55:02 +01:00
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