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

5151 Commits

Author SHA1 Message Date
Michael Steenbeek 4855a53c22 Correct two instances of American spelling 2015-11-08 13:11:36 +01:00
Ted John 7d51eb55e1 Merge pull request #2243 from Gymnasiast/rossija 
Add support for Russian
 2015-11-08 11:59:41 +00:00
Ted John 91edd322ae Merge pull request #2242 from Gymnasiast/more-currencies 
Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232
 2015-11-08 11:58:41 +00:00
Ted John 6e6637922a Merge pull request #2240 from Gymnasiast/fix-2125 
Only play message sound in normal playing mode, fixes #2125
 2015-11-08 11:57:20 +00:00
Gymnasiast 6413052cbb Use language codes for Korean and Russian 2015-11-08 12:49:25 +01:00
Gymnasiast eed070bde0 Use string IDs for all currencies 2015-11-08 12:41:55 +01:00
Gymnasiast b7a09cca0c Adjust Arial placement and sizes 2015-11-08 12:26:49 +01:00
Gymnasiast ea5282f508 Add support for Russian 2015-11-08 11:52:47 +01:00
Gymnasiast 4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
Gymnasiast 7a510f76e2 Only play message sound in normal playing mode, fixes #2125 2015-11-08 11:07:35 +01:00
duncanspumpkin 251ee91bf6 Fix #2235 anti clockwise no longer crashes 
Issue cause by %4 not handling negative numbers.
 2015-11-08 09:22:29 +00:00
Duncan d1c597aaa0 Merge pull request #2237 from Gymnasiast/water-colours 
Fix #2231
 2015-11-08 09:09:17 +00:00
Michael Steenbeek a1aa08b209 Fix #2231 2015-11-08 10:06:20 +01:00
IntelOrca 15f6f9b66a remove git merge seperator 2015-11-08 04:10:40 +00:00
IntelOrca 40a885f2c4 Merge branch 'zsilencer-network' into develop 2015-11-08 04:08:53 +00:00
IntelOrca d2aa736492 fix master server communication 2015-11-08 04:02:23 +00:00
Ted John 301c7f53c1 Merge Localisation/master into OpenRCT2/develop. 2015-11-08 04:00:17 +00:00
IntelOrca 0b9882b96f fix master server poll times 2015-11-08 02:22:49 +00:00
IntelOrca 782d3e63b2 add new master server functionality 2015-11-08 02:12:12 +00:00
IntelOrca 9bad4183a7 add default master server url and refactor 2015-11-07 23:56:16 +00:00
IntelOrca 74fe482a62 improve game info json 2015-11-07 23:47:50 +00:00
zsilencer 1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer 9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer 3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
zsilencer d66eb70f56 fix potential overflow 2015-11-07 22:23:41 +00:00
IntelOrca c7a85c5114 add desync debug checks for scenario_rand 2015-11-07 17:56:19 +00:00
Ted John 366e5ced03 Merge pull request #2220 from Gymnasiast/no-entrance-warning 
Add notice that 'No entrance' only works in OpenRCT2
 2015-11-07 14:54:43 +00:00
Michael Steenbeek c9808823a2 Add notice that 'No entrance' only works in OpenRCT2 2015-11-07 15:48:46 +01:00
IntelOrca 2d4b30756e add DEBUG preprocessor definition 2015-11-07 12:50:15 +00:00
Flukiestemperor 8d3655e0f6 fix #2162 2015-11-07 12:22:44 +00:00
Ted John 5d0e88afa0 Merge pull request #2218 from duncanspumpkin/corrupt 
Corrupt Element Inserter
 2015-11-07 11:44:25 +00:00
duncanspumpkin 983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
Ted John 10674fe439 Merge Localisation/master into OpenRCT2/develop. 2015-11-07 04:00:18 +00:00
IntelOrca 4df3d745a4 fix g2 msbuild call 2015-11-07 01:54:58 +00:00
duncanspumpkin 1d828591dc Fix post build event to work with CommandLineToArgvW 2015-11-06 19:40:39 +00:00
duncanspumpkin 6493c83efc Fix regression in last commit 2015-11-06 19:13:29 +00:00
IntelOrca 31ab7c8b98 fix several warnings 2015-11-06 18:50:37 +00:00
IntelOrca daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
Ted John 7366c87e2c Merge pull request #2196 from IntelOrca/custom-user-data-path 
Allow user data path to be specified by command line
 2015-11-06 18:35:38 +00:00
Ted John f68e307c06 Merge pull request #2211 from Gymnasiast/open-new-window 
Correct 'Open new window'
 2015-11-06 18:35:30 +00:00
duncanspumpkin 13e2f8e9ed Fix #2210. Reverts from a0909a2 that cause the up button to load the same directory 2015-11-06 18:02:27 +00:00
Duncan db356290ba Merge pull request #2204 from janisozaur/language-check 
Early out and report error if langauge files are missing
 2015-11-05 22:02:25 +00:00
Michał Janiszewski 2d62c356c3 Early out and report error if langauge files are missing 
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
 2015-11-05 22:41:20 +01:00
IntelOrca 70ef8d6777 add unicode support for windows command line arguments and resolve relative paths to absolute 2015-11-05 21:36:24 +00:00
duncanspumpkin 6684804e28 Fix small regression that caused a black screen when switching between hardware rendering 2015-11-05 21:22:08 +00:00
duncanspumpkin 599c259603 Fix #1749. Rainbow road graphical glitch. 
Issue was caused by the image using an invalid colour entry. This initilises the memory that is expected to return white. Platform update palette also had to be modified to allow this fix to work.
 2015-11-05 19:42:23 +00:00
duncanspumpkin ce06ee8681 Fix #1523. Water tool selection now the correct colour. 2015-11-05 18:02:21 +00:00
Michael Steenbeek 68aea9740d Update english_uk.txt 2015-11-05 14:43:06 +01:00
Ted John 4f68684e28 Merge pull request #2212 from HaasJona/loc 
Fix screen location on resize/alt+tab
 2015-11-05 13:38:04 +00:00
Jonathan Haas 3be79fd738 Fix screen location on resize/alt+tab 2015-11-05 10:16:13 +01:00