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

4620 Commits

Author SHA1 Message Date
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
IntelOrca 5f342eeb05 fix flag value 2015-08-31 11:11:02 +01:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
IntelOrca dd5d607724 fix typo 2015-08-31 00:41:58 +01:00
IntelOrca 401a389e73 fix #1843 2015-08-30 23:45:45 +01:00
IntelOrca 0c0847160d fix #1857 2015-08-30 22:57:29 +01:00
IntelOrca 826d96ab90 add appveyor configuration 2015-08-30 16:51:41 +01:00
IntelOrca be3c54d266 fix #1859 2015-08-30 14:25:56 +01:00
IntelOrca bea74ee261 make all file IO utf8 compatible, fixes #1847 2015-08-29 13:13:23 +01:00
IntelOrca f0100a71a7 use windows lean and mean to reduce definition conflicts 2015-08-29 13:13:22 +01:00
Ted John 09f411364e Merge pull request #1856 from Gymnasiast/editor-hide-network-button 
Don't show the Network status toolbar button in the Editors
 2015-08-28 22:37:53 +01:00
Gymnasiast 20c7267b53 Don't show the Network status toolbar button in the Editors 2015-08-28 23:27:31 +02:00
IntelOrca 7a4c418d9e fix #1487 2015-08-28 17:55:50 +01:00
Ted John cfecc817f2 Merge pull request #1853 from Gymnasiast/fix-banner-count 
Add a console option to fix the banner count, fixes #667
 2015-08-28 12:35:05 +01:00
Ted John 0c3fd7cd2f Merge pull request #1851 from Gymnasiast/network-button 
Move network button to first group and adjust colours, fix debug menu colours, closes #1850
 2015-08-27 17:17:12 +01:00
Duncan 8b7c593bb5 Merge pull request #1852 from Gymnasiast/addresses-and-strings-cleanup 
Name some addresses, clean up strings ids and usage, closes #515
 2015-08-27 17:15:47 +01:00
Gymnasiast e9b5282486 Add a console option to fix the banner count, fixes #667 2015-08-27 17:24:23 +02:00
Gymnasiast 4d7a81bfe0 Remove unnecessary duplicate address, use more string constants 2015-08-27 16:44:18 +02:00
Gymnasiast 592b6f578d Fix oversight in string order 2015-08-27 16:27:05 +02:00
Gymnasiast 308b086c55 Name some addresses, clean up strings ids and usage 2015-08-27 16:19:17 +02:00