mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
1,216 Commits 8 Branches 59 Tags
8b503a472284cc0bb1e2b0fc48ae5705374a2bc4
Commit Graph

1216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntelOrca
8b503a4722 change options window to tab interface 
To better group the options together and allow the window to be scalable with additional OpenRCT2 options, I have changed the window to a tab interface similar to the options window seen in Locomotion.
 2014-08-16 15:29:15 +01: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
Ted John
b306e1e28c Merge pull request #291 from duncanspumpkin/fix_286 
Fixes #286. Issue was caused by a typo.
 2014-08-14 22:27:01 +01:00
Ted John
68620ee072 Merge pull request #290 from duncanspumpkin/fix_287 
Fixes #287
 2014-08-14 22:26:37 +01:00
Ted John
498986c6b4 Merge pull request #289 from duncanspumpkin/fix_288 
Fix see through glass
 2014-08-14 22:26:21 +01:00
Duncan Frost
2345a510bf Fixes #286. Issue was caused by a typo. 2014-08-14 22:18:12 +01:00
Duncan Frost
5517378197 Fixes #287 2014-08-14 21:56:23 +01:00
Duncan Frost
412c9b689a Fix see through glass 2014-08-14 20:56:26 +01:00
Fabien Bourigault
4b0e72f797 Added french language (from English copy). 
For now, it's just a copy of the english.txt file.
 2014-08-14 17:27:37 +02:00
Ted John
f638f04ba6 Merge pull request #282 from Gymnasiast/master 
Initial Dutch translation (not yet complete)
 2014-08-14 13:05:12 +01:00
Gymnasiast
fa7c7ded8e Initial Dutch translation (not yet complete) 2014-08-14 12:52:23 +02:00
Ted John
462cd6d65b Merge pull request #280 from duncanspumpkin/gfx_invalidate_window 
Added gfx_invalidate_window
 2014-08-14 09:02:29 +01:00
Ted John
13039633b7 Merge pull request #281 from duncanspumpkin/cheats_string 
Added more cheat strings to load from language file
 2014-08-14 08:58:54 +01:00
Duncan Frost
c5473266bb Added more cheat strings to load from language file 2014-08-14 07:47:23 +01:00
Duncan Frost
bc2640314e Remove duplicate function. Change comment to prevent repeat 2014-08-14 07:22:47 +01:00
Duncan Frost
4292109753 Added gfx_invalidate_window 2014-08-13 20:47:30 +01:00
IntelOrca
bf8f2ed569 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git 2014-08-12 22:22:21 +01:00
IntelOrca
b13f31f73e implement finance research tab 2014-08-12 22:22:16 +01:00
Ted John
d11b914001 Merge pull request #277 from duncanspumpkin/fix_gfx 
Fix gfx
 2014-08-12 22:09:43 +01:00
Duncan Frost
cd1f71708e Fixed zoom bug. 2014-08-12 20:43:38 +01:00
Duncan Frost
3aaa9ef965 Tidy viewport code 2014-08-12 20:11:23 +01:00
Duncan Frost
3bbfd97224 Zooming working again. Graphical glitch along x=0 line. 2014-08-12 18:19:37 +01:00
Duncan Frost
9a33bc0597 Added zoom_masks 2014-08-12 08:02:18 +01:00
Duncan Frost
ffaeca1a1c Zoomed land working. 2014-08-12 07:45:55 +01:00
Duncan Frost
a44171205c Removed redundant comments about not being tested 2014-08-12 07:12:47 +01:00
Duncan Frost
b3325bcb38 Cleaned up obsolete variables 2014-08-12 07:12:46 +01:00
Duncan Frost
00a9ab9da3 Added notes to draw_sprite 2014-08-12 07:12:46 +01:00
Duncan Frost
787340921e Swapped variable names to match game 2014-08-12 07:12:45 +01:00
Duncan Frost
bc5ac887c5 Fix primary secondary tertiary colour sprites 2014-08-12 07:12:44 +01:00
Duncan Frost
cdd15bf1fe Fixes water display issues. 2014-08-12 07:12:43 +01:00