hexdec
7071f68670
Merge branch 'window_staff_peep' of https://github.com/duncanspumpkin/OpenRCT2
...
Conflicts:
src/window_peep.c
2014-08-17 16:30:01 +02:00
Duncan Frost
b0d39bbf0e
Added sepearte file for staff_peep_window
2014-08-17 11:45:43 +01:00
Duncan Frost
aa0709c439
Fixed clicking on peep causing hybrid
2014-08-17 11:01:34 +01:00
hexdec
d3a55efd30
Added window_peep_staff_events.
2014-08-17 01:37:28 +02:00
hexdec
7285dbc339
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-08-17 01:08:41 +02:00
IntelOrca
2dcdb09d05
partial fix to #305
2014-08-16 19:07:13 +01:00
IntelOrca
c6d3c3810e
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-08-16 18:15:31 +01:00
IntelOrca
9b64c576c4
fixes #293 , closes #301 (min/max) and fixes #304 (research window bug)
2014-08-16 18:15:27 +01:00
Ted John
a70ec19e25
Update readme.md
2014-08-16 17:05:57 +01:00
Ted John
b5cdcbc375
Update readme.md
...
Update progress section.
2014-08-16 16:45:49 +01:00
Ted John
66c41f78a7
Merge pull request #306 from Gymnasiast/master
...
Fixes and some additional translated strings
2014-08-16 16:03:59 +01:00
Gymnasiast
41a7847cc1
Fixes and some additional translated strings
...
Fixed fullscreen selection, typos and overflowing text.
2014-08-16 16:51:14 +02:00
Gymnasiast
176b1b3f45
Merge pull request #1 from IntelOrca/master
...
test for forked repo
2014-08-16 16:49:17 +02:00
Ted John
e3c407d5b5
Merge pull request #302 from duncanspumpkin/viewport_left_down
...
Viewport left down
2014-08-16 15:30:10 +01:00
IntelOrca
73f71db084
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-08-16 15:29:20 +01:00
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
Duncan Frost
9e5412579a
Moved old function comment to top of func
2014-08-16 14:40:07 +01:00
Duncan Frost
ad8a96c196
Added remaining left click on viewport functions
2014-08-16 14:38:45 +01:00
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
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