27657 Commits

Author SHA1 Message Date
Duncan Frost
1adeb35e69 Decompiled first part of left down 2014-08-16 00:43:19 +01:00
Ted John
dd58b673e2 Merge pull request #299 from Gymnasiast/master
Another update for dutch.txt
2014-08-15 22:11:56 +01:00
Gymnasiast
e4450b65d9 Fixed one string 2014-08-15 23:07:35 +02:00
Gymnasiast
fd7f441bdf New string and some fixes
Also followed recommendations in #296
2014-08-15 23:05:49 +02:00
IntelOrca
62a24e5383 add research window
As seen from RollerCoaster Tycoon 1. This allows the player to change the priorities in a "no money" park. I find it also more logical than the two research panels being separated in finances and new ride windows.
2014-08-15 22:05:35 +01:00
IntelOrca
e76f0db614 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Conflicts:
	data/language/dutch.txt
2014-08-15 19:19:11 +01:00
IntelOrca
df44d585df Merge branch 'Gymnasiast-master' 2014-08-15 19:14:53 +01:00
IntelOrca
bed7d0aacf Merge branch 'master' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-master
Conflicts:
	data/language/dutch.txt
2014-08-15 19:14:07 +01:00
Ted John
b95d3b4375 Merge pull request #298 from duncanspumpkin/gfx_play
Gfx play
2014-08-15 18:58:54 +01:00
Duncan Frost
d8ab81c456 Fixed Zoom bug. No longer uses undefined behaviour. 2014-08-15 15:07:35 +01:00
Duncan Frost
4ec0920968 Trying to solve gfx issues 2014-08-15 14:46:26 +01:00
Ted John
1060c54674 Merge pull request #297 from duncanspumpkin/language_cleanup
Language cleanup
2014-08-15 14:38:34 +01:00
Duncan Frost
5aebdf0566 Added missing inline sprites 2014-08-15 14:27:56 +01:00
Duncan Frost
e418b926a5 Add new language files to vs project 2014-08-15 13:45:12 +01:00
Gymnasiast
2384d8f15b Extra translated strings, some fixed typos 2014-08-15 11:11:22 +02:00
Gymnasiast
591b5d4382 Added new OpenRCT2 strings for language switching 2014-08-15 10:34:06 +02:00
Gymnasiast
6e1a0202fc Update dutch.txt, also fixes #287 for Dutch
Also contains a few additional strings and fixes typos.
2014-08-15 10:24:49 +02:00
IntelOrca
0b744c684a add french language 2014-08-15 00:13:08 +01:00
Ted John
064c403ad9 Merge pull request #283 from fbourigault/feature-language-french
Add french language
2014-08-15 00:01:29 +01:00
IntelOrca
75d0b381c8 Merge branch 'duncanspumpkin-load_custom_text' 2014-08-14 23:57:07 +01:00
IntelOrca
831e67068c Merge branch 'load_custom_text' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-load_custom_text
Conflicts:
	src/string_ids.c
2014-08-14 23:56:38 +01:00
IntelOrca
e66b686f75 add ability to change language 2014-08-14 23:46:36 +01:00
Duncan Frost
12800b8d74 Removed warnings. Only reads 4 characters for string id 2014-08-14 23:08:46 +01:00
Duncan Frost
0251cf7679 Added comments capability to language.txt. Now reads string number 2014-08-14 23:01:57 +01:00
Duncan Frost
5bfe2d52f5 Added object_scenario_load_custom_text function 2014-08-14 23:01:56 +01:00