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

4439 Commits

Author SHA1 Message Date
Ted John a0d684a07d Merge Localisation/master into OpenRCT2/develop. 2015-09-07 04:00:15 +01:00
IntelOrca efada641a5 implement map_place_fence_check_obstruction 2015-09-06 17:36:55 +01:00
IntelOrca 2753af893b implement map_obstruction_set_error_text 2015-09-06 13:37:00 +01:00
IntelOrca ed824d36b0 refactor two CALLPROC functions in track.c 2015-09-05 20:34:56 +01:00
IntelOrca 8c44ddac17 fix 2nd problem of #1848 2015-09-05 20:06:58 +01:00
IntelOrca c3fbdf78c0 fix writing null terminators in config file 2015-09-05 19:32:01 +01:00
IntelOrca 85181b5ed3 add stay_connected config option 2015-09-05 18:46:13 +01:00
IntelOrca 6901c04f24 implement track_save_add_map_element and track_save_remove_map_element 2015-09-05 18:21:36 +01:00
IntelOrca 7228e42768 implement litter_remove_at 2015-09-05 13:59:12 +01:00
IntelOrca e136923437 fix #1890 2015-09-05 13:18:31 +01:00
Ted John 54b08da98e Merge Localisation/master into OpenRCT2/develop. 2015-09-05 04:00:15 +01:00
Ted John 28d1a62544 Merge pull request #1891 from Gymnasiast/remove-unused-var 
Remove unused variable
 2015-09-04 20:31:33 +01:00
Gymnasiast 87eb6335ea Remove unused variable 2015-09-04 15:10:09 +02:00
Ted John 4c60112bd5 Merge Localisation/master into OpenRCT2/develop. 2015-09-04 04:00:15 +01:00
IntelOrca 42cc5555be add Korean language descriptor 2015-09-03 19:57:24 +01:00
Ted John 7b4f6e7008 Merge pull request #1889 from Gator96100/develop 
Added support for hostnames
 2015-09-03 19:13:56 +01:00
Gator96100 c3ffd221de Added support for hostnames 2015-09-03 19:49:14 +02:00
Ted John 18bb8b9bb0 Merge pull request #1888 from Gymnasiast/fix-1877 
Take on-ride photos into account when calculating profit per hour, fixes #1877
 2015-09-03 17:45:14 +01:00
Gymnasiast feebb7b39d Take on-ride photos into account when calculating profit per hour, fixes #1877 2015-09-03 15:08:33 +02:00
Ted John 28a66f1d81 Merge pull request #1887 from Gymnasiast/improve-install 
Only force installation on Travis
 2015-09-03 12:42:58 +01:00
Gymnasiast 7afae59150 Only force installation on Travis 2015-09-03 13:38:21 +02:00
Ted John e6f1b6cd38 Merge pull request #1883 from Gymnasiast/fix-1870 
Check if the game is in title sequence mode before loading it, fixes #1870
 2015-09-03 12:17:45 +01:00
Gymnasiast 2729531e0e Cleaner fix 2015-09-03 13:13:50 +02:00
Ted John 081ebeccf4 Merge pull request #1881 from zsilencer/develop 
disable naggle
 2015-09-03 12:01:40 +01:00
Ted John 2975cb7038 Merge pull request #1885 from Gymnasiast/fix-1493 
Keep track list responsive in pause mode, fixes #1493
 2015-09-03 11:56:14 +01:00
Gymnasiast d849e3378c Keep track list responsive in pause mode, fixes #1493 2015-09-03 12:12:21 +02:00
Gymnasiast ba1101e012 Check if the game is in title sequence mode before loading it, fixes #1870 2015-09-03 11:08:23 +02:00
Ted John 8c2d0b3730 Merge Localisation/master into OpenRCT2/develop. 2015-09-03 04:00:15 +01:00
zsilencer 6ea9b6666c disable naggle 2015-09-02 20:41:17 -06:00
Ted John 711f171670 Merge pull request #1880 from s0r00t/develop 
Add Dockerfile
 2015-09-02 18:47:45 +01:00
Hugo Courtial 73856c2e24 Add Dockerfile 2015-09-02 19:39:55 +02:00
Ted John a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels 
Added tooltip to colour selector
 2015-09-02 17:49:33 +01:00
Ted John 835e97b0ec Merge pull request #1876 from Gymnasiast/fix-1866 
Remove faulty copy-and-pasted check on secondary items, fixes #1866
 2015-09-02 12:52:50 +01:00
Gymnasiast ea9f87d0f3 Remove faulty copy-and-pasted check on secondary items, fixes #1866 2015-09-02 12:42:43 +02:00
Ted John f16b740dca Merge Localisation/master into OpenRCT2/develop. 2015-09-02 04:00:15 +01:00
Michael Steenbeek 46dd7e0620 Add actual colours to colour tooltips 2015-09-01 14:06:24 +02:00
LRFLEW 7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John 5abb923525 Merge Localisation/master into OpenRCT2/develop. 2015-09-01 04:00:16 +01:00
Ted John e80d935964 Merge pull request #1867 from Gymnasiast/fix-select-by-track-type-research 
Don't apply select by track type to research, fixes #1733
 2015-08-31 20:06:00 +01:00
Gymnasiast 8490a19328 Don't apply select by track type to research, fixes #1733 2015-08-31 20:20:36 +02:00
IntelOrca f629e64387 implement sprite_remove 2015-08-31 16:20:56 +01:00
IntelOrca afb3aabb49 implement sub_666D6F 2015-08-31 16:02:50 +01:00
IntelOrca 05132b2e04 implement sub_666CBE 2015-08-31 15:57:50 +01:00
IntelOrca 064cdf4d06 implement ride_set_vehicle_colours_to_random_preset 2015-08-31 15:00:11 +01:00
Ted John 6451f9d771 Merge pull request #1865 from Gymnasiast/fix-td4-river-rapids-colours 
Fix seat colour of TD4 River Rapids, fixes #1695
 2015-08-31 12:32:08 +01:00
Ted John 1cd2383a70 Merge pull request #1864 from Gymnasiast/fix-map-elements-generation 
Clear all map elements before generating a new map, fixes #1762
 2015-08-31 12:31:37 +01:00
IntelOrca 5508ba5874 fix #1841 2015-08-31 12:27:02 +01:00
Gymnasiast d49c99e020 Fix seat colour of TD4 River Rapids, fixes #1695 2015-08-31 13:23:52 +02:00
Gymnasiast 03034e7e2a Clear all map elements beforing generating a new map, fixes #1762 2015-08-31 12:42:46 +02:00
Ted John ce64c02872 Merge pull request #1863 from Gymnasiast/disable-vandalism-cheat 
Add cheat to disable vandalism
 2015-08-31 11:12:27 +01:00