qcz
2bbba4672b
Merge remote-tracking branch 'upstream/master' into hire-staff-command
2014-08-19 09:46:25 +02:00
qcz
c88a786399
Fix peep struct member name
2014-08-19 09:46:04 +02:00
Ted John
e9665e22df
Merge pull request #327 from MaxBareiss/patch-1
...
Fix typo
2014-08-18 22:06:09 +01:00
MaxBareiss
181c5f6518
Fix typo
...
s/haivng/having
2014-08-18 15:04:00 -04:00
Ted John
d2b562a8f5
Merge pull request #326 from fbourigault/language-french-3
...
Add 250+ french translated strings.
2014-08-18 13:10:38 +01:00
Fabien Bourigault
acb5afc6c5
Add 250+ french translated strings.
2014-08-18 14:00:57 +02:00
Ted John
ba0937b002
Merge pull request #325 from Balletie/master
...
Use MacPorts if Homebrew isn't installed
2014-08-18 12:16:09 +01:00
Balletie
6208aeb57a
Untabify the file
2014-08-18 12:51:31 +02:00
Balletie
7563601050
Install wget if it's not found
2014-08-18 12:46:03 +02:00
Balletie
1575488f5a
Add fallback to MacPorts if brew isn't installed
2014-08-18 12:45:13 +02:00
Ted John
b45995182b
Merge pull request #323 from fbourigault/language-french-2
...
Add 100+ french translated strings.
2014-08-17 23:58:28 +01:00
IntelOrca
e222b88581
start work on new ride window
2014-08-17 23:57:41 +01:00
Fabien Bourigault
e1324f57d3
Add 100+ french translated strings.
2014-08-18 00:46:25 +02:00
Ted John
4d929709f4
Merge pull request #321 from fbourigault/french-translation
...
Translated some strings to french.
2014-08-17 22:24:04 +01:00
Ted John
b5d796b48e
Merge pull request #322 from hexdec/master
...
Fixed resize gripper not showing up on guest and staff windows.
2014-08-17 22:23:37 +01:00
hexdec
2f5f65d607
Fixed resize gripper not showing up on guest and staff windows.
2014-08-17 22:40:34 +02:00
Fabien Bourigault
3f5a7d2b71
Translated some strings to french.
2014-08-17 22:22:54 +02:00
Ted John
8f58c6a844
Update readme.md
2014-08-17 21:01:05 +01:00
Ted John
e36836366d
Merge pull request #312 from hexdec/master
...
Initial window_staff_peep_open create window
2014-08-17 20:17:30 +01:00
hexdec
ea43709c27
Fixed using wrong class & flag.
2014-08-17 21:11:26 +02:00
IntelOrca
92b74a8deb
handle utf8 characters in languages, convert appropriately for #319
2014-08-17 19:20:45 +01:00
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
Ted John
83c047e632
Merge pull request #315 from duncanspumpkin/fix_303
...
Fix crash on right click of flat rides
2014-08-17 12:46:33 +01:00
Ted John
4262366cf5
Merge pull request #314 from duncanspumpkin/fix_graph
...
Fixes upside down graph
2014-08-17 12:46:24 +01:00
Ted John
9565a3754b
Merge pull request #313 from duncanspumpkin/top_toolbar_fix
...
Fixed bug in toolbar widget drawing. Added pause and zoom out disable.
2014-08-17 12:46:16 +01:00
Duncan Frost
ca49b7ca09
Fix crash on right click of flat rides
2014-08-17 11:57:50 +01: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
Duncan Frost
6258a76b96
Fixes upside down graph
2014-08-17 10:52:12 +01:00
Duncan Frost
1943682153
Fixed bug in toolbar widget drawing. Added pause and zoom out disable.
2014-08-17 10:11:19 +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
