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

3826 Commits

Author SHA1 Message Date
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
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
Maikel Stuivenberg 36b9d8de8a Merge with develop 2015-06-28 21:40:01 +02:00
Maikel Stuivenberg 952cbdebaf move string to id 5453 2015-06-28 21:33:54 +02:00
Maikel Stuivenberg d968a65701 Changed back-button location 2015-06-28 21:30:20 +02:00
Duncan Frost 2c3c8dc188 Fix incorrect pointer maths. Fixes #1511. 2015-06-28 19:46:08 +01:00
IntelOrca ed41c2b995 fix map_reorganise_elements 2015-06-28 18:59:55 +01:00
IntelOrca 3e200d0bd2 implement ride_fix_breakdown 2015-06-28 18:36:46 +01:00
Ted John b1b61e7df5 Merge pull request #1509 from duncanspumpkin/map_functions 
Map functions
 2015-06-28 18:03:53 +01:00
IntelOrca e2a694b96e implement format_string_toupper and litter_create 2015-06-28 17:45:19 +01:00
Duncan Frost 33c4698e06 Implemented map_reorganise_elements. 
Fixed a potential issue that would cause cursors to become stuck.
 2015-06-28 16:50:21 +01:00
IntelOrca b4f8d3b753 add new shortcuts to shortcut window and fix bottom toolbar hiding in editor 2015-06-28 13:59:38 +01:00
Duncan 9b4d375707 Merge pull request #1501 from Gymnasiast/patch-2 
Fix observation tower and launched freefall descriptions
 2015-06-28 13:55:11 +01:00
Duncan b2e4ef0be4 Merge pull request #1508 from danidoedel/patch-4 
Fix window titles (cheats)
 2015-06-28 13:54:12 +01:00