mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-28 05:01:33 +02:00
Code Issues Projects Releases Wiki Activity
7375 commits 9 branches 41 tags 334 MiB
Commit graph

727 commits

Author SHA1 Message Date
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
duncanspumpkin
89f5f53324 Merge branch 'changelog_additions' of https://github.com/e-foley/OpenRCT2 into pre-release-0.0.3 2015-11-30 17:09:35 +00:00
Ted John
9f61ade4d1 Merge Localisation/master into OpenRCT2/develop. 2015-11-30 04:00:18 +00:00
Gymnasiast
d985e1d3d7 Update title sequence for 0.0.3 
Add three parks, increase some intervals

Adjust one interval

Update title sequence for 0.0.3
 2015-11-29 19:10:54 +01: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
U-HP-Pavilion-PC\Cameron
557a89928c Revert "Converted to sentence case and removed brackets from STR_2718 and STR_2719" 
This reverts commit 7aa8e6040e.
 2015-11-13 16:23:16 -06:00
U-HP-Pavilion-PC\Cameron
7aa8e6040e Converted to sentence case and removed brackets from STR_2718 and STR_2719 2015-11-13 16:08:33 -06:00
Ted John
8bcf2e1b8c Merge Localisation/master into OpenRCT2/develop. 2015-11-13 04:00:17 +00:00
Michał Janiszewski
80510c91bd Add ui option to change scale in run-time 
Doesn't let user go lower than 0.5f
 2015-11-12 01:18:42 +01:00
Ted John
207e8e8008 Merge Localisation/master into OpenRCT2/develop. 2015-11-10 04:00:19 +00:00
Ted John
03cbb37d8a Merge Localisation/master into OpenRCT2/develop. 2015-11-09 04:00:16 +00:00
Ted John
40268878a0 Merge pull request #2245 from Gymnasiast/american-spelling 
Correct two instances of American spelling
 2015-11-08 12:49:49 +00:00
Michael Steenbeek
4855a53c22 Correct two instances of American spelling 2015-11-08 13:11:36 +01: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
Gymnasiast
4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01: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
Ted John
301c7f53c1 Merge Localisation/master into OpenRCT2/develop. 2015-11-08 04:00:17 +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
Michael Steenbeek
c9808823a2 Add notice that 'No entrance' only works in OpenRCT2 2015-11-07 15:48:46 +01: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
daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +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
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
Michael Steenbeek
68aea9740d Update english_uk.txt 2015-11-05 14:43:06 +01:00
Michael Steenbeek
b3c8a1d2b7 Correct 'Open new window' 2015-11-05 10:08:08 +01:00
Ted John
273293456c Merge Localisation/master into OpenRCT2/develop. 2015-11-03 04:00:16 +00:00
Ted John
1f9c02fc5f Merge Localisation/master into OpenRCT2/develop. 2015-10-30 04:00:17 +00:00
Ted John
0b66558852 Merge Localisation/master into OpenRCT2/develop. 2015-10-29 04:00:17 +00:00
Ted John
7ac22b3be5 Merge Localisation/master into OpenRCT2/develop. 2015-10-28 04:00:16 +00:00
Ted John
4865cedc59 Merge Localisation/master into OpenRCT2/develop. 2015-10-27 04:00:18 +00:00
Ted John
04eacc8904 Merge Localisation/master into OpenRCT2/develop. 2015-10-26 04:00:17 +00:00
Hielke Morsink
dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John
5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas
475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John
ad7d2b3c00 Merge Localisation/master into OpenRCT2/develop. 2015-10-20 04:00:17 +01:00
Ted John
516cb1f7c9 Merge Localisation/master into OpenRCT2/develop. 2015-10-18 04:00:17 +01:00
IntelOrca
341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca
6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
Ted John
6068b361bc Merge Localisation/master into OpenRCT2/develop. 2015-10-16 04:00:16 +01:00
Ted John
fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types 
Show vehicles from other track types
 2015-10-15 12:57:57 +01:00
Ted John
e6359f486b Merge Localisation/master into OpenRCT2/develop. 2015-10-14 04:00:16 +01:00
Ted John
2db3f4ee23 Merge Localisation/master into OpenRCT2/develop. 2015-10-13 04:00:16 +01:00
Gymnasiast
105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
Ted John
66dd53dd36 Merge pull request #2050 from OpenRCT2/game-command-land-smooth 
Implement mountain tool + enhanced functionality.
 2015-10-11 18:11:18 +01:00
IntelOrca
d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
Ted John
fbd2598ac3 Merge Localisation/master into OpenRCT2/develop. 2015-10-11 04:00:16 +01:00
Ted John
06c33dfd8a Merge Localisation/master into OpenRCT2/develop. 2015-10-06 04:00:17 +01:00
Ted John
21c84375f4 Merge Localisation/master into OpenRCT2/develop. 2015-10-05 04:00:16 +01:00
Ted John
5405cf7efd Merge pull request #2012 from Overv/develop 
Add Steam overlay detection that pauses the game (#1903)
 2015-10-05 00:07:10 +01:00
Ted John
928ef24684 Merge Localisation/master into OpenRCT2/develop. 2015-10-04 04:00:17 +01:00
Alexander Overvoorde
51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Alexander Overvoorde
377650d9f5 Change autosave system to use wall-clock time based frequencies 
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
 2015-10-03 14:25:59 +02:00
Ted John
494869b22e Merge Localisation/master into OpenRCT2/develop. 2015-10-03 04:00:16 +01:00
Ted John
d6631e182b Merge Localisation/master into OpenRCT2/develop. 2015-09-29 04:00:16 +01:00
Ted John
adebebe2d4 Merge Localisation/master into OpenRCT2/develop. 2015-09-28 04:00:17 +01:00
Ted John
4643881389 Merge Localisation/master into OpenRCT2/develop. 2015-09-27 04:00:16 +01:00
IntelOrca
a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
Ted John
0bef4f3467 Merge Localisation/master into OpenRCT2/develop. 2015-09-20 04:00:15 +01:00
Ted John
e4b7785bdd Merge Localisation/master into OpenRCT2/develop. 2015-09-19 04:00:15 +01:00
Gymnasiast
4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Ted John
338855ba50 Merge Localisation/master into OpenRCT2/develop. 2015-09-15 04:00:15 +01:00
Ted John
597c9e19de Merge Localisation/master into OpenRCT2/develop. 2015-09-13 04:00:15 +01:00
Ted John
f081f8430a Merge Localisation/master into OpenRCT2/develop. 2015-09-12 13:59:21 +01:00
Ted John
408665e4a4 Merge Localisation/master into OpenRCT2/develop. 2015-09-11 04:00:15 +01:00
Michael Steenbeek
2c71e8c419 Fix Condor Ride description, fixes #1021 2015-09-10 14:39:49 +02:00
Ted John
85bbdde056 Merge Localisation/master into OpenRCT2/develop. 2015-09-10 04:00:15 +01:00
Ted John
d7a7a81cd0 Merge Localisation/master into OpenRCT2/develop. 2015-09-09 04:00:15 +01:00
Ted John
a0d684a07d Merge Localisation/master into OpenRCT2/develop. 2015-09-07 04:00:15 +01:00
Ted John
54b08da98e Merge Localisation/master into OpenRCT2/develop. 2015-09-05 04:00:15 +01:00
Ted John
4c60112bd5 Merge Localisation/master into OpenRCT2/develop. 2015-09-04 04:00:15 +01:00
Ted John
8c2d0b3730 Merge Localisation/master into OpenRCT2/develop. 2015-09-03 04:00:15 +01: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
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
Gymnasiast
2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
Ted John
580a6c7388 Merge Localisation/master into OpenRCT2/develop. 2015-08-25 04:00:15 +01:00
Ted John
2afd9b8a61 Merge Localisation/master into OpenRCT2/develop. 2015-08-24 04:00:17 +01:00
Ted John
972ae72d87 Merge Localisation/master into OpenRCT2/develop. 2015-08-23 04:00:15 +01:00
Ted John
3bfeddbee7 Merge Localisation/master into OpenRCT2/develop. 2015-08-21 04:00:16 +01:00
Gymnasiast
93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
Ted John
2500ee452e Merge Localisation/master into OpenRCT2/develop. 2015-08-20 04:00:15 +01:00
Runelaenen
2830cdd3a3 Capitalisation of 5512 2015-08-19 23:16:07 +02:00
Runelaenen
6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen
d34a446d61 Easier saving 
Replace Save game functionality and add 'save game as' function
 2015-08-19 22:02:06 +02:00
Ted John
f836590a18 Merge Localisation/master into OpenRCT2/develop. 2015-08-19 04:00:15 +01:00
Gymnasiast
59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Gymnasiast
4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
Ted John
3a8dd25020 Merge Localisation/master into OpenRCT2/develop. 2015-08-18 04:00:15 +01:00
Ted John
e46cc379ab Merge pull request #1803 from medsouz/handymenmowdefault 
Add option for handymen to mow grass by default
 2015-08-17 08:05:18 +01:00
Ted John
00ab8be6af Merge Localisation/master into OpenRCT2/develop. 2015-08-17 04:00:16 +01:00
medsouz
3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
xperia64
a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64
4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
IntelOrca
094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
Gymnasiast
c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
Ted John
905efcd412 Merge Localisation/master into OpenRCT2/develop. 2015-08-16 04:00:15 +01:00
IntelOrca
f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca
3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer
d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer
7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
IntelOrca
99f2b87043 add chat feature 2015-08-14 09:13:29 -06:00
Ted John
80281e82ea Merge pull request #1778 from Gymnasiast/patch-2 
Mark former tutorial strings as unused
 2015-08-14 13:57:15 +01:00
Ted John
e9c8d03bd9 Merge Localisation/master into OpenRCT2/develop. 2015-08-14 04:00:15 +01:00
Michael Steenbeek
5ee6d563d0 Mark former tutorial strings as unused 2015-08-13 10:40:37 +02:00
Ted John
76df9b156a Merge Localisation/master into OpenRCT2/develop. 2015-08-13 04:00:15 +01:00
Gymnasiast
d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John
16653b6f9f Merge Localisation/master into OpenRCT2/develop. 2015-08-12 04:00:14 +01:00
medsouz
e0e9dedb8b Moved strings to english_uk.txt 2015-08-11 07:30:29 -04:00
medsouz
db9ea4cdf3 Added toggle for audio disable on focus lost 
This closes #1758
 2015-08-11 07:06:00 -04:00
LRFLEW
d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John
7395752ddf Merge Localisation/master into OpenRCT2/develop. 2015-08-10 04:00:15 +01:00
Ted John
5ae099c062 Merge Localisation/master into OpenRCT2/develop. 2015-08-08 04:00:15 +01:00
Ted John
2a9698c7c2 Merge Localisation/master into OpenRCT2/develop. 2015-08-07 04:00:14 +01:00
Ted John
b081f27a92 Merge Localisation/master into OpenRCT2/develop. 2015-08-06 04:00:15 +01:00
IntelOrca
19f94b54e1 fix #1669 2015-08-05 13:44:47 +01:00
IntelOrca
cec486839c add 'no entrance' style and refactor a few things 2015-08-05 01:24:18 +01:00
danidoedel
1fc7c0ecac fix recent messages toolbar tooltip 2015-08-04 17:56:12 +02:00
IntelOrca
d228d13918 implement utf8, part 23 (bug fixes) 2015-08-01 16:40:15 +01:00
IntelOrca
31eb758ba1 implement utf8, part 15 2015-08-01 10:20:57 +01:00
Ted John
c389228141 Merge Localisation/master into OpenRCT2/develop. 2015-08-01 04:00:15 +01:00
Ted John
192289de87 Merge Localisation/master into OpenRCT2/develop. 2015-07-30 04:00:13 +01:00
Michael Steenbeek
e16b6fb2d0 GB: Fix use of American English 2015-07-29 08:46:32 +02:00
Ted John
8282802574 Merge Localisation/master into OpenRCT2/develop. 2015-07-29 04:00:14 +01:00
Ted John
ea130a6126 Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2 
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
 2015-07-28 12:08:47 +01:00
Gymnasiast
9976b9673a Remove rest of Six Flags branding. 2015-07-28 10:13:16 +02:00
Ted John
c35d1ce65f Merge Localisation/master into OpenRCT2/develop. 2015-07-28 04:00:14 +01:00
Gymnasiast
5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
Gymnasiast
65900982c4 Fix '1 weeks remaining' 2015-07-27 17:33:22 +02:00
Duncan
cfb8f3ae0a Merge pull request #1691 from Gymnasiast/more-obsolete-strings 
Mark more obsolete strings
 2015-07-27 12:23:30 +01:00
Gymnasiast
38f031655c Fix display of remaining marketing campaign weeks 2015-07-27 10:34:19 +02:00
Gymnasiast
c2fe82dcb7 Mark more obsolete strings 2015-07-27 10:16:08 +02:00
Ted John
0ef9627058 Merge Localisation/master into OpenRCT2/develop. 2015-07-27 04:00:15 +01:00
Ted John
30ee1096b7 Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash 
Allow running marketing campaigns for up to 12 weeks
 2015-07-26 21:48:39 +01:00
Gymnasiast
777065e6a6 Allow running marketing campaigns for up to 12 weeks 2015-07-26 22:36:12 +02:00
Ted John
8bfdbdec65 Merge pull request #1687 from Gymnasiast/fix-intro-option 
Remove Infogrames disclaimer from intro and fix config option
 2015-07-26 21:33:26 +01:00
Matt Layher
06f2adb9d6 Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672 2015-07-26 21:30:29 +01:00
Gymnasiast
ce7a0ac27b Remove Infogrames disclaimer from intro and fix config option 2015-07-26 16:07:58 +02:00
Gymnasiast
bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Ted John
0d8d797f15 Merge Localisation/master into OpenRCT2/develop. 2015-07-26 04:00:14 +01:00
Ted John
f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners 
Add feature to make banners display text in all caps
 2015-07-25 20:50:02 +01:00
Gymnasiast
ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
Michael Steenbeek
290fbfb6e4 Fix typo 2015-07-25 18:09:30 +02:00
Michael Steenbeek
e3c275644b Update and mark obsolete strings 2015-07-25 18:07:38 +02:00
IntelOrca
5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca
b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
IntelOrca
1f2502c8c2 add recent messages to toolbar, closes #1423 2015-07-22 18:13:35 +01:00
Ted John
18e492b898 Merge Localisation/master into OpenRCT2/develop. 2015-07-22 04:00:14 +01:00
Ted John
6d6ceccc97 Merge Localisation/master into OpenRCT2/develop. 2015-07-18 04:00:13 +01:00
Michael Steenbeek
57818c3835 Use standard spelling of 'tigre', closes #1637 2015-07-17 10:21:18 +02:00
IntelOrca
48028fcfc4 fix #1631, fix #1632 2015-07-16 16:42:46 +01:00
Ted John
f180ceb71c Merge Localisation/master into OpenRCT2/develop. 2015-07-15 04:00:16 +01:00
Michael Steenbeek
f7dd9859e4 Fix merge error in englush_uk.txt 2015-07-14 10:16:16 +02:00
Ted John
b04ba50400 Merge Localisation/master into OpenRCT2/develop. 2015-07-14 04:00:24 +01:00
Ted John
a1e67fd106 Merge Localisation/master into OpenRCT2/develop. 2015-07-11 04:00:40 +01:00
IntelOrca
c80475f7db allow disable clearance checks for footpaths 2015-07-10 21:38:05 +01:00
IntelOrca
9c8be6a483 allow disable clearance checks for footpaths 2015-07-10 21:33:32 +01:00
IntelOrca
d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
Gymnasiast
be635030bd Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun 2015-07-09 16:36:45 +02:00
IntelOrca
6527bc6ac2 add shortcut versions and rotate clockwise/anticlockwise shortcut 2015-07-09 13:50:33 +01:00
Runelaenen
8ec0024a4d Changed strings for #1495 2015-07-09 14:22:24 +02:00
Runelaenen
5109224ba0 Add submenu and anti-clockwise rotation 2015-07-09 14:22:22 +02:00
Ted John
ef7603013e Merge Localisation/master into OpenRCT2/develop. 2015-07-07 04:00:22 +01:00
Ted John
294456daa1 Merge Localisation/master into OpenRCT2/develop. 2015-07-06 04:00:17 +01:00
Michael Steenbeek
2c64609903 Properly differentiate between the Twister RC track and the Twister RC vehicle. 
Stops two different rides from showing up as 'Twister RC'.
 2015-07-05 11:01:20 +02:00
Ted John
8fe245721b Merge Localisation/master into OpenRCT2/develop. 2015-07-05 04:00:14 +01:00
zsilencer
76b231c150 add option to uncap fps, and fix #1470 2015-07-04 13:14:14 -06:00
Ted John
392c302d96 Merge Localisation/master into OpenRCT2/develop. 2015-07-04 04:00:14 +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
Ted John
c0b45d8651 Merge Localisation/master into OpenRCT2/develop. 2015-07-01 04:00:15 +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
380d459dfb Merge Localisation/master into OpenRCT2/develop. 2015-06-29 04:00:15 +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
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
danidoedel
06ee0342b7 Fix window titles (cheats) 2015-06-28 14:52:05 +02:00
Thomas
e72739dbd6 Add cheat to force park rating 2015-06-28 13:38:38 +02:00
Michael Steenbeek
fb9fe6615b Fix typo 2015-06-28 11:11:07 +02:00
Ted John
0a1cd30597 Merge Localisation/master into OpenRCT2/develop. 2015-06-28 04:00:16 +01:00
Michael Steenbeek
a4322cb855 Fix observation tower and launched freefall descriptions 2015-06-27 16:25:42 +02:00
Duncan
2c58910f62 Merge pull request #1485 from OpenRCT2/object-selection-columns 
Object selection columns
 2015-06-27 09:16:57 +01:00
Ted John
c00df00801 Merge Localisation/master into OpenRCT2/develop. 2015-06-27 04:00:15 +01:00
Ted John
7527a74d7d Merge Localisation/master into OpenRCT2/develop. 2015-06-26 04:00:19 +01:00
IntelOrca
2e47f2a26a object-selection-columns: finish sorting and add ride tab animations 2015-06-26 01:11:24 +01:00
Maikel Stuivenberg
831bc6b3bd Added a back button on "Select Design" list #1346 2015-06-26 01:21:35 +02:00
Duncan
d11b8bc8fa Merge pull request #1478 from trigger-death/develop 
Added Get button to command editor
 2015-06-25 21:30:04 +01:00
Michael Steenbeek
a1c3de02b3 Correct typos and American English 2015-06-25 21:56:56 +02:00
Robert Jordan
31e8e604fe Added Get button to command editor 2015-06-25 14:27:09 -04:00
Robert Jordan
92a31a0fd7 Changed strings 2015-06-25 12:27:57 -04:00
Robert Jordan
e255310abf Fixed merge conflicts in english_uk 2015-06-25 11:22:11 -04:00
Robert Jordan
5645d8bd8a Added Game Speed command 2015-06-25 11:19:23 -04:00
Robert Jordan
937b887a91 Title Sequence Editor Improvements 2015-06-25 10:41:40 -04:00
Michael Steenbeek
e66ba829e1 Update tooltip 2015-06-25 12:19:38 +02:00
Ted John
e32a7ab01a Merge Localisation/master into OpenRCT2/develop. 2015-06-25 04:00:16 +01:00
Robert Jordan
0a4ac08caa Minimize fullscreen on focus loss 2015-06-24 18:12:53 -04:00
Robert Jordan
a3a993dabd Title Sequence editor 2015-06-24 12:25:54 -04:00
Gymnasiast
13106dba08 Only allow changing the option for select-by-ride-type in the title screen, to prevent strange behaviour 2015-06-24 13:22:10 +02:00
Gymnasiast
a6225ebf06 Add option to select by track type (RCT1 style); correct misspellings of 'separate' 2015-06-24 12:41:19 +02:00
Ted John
e39505e23d Merge Localisation/master into OpenRCT2/develop. 2015-06-23 04:00:15 +01:00
Robert Jordan
592e266411 Reserved more strings (up to 5440) 2015-06-22 16:23:54 -04:00
Robert Jordan
825b165db5 Reserve Strings 5377-5426 2015-06-22 15:49:19 -04:00
Ted John
473eea3bfc Merge pull request #1424 from ThomasdenH/load_save_sorting 
Load save sorting by date
 2015-06-22 16:00:41 +01:00
Thomas
ce26812caa Add sorting based on date 2015-06-22 13:49:35 +02:00
Ted John
8c16d60f0d Merge Localisation/master into OpenRCT2/develop. 2015-06-22 04:00:18 +01:00
Thomas
fd914094a7 Add option to invert viewport dragging (#1332) 2015-06-20 17:52:38 +02:00
IntelOrca
4d4a000117 add object selection to debug dropdown 2015-06-20 15:07:36 +01:00
Ted John
218b654537 Merge Localisation/master into OpenRCT2/develop. 2015-06-20 04:00:16 +01:00
Duncan Frost
15b2360e13 Implemented object_create_identifier_name and start of last func. 
Note requires modification of the strings.
 2015-06-19 21:34:41 +01:00
Gymnasiast
0491d971f3 Add cheat to edit park parameters/scenario options in-game 2015-06-19 14:59:48 +02:00
Ted John
ef3d7c2080 Merge Localisation/master into OpenRCT2/develop. 2015-06-19 04:00:15 +01:00