Ted John
bf39fc36b1
Merge Localisation/master into OpenRCT2/develop.
2015-06-02 04:00:13 +01:00
Robert Jordan
80aaae3c8d
Changed preset to theme
2015-06-01 11:06:07 -04:00
Robert Jordan
765bf976ee
Renamed Colour Schemes to Themes
...
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
2015-06-01 11:02:09 -04:00
Ted John
0a5236be1c
Merge Localisation/master into OpenRCT2/develop.
2015-06-01 04:00:13 +01:00
Ted John
da532dd7f0
Merge Localisation/master into OpenRCT2/develop.
2015-05-31 04:00:13 +01:00
rd3k
395773cdd6
Add cheat to make all guests feel nauseous
2015-05-31 02:04:01 +01:00
Robert Jordan
41171aa304
Resolved Merge Conflicts
2015-05-30 16:00:13 -04:00
Robert Jordan
eb19ae7995
Final changes
2015-05-30 12:43:24 -04:00
Robert Jordan
53a241d197
Finished ini file loading and removed warnings
2015-05-30 11:52:08 -04:00
Michael Steenbeek
b1e94bf110
Consistently use colons after labels that are followed by a dropdown
2015-05-30 14:35:59 +02:00
Ted John
7c29d781dc
Merge Localisation/master into OpenRCT2/develop.
2015-05-30 04:00:13 +01:00
rd3k
257d3b8469
proper cheat and Twitch window tooltips, fix #1167
2015-05-30 02:51:20 +01:00
Robert Jordan
dbc1df308f
Issues with Dropdown text
2015-05-29 16:42:57 -04:00
rd3k
3a55c060f7
fix #1163
2015-05-29 20:59:16 +01:00
Robert Jordan
dc1e38180e
Starting work on colour schemes config settings
2015-05-29 12:04:53 -04:00
Ted John
12d5542861
Merge Localisation/master into OpenRCT2/develop.
2015-05-29 04:00:17 +01:00
Ted John
9dc19c6bc2
Merge Localisation/master into OpenRCT2/develop.
2015-05-28 04:00:22 +01:00
Ted John
6c89274bb1
Merge Localisation/master into OpenRCT2/develop.
2015-05-27 04:00:13 +01:00
Ted John
1fe3bacf43
Merge Localisation/master into OpenRCT2/develop.
2015-05-26 04:00:12 +01:00
Miso Zmiric (Mike Squinter)
c2c9bbf4ef
add twitch integration, part 2
2015-05-25 20:38:33 +01:00
Ted John
b26e546171
Merge Localisation/master into OpenRCT2/develop.
2015-05-25 04:00:14 +01:00
Robert Jordan
6bc081edca
Added date format to culture options menu
2015-05-24 12:38:07 -04:00
Gymnasiast
81272f5ab7
Resolved merge conflict
2015-05-23 14:22:24 +02:00
Ted John
d145711d37
Merge Localisation/master into OpenRCT2/develop.
2015-05-23 04:00:13 +01:00
Gymnasiast
0a093be3b1
Resolve merge conflict
2015-05-23 02:24:07 +02:00
Gymnasiast
7868d19522
Add option to exit Openrct2
2015-05-23 02:21:05 +02:00
Robert Jordan
37221f0aae
Testing Improvements
...
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
2015-05-22 14:18:48 -04:00
Gymnasiast
121052b807
Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window
2015-05-22 12:41:22 +02:00
Ted John
05d709143c
Merge Localisation/master into OpenRCT2/develop.
2015-05-22 04:00:13 +01:00
IntelOrca
0013310f0d
add hardware display
2015-05-22 03:17:46 +01:00
Gymnasiast
36ccfe77e0
Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows
2015-05-21 12:28:51 +02:00
Ted John
66b47d3339
Merge Localisation/master into OpenRCT2/develop.
2015-05-21 04:00:13 +01:00
IntelOrca
bdd712bc4b
fix config parsing bug
2015-05-21 02:52:32 +01:00
Ted John
a27a516e30
Merge pull request #1112 from trigger-death/sprite-build-command
...
Sprite build command
2015-05-21 01:45:30 +01:00
IntelOrca
776c85db74
allow localisation of digit seperator and decimal point
2015-05-20 20:11:50 +01:00
Robert Jordan
c7e3639663
Sprite build command
...
build uses ../../data/g2.dat and all numbered images in
../../resources/g2/.
No other parameters needed.
Also changed speed button hyper arrows to support game speeds inbetween
4 and 8.
2015-05-20 11:52:40 -04:00
Ted John
86a1ba3994
Merge Localisation/master into OpenRCT2/develop.
2015-05-20 04:00:14 +01:00
Robert Jordan
d764927fe2
Changed "Ludicrous Speed" to "Hyper Speed"
2015-05-19 11:56:47 -04:00
Robert Jordan
0a71b633c7
Added game speed button sprites
...
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
2015-05-19 11:51:59 -04:00
Ted John
8f19ecbdef
Merge pull request #1094 from trigger-death/new-title-logo
...
Changed Title Logo
2015-05-19 14:18:22 +01:00
Robert Jordan
c48645a67a
Changed Title Logo
...
Started placing g2.dat sprites in resources/g2
2015-05-18 23:33:21 -04:00
Ted John
e2ba2696ee
Merge Localisation/master into OpenRCT2/develop.
2015-05-19 04:00:13 +01:00
IntelOrca
c1260fc11f
add command line sprite editor and additional custom graphics (g2.dat)
2015-05-19 00:26:31 +01:00
Robert Jordan
6faaca53aa
Added game speed button and other changes
...
Game speed button with up to 4/5 speeds.
Debugging tools option to enable non-playable changes.
Cheat window is now a setting.
Game speeds 5-7 are removed.
Game speed 8 added with enabling debugging tools.
Windows and news ticker update once per tick instead of based on game
speed.
2015-05-18 18:15:43 -04:00
Ted John
694b86da16
Merge Localisation/master into OpenRCT2/develop.
2015-05-18 04:00:12 +01:00
Ted John
7a22ff57cf
Merge pull request #1085 from Gymnasiast/disable-all-breakdowns
...
Add cheat option to disable breakdowns completely.
2015-05-17 23:01:58 +01:00
Ted John
14db9a78cd
Merge pull request #1081 from Gymnasiast/allow-high-launch-speeds
...
Allow maxing out launch speed and many other operation settings as well
2015-05-17 18:21:08 +01:00
Gymnasiast
dc524c1b6a
Add cheat option to disable breakdowns completely.
2015-05-17 18:55:57 +02:00
Ted John
65ff82b187
Merge pull request #1076 from Gymnasiast/disable-brakes-failure
...
Add a cheat option to disable brakes failure
2015-05-17 16:50:52 +01:00
Gymnasiast
8f82175fec
Allow maxing out launch speed and many other operation settings as well
2015-05-17 17:26:07 +02:00
Ted John
2fa9b1a5a0
Merge pull request #1075 from Gymnasiast/develop
...
Extend the RCT1 colour scheme to the scenario select and start new campaign window
2015-05-17 13:45:12 +01:00
Gymnasiast
f79c9811c9
Add string for 'Disable brakes failure'
2015-05-17 14:28:33 +02:00
Gymnasiast
8d0ab82d65
Extend the RCT1 colour scheme to the scenario select and start new campaign window
2015-05-17 12:55:26 +02:00
Ted John
f1e3668127
Merge Localisation/master into OpenRCT2/develop.
2015-05-17 04:00:11 +01:00
Gymnasiast
02ba241385
Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces
2015-05-16 17:16:09 +02:00
IntelOrca
cad8295c53
Merge Localisation/master into OpenRCT2/develop.
2015-05-16 10:27:15 +01:00
IntelOrca
f7972f0d48
Merge branch 'land-rights-tool' of https://github.com/trigger-death/OpenRCT2 into trigger-death-land-rights-tool
...
Conflicts:
data/language/english_uk.txt
2015-05-15 22:10:13 +01:00
Robert Jordan
3940bf4538
Fixed spelling error in tooltip
2015-05-15 16:09:25 -04:00
Robert Jordan
730d2bb2e8
Added Buy to land rights tooltip
2015-05-15 16:08:37 -04:00
Robert Jordan
e3451df703
Fixed up strings
2015-05-15 16:06:59 -04:00
Robert Jordan
6d5a07f7ef
Finished cleaning up land rights tool code
2015-05-15 15:19:36 -04:00
Runelaenen
fc7cae9e57
Updated tab and language
...
Removed the string from US.
Changed tab to 4 spaces in UK.
I'll add it to the /OpenRCT2/Language repo.
2015-05-15 18:53:31 +02:00
Robert Jordan
09cc46c1e6
Almost finished land rights tool
2015-05-15 11:28:27 -04:00
Runelaenen
2144d9e787
Cheat fix all rides
2015-05-15 16:49:46 +02:00
IntelOrca
b8dcb71bc6
Merge Localisation/master into OpenRCT2/develop.
2015-05-14 17:24:37 +01:00
Robert Jordan
a8ec43f065
Select size strings now use args
2015-05-13 11:38:44 -04:00
Robert Jordan
ceaa97c321
Land tool paint mode, and text input sizes
2015-05-12 11:37:16 -04:00
Robert Jordan
b49676a887
Added option for random title music in main menu
...
Added STR_5126 to UK and US languages
rand() is seeded in rct2_init()
2015-05-11 13:17:33 -04:00
IntelOrca
82dd805823
Merge Localisation/master into OpenRCT2/develop.
2015-04-17 10:24:51 +01:00
IntelOrca
2a463b9909
Merge Localisation/master into OpenRCT2/develop.
2015-04-01 21:26:27 +01:00
Michael Steenbeek
59c913222f
Two small fixes for UK English
...
Explanation:
- OpenRCT2 changed Dfl. into the correct fl. for guilders last year, except in the dropdown menu in the Options window, which this PR fixes.
- Since the Music option is no longer followed by a dropdown (as it's turned into a checkbox), the colon after it should be dropped, which this PR does.
2015-03-30 17:52:38 +02:00
Michael Steenbeek
d9f31ba058
Add cheat to make all rides destructible
2015-03-28 19:29:51 +01:00
IntelOrca
43d90e8eb0
Merge branch 'develop' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-develop
2015-03-28 17:14:00 +00:00
Duncan Frost
ac23ef2787
Research now resets funding when all rides finished. New string to indicate reasearch complete
2015-03-28 12:42:09 +00:00
Michael Steenbeek
9828b93e18
Add a cheat to remove Six Flags status from rides
2015-03-26 21:53:29 +01:00
Gymnasiast
77816e2029
Differentiate between powered launch modes
2015-03-20 17:34:02 +01:00
Michael Steenbeek
d810694ac9
Add renew rides string
2015-03-18 16:22:43 +01:00
IntelOrca
5dde7c364a
Merge Localisation/master into OpenRCT2/develop.
2015-03-18 11:47:10 +00:00
Gymnasiast
5a5cf21cd3
Made subtype switching an option
2015-03-14 20:29:49 +01:00
IntelOrca
de34ab5ed8
add options for finance and research on toolbar
2015-03-07 16:38:17 +00:00
IntelOrca
21a53841b5
Merge Localisation/master into OpenRCT2/develop.
2015-02-28 14:47:20 +00:00
Michael Steenbeek
60a49aad77
Make (up) and (new file) strings translatable
2015-02-27 10:48:29 +01:00
Michael Steenbeek
81527037d4
Make (up) and (new file) strings translatable
2015-02-27 10:47:01 +01:00
IntelOrca
ba2246dd8c
Merge Localisation/master into OpenRCT2/develop.
2015-02-25 20:56:17 +00:00
IntelOrca
b53c828ae4
add nicer string for new scenarios default name, fixes #864
2015-02-25 18:08:25 +00:00
Thomas
19b710da5c
Make cheat strings translatable
2015-02-25 12:27:31 +01:00
Thomas
b5d0c3466b
Resolve string conflict
...
Simplex noise and autosave used the same string constants
2015-02-22 15:49:23 +01:00
IntelOrca
a3df2527b0
implement autosaving, closes #778
2015-02-21 11:05:15 +00:00
IntelOrca
ff8bef8fc3
try to fix to scenario complete issues
2015-02-21 02:04:46 +00:00
Nicholas Brochu
14d919819b
Added a 3rd tab to Map Generation (Simplex)
...
Complete with sensible defaults.
2015-02-16 01:18:08 -05:00
Thomas
671aff6534
Add button to use native file browser
2015-02-15 19:48:25 +01:00
Thomas
757dd9b1e8
Add save strings for English_us and Dutch
2015-02-15 17:20:31 +01:00
Ted John
06da706e1a
Merge pull request #780 from Gymnasiast/patch-3
...
Add Dutch map generation strings
2015-02-14 14:56:46 +00:00
IntelOrca
ac4cd56b63
add new load / save window, closes #580
2015-02-14 02:16:03 +00:00
Michael Steenbeek
eaf66f959e
Change string to reflect outcome of discussion
2015-02-13 11:22:22 +01:00
Michael Steenbeek
99abf81ea4
Add Dutch map generation strings
...
As added by f6c09b44b6
.
@IntelOrca: please wait one day before merging.
2015-02-11 13:22:19 +01:00
IntelOrca
f6c09b44b6
merge in random map generator
2015-02-10 20:11:59 +00:00
IntelOrca
5b3c1b6764
finalise placing of trees
2015-02-10 19:52:24 +00:00
Michael Steenbeek
9d07a94407
Added new strings for units and title screen music
...
Rebase of #767
2015-02-09 19:56:40 +01:00
IntelOrca
9d2abf1925
add map generation window
2015-02-09 18:32:58 +00:00
Maarten Peters
3fc315c3f4
Minor enhancement
2015-02-09 17:38:04 +01:00
Maarten Peters
c190269e9c
Update dutch translation according to latest changes
2015-02-09 17:34:31 +01:00
Adrian Wielgosik
aee937e9d9
Add new localizable strings to polish.txt
2015-02-09 14:51:29 +01:00
Adrian Wielgosik
769e77d3d5
Some work on Polish language
2015-02-09 14:13:45 +01:00
IntelOrca
7ea809492a
allow translation of unit and date strings, closes #307
2015-02-09 12:53:11 +00:00
IntelOrca
ce719ef086
fix fullscreen issues and add title music option
2015-02-06 22:35:08 +00:00
Krutonium
e78f389c37
Fixed Cheat Strings
2015-02-04 18:30:51 -05:00
IntelOrca
1ece6e4a70
Merge branch 'master' into develop
2015-01-17 20:40:31 +00:00
Ted John
85d1537a6f
Merge pull request #533 from mrtnptrs/Dutch_translation_improvements
...
Dutch translation improvements
2015-01-15 11:48:44 +00:00
IntelOrca
8b0913b045
Merge branch 'master' into develop
2015-01-08 18:01:57 +00:00
Ted John
0be7814c08
Merge pull request #640 from hostbrute/patch-1
...
Update dutch.txt
2015-01-08 18:00:32 +00:00
Ted John
a0c6eecf41
Merge pull request #552 from fbourigault/french-language
...
French translation
2015-01-08 18:00:04 +00:00
IntelOrca
30a953434d
Merge branch 'master' into develop
2015-01-05 12:38:07 +00:00
Ted John
67931aeabe
Merge pull request #531 from mrtnptrs/Remove_dashes_after_the_colon
...
Remove dashes after the colon at every language file
2015-01-05 12:23:42 +00:00
Ted John
58ebd40901
Merge pull request #643 from Gymnasiast/patch-4
...
Add missing Dutch invention list strings
2015-01-05 00:38:19 +00:00
Ted John
9a3a99316d
Merge pull request #661 from Tinytimrob/develop
...
Strings in UK language file are wrong
2015-01-01 14:29:59 +00:00
Gymnasiast
4f9b8ea43a
Add missing handyman strings
2015-01-01 13:57:38 +01:00
Robert James Dennington
7fda6d4866
Update english_uk.txt
...
Corrected some strings to match UK release
2014-12-31 14:38:12 +00:00
atmaxinger
ccac7dfa1a
Update German translation of cheat window
2014-12-26 17:37:27 +01:00
Mattias Harrysson
80dbecbade
s/Gånvägen/Gångvägen
2014-12-18 22:18:59 +01:00
Mattias Harrysson
02720146f3
s/tranporterar/transporterar
2014-12-18 22:13:33 +01:00
Mattias Harrysson
40472c0342
s/acceleras/accelereras
2014-12-18 22:11:53 +01:00
Mattias Harrysson
007a2415af
s/spekhastighet/spelhastighet/
2014-12-18 22:08:43 +01:00
Gymnasiast
43d4245661
Add missing Dutch invention list strings
...
English strings added in d7212c1b14
2014-12-17 11:03:29 +01:00
IntelOrca
d7212c1b14
implement inventions list window, fixes #630
2014-12-16 01:24:13 +00:00
hostbrute
4f0ad7980c
Update dutch.txt
...
miniachtbaan -> mini-achtbaan
2014-12-15 21:22:38 +01:00
Gymnasiast
4e47b50a6f
Missing Dutch cheat window strings
...
As added for English by commit e887311219
.
2014-12-10 10:23:11 +01:00
IntelOrca
e887311219
add more cheats to cheat window and a small amount of refactoring
2014-12-10 01:44:30 +00:00
Gymnasiast
c8c9817308
Missing Dutch cheat window strings
2014-11-23 17:37:48 +01:00
Duncan Frost
97abffd4e8
Added force sun/thunder cheat.
2014-11-05 20:26:27 +00:00
Fabien Bourigault
c1466999c8
Translate beginners tutorial.
2014-11-04 14:18:49 +01:00
Duncan Frost
70c06d62ef
Added zero clearance cheat tool. Warning does not clean itself up
2014-11-03 21:15:35 +00:00
Maarten Peters
c77f788a7d
As discussed
2014-10-21 22:07:56 +02:00
Gabriel Huber
4ae393e85d
Added german translation
2014-10-21 02:08:55 +02:00
Maarten Peters
f40c1f7654
Just look and see if you like it....
...
Ook hier en daar wat dichter bij de Engelse versie....
2014-10-21 00:10:20 +02:00
Maarten Peters
d76a453f75
And again...
...
Also brought some nice variations to the award names...
2014-10-20 02:42:38 +02:00
Maarten Peters
c40f81da0e
As discussed again...
2014-10-18 21:51:09 +02:00
Maarten Peters
13cbeb5cf4
As discussed
2014-10-18 18:39:36 +02:00
Maarten Peters
be287397c2
As discussed and again more changes!
2014-10-18 18:05:59 +02:00
Maarten Peters
136c04a8a5
As discussed and more changes...
...
STR_2172: Dit staat in Nederland ook bekend onder de naam Trechterkoekjes, zal ik het maar naar dat veranderen?
STR_2259: Is er geen beter woord voor thematisering? Misschien gewoon thema? :)
STR_2400-2407: were translated wrong!!!! Or am I stupid?! Numbers under 20 have shouldn't be written in numbers.
2014-10-18 17:09:36 +02:00
Maarten Peters
f56351f8de
And again a few improvements...
...
STR_1015: Is OpenRCT2 able to display these special characters?
STR_1080: Should we translate the names of the movies?
STR_1093: Should we translate this one and when yes, into what?
STR_1099: Shoud the second "op" be replaced here by "van" or something?
STR_1174: Is there no better translation of the word "Banner"? I have never heard of the word "Banier."
STR_1357: To what should we translate "holes"?
STR_1365: Should we translate this one, when yes, into what?
STR_1370: Into what should we translate Barrel roll? STR_1378: And what to do with Heartline roll?
STR_1673: Does someone know a better translation for Spinning Control Toggle Track, as Draaistop looks a bit odd now.
STR_1760: Shouldn't this be translated to Invulmodus or Vervangmodus or something? This is now a strange/odd translation
2014-10-18 16:00:43 +02:00
Maarten Peters
818a45163e
Here a few more improvements, still do not merge it!
...
What do the others think of it?
STR_0569: we zijn niet bij de Flodders thuis!
STR_0586: not sure about this change. Also the sentence itself is a bit too long and odd. Does anyone have suggestions to improve this sentence or shall we leave it as it is?
STR_0908, STR_0910-STR_0913: Where is this string for (expecially STR_0908) and what does it mean?! So, what does roll means in Dutch? Rollen or looping or something? I think we have to change roll into something else...
2014-10-18 14:35:33 +02:00
Maarten Peters
10141c6cbf
The suggested changes
2014-10-18 13:59:34 +02:00
Maarten Peters
419b275cd8
Second few Dutch translation improvements
...
STR_1517: better translation. str_3045: we're living in 2014 now! :)
2014-10-18 12:33:40 +02:00
Maarten Peters
e2ba06f8a2
First Dutch improvements
...
What do the other translators think of this? Also make some translation much "easier." As some young kids won't understand some of these used words. STR_3333: to let it fit in the options screen
2014-10-18 10:57:04 +02:00
Maarten Peters
4f642cd792
Stupid me.... forgot three ones at the English-UK-file
2014-10-17 23:20:41 +02:00
Maarten Peters
d22ac170d4
Removed the dashes behind the colons: Swedish
2014-10-17 23:17:56 +02:00
Maarten Peters
5a885332b2
Removed the dashes behind the colons: Spanish-SP
2014-10-17 23:14:20 +02:00
Maarten Peters
96553c253e
Removed the dashes behind the colons: Polish
2014-10-17 23:08:32 +02:00
Maarten Peters
558da3d272
Removed the dashes behind the colons: Hungarian
2014-10-17 23:04:31 +02:00