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

532 Commits

Author SHA1 Message Date
Ted John 5cf31b8de4 Merge Localisation/master into OpenRCT2/develop. 2015-12-27 04:00:16 +00:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca 4eb8192549 replace tutorial button with new multiplayer button 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
 2015-12-26 17:09:37 +00:00
Ted John 799d377d90 Merge Localisation/master into OpenRCT2/develop. 2015-12-26 04:00:18 +00:00
Ted John 570c732355 Merge Localisation/master into OpenRCT2/develop. 2015-12-25 04:00:18 +00:00
Ian Spence 434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence ba038c10ab Automatically open shops & stalls 
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
 2015-12-24 00:00:41 -08:00
Ted John 652031e0fe Merge Localisation/master into OpenRCT2/develop. 2015-12-24 04:00:18 +00:00
Ted John 578bf2e175 Merge Localisation/master into OpenRCT2/develop. 2015-12-23 04:00:18 +00:00
Ted John 8b9c4d1824 Merge Localisation/master into OpenRCT2/develop. 2015-12-22 04:00:19 +00:00
Ted John b6b18c812f Merge Localisation/master into OpenRCT2/develop. 2015-12-21 04:00:18 +00:00
Gymnasiast dd460300ca Extend fast lift hill cheat and update description 2015-12-20 21:12:24 +01:00
Jonathan Haas bf536ce7b7 Add one decimal place to SI velocities 2015-12-20 11:27:03 +01:00
Ted John 229abec6bf Merge Localisation/master into OpenRCT2/develop. 2015-12-20 04:00:17 +00:00
IntelOrca 22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Rune Laenen 1a4ebcc0f7 Add option to trap mouse cursor 2015-12-18 09:13:26 +01:00
Ted John ed8e6afb6f Merge Localisation/master into OpenRCT2/develop. 2015-12-18 04:00:17 +00:00
Michael Steenbeek 7701dd600c UK: Change 'peep' to 'guest' for consistency 2015-12-17 19:38:42 +01:00
Ted John 59a1701ccc Merge Localisation/master into OpenRCT2/develop. 2015-12-15 04:00:17 +00:00
Ted John a423c6c458 Merge Localisation/master into OpenRCT2/develop. 2015-12-14 04:00:17 +00:00
Ted John 32a794731c Merge Localisation/master into OpenRCT2/develop. 2015-12-13 04:00:17 +00:00
Ted John 3ed756d98c Merge Localisation/master into OpenRCT2/develop. 2015-12-12 04:00:17 +00:00
Ted John 5cacb8d0ec Merge Localisation/master into OpenRCT2/develop. 2015-12-11 04:00:17 +00:00
IntelOrca ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Ted John 8d971d3e0e Merge Localisation/master into OpenRCT2/develop. 2015-12-03 04:00:17 +00:00
Ted John abfc025c5a Merge Localisation/master into OpenRCT2/develop. 2015-12-02 04:00:19 +00:00
IntelOrca 42f5004406 Merge Localisation/master into OpenRCT2/pre-release-0.0.3. 2015-11-30 18:50:39 +00:00
Ted John 9f61ade4d1 Merge Localisation/master into OpenRCT2/develop. 2015-11-30 04:00:18 +00:00
IntelOrca c6056cbb6c Merge branch 'pre-release-0.0.3' into develop 
Conflicts:
	src/audio/audio.c
 2015-11-27 22:05:40 +00:00
Ted John c63eef9a21 Merge pull request #2378 from IntelOrca/support-unicode-currencies 
support unicode currencies with ascii fallback
 2015-11-27 17:56:44 +00:00
Ted John 9b1e1249c3 Merge Localisation/master into OpenRCT2/develop. 2015-11-27 04:00:18 +00:00
Michael Steenbeek ceeedc50cd UK: Missed occurrence of the Fahrenreit symbol 
Thanks to @e-foley for pointing it out.
 2015-11-26 23:38:24 +01:00
IntelOrca 7ea0e2d6a3 improve language load fail behaviour 
improve currencies
fix bug in supported glyph check
 2015-11-26 18:28:52 +00:00
Michael Steenbeek 99a91b11c5 UK: Fahrenheit degree symbol 2015-11-26 16:36:36 +01:00
IntelOrca 46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
Ted John e7655b059a Merge Localisation/master into OpenRCT2/develop. 2015-11-22 04:00:18 +00:00
Ted John 7474515e5c Merge Localisation/master into OpenRCT2/develop. 2015-11-21 04:00:17 +00:00
Ted John 562c9cb68e Merge Localisation/master into OpenRCT2/develop. 2015-11-20 04:00:18 +00:00
Ted John e9deafa5df Merge Localisation/master into OpenRCT2/develop. 2015-11-19 04:00:17 +00:00
Ted John 64159d83d0 Merge Localisation/master into OpenRCT2/develop. 2015-11-18 04:00:17 +00:00
Ted John 50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip 
Remote obsolete date tooltip
 2015-11-17 18:21:29 +00:00
Ted John 9300c7d372 Merge Localisation/master into OpenRCT2/develop. 2015-11-17 04:00:18 +00:00
Gymnasiast 2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
Ted John 9cbc1afbe2 Merge Localisation/master into OpenRCT2/develop. 2015-11-16 04:00:17 +00:00
Gymnasiast 8953357f85 Add Czech and fix some typos 2015-11-15 12:30:13 +01:00
Ted John bcd14ad586 Merge Localisation/master into OpenRCT2/develop. 2015-11-15 04:00:16 +00:00
Ted John 32b1171b2f Merge Localisation/master into OpenRCT2/develop. 2015-11-14 04:00:26 +00:00
duncanspumpkin 45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233 
Add buttons for Up and New File in the load/save dialog and fix #2233
 2015-11-13 22:50:46 +00:00
U-HP-Pavilion-PC\Cameron e2545599ed Converted to sentence case and removed brackets from STR_2718 and 2719 in english_uk.txt 2015-11-13 16:25:52 -06:00