qcz
1b3f98362f
Finalize hire-staff-command
2014-08-20 15:32:39 +02:00
qcz
6112668bcc
Merge remote-tracking branch 'upstream/master' into hire-staff-command
2014-08-20 14:30:46 +02:00
qcz
be1505c007
Fix missing comma
2014-08-20 09:37:28 +02:00
IntelOrca
01e32c301d
improve new ride window populate docs
2014-08-20 07:50:01 +01:00
qcz
0e48e92949
Entertainers don't crash the game anymore
2014-08-20 07:23:02 +02:00
IntelOrca
9b08db7020
add window_new_ride_populate_list
2014-08-20 00:05:40 +01:00
qcz
4959bdd55d
Merge remote-tracking branch 'upstream/master' into hire-staff-command
2014-08-19 23:52:23 +02:00
IntelOrca
16106c7569
Merge branch 'master' into new-ride-window
...
Conflicts:
src/window_new_ride.c
src/window_research.c
2014-08-19 21:43:25 +01:00
hexdec
540c8efd23
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-08-19 22:41:13 +02:00
hexdec
de01827de9
Decompiled game shortcuts for viewport flags.
2014-08-19 22:39:22 +02:00
IntelOrca
c7986d140c
add widgets, sizing and basic events for new ride window
2014-08-19 21:33:05 +01:00
Ted John
654e40aaa5
Merge pull request #333 from qcz/hulang
...
Add Hungarian language
2014-08-19 21:31:57 +01:00
Ted John
9065837c9b
Merge pull request #334 from qcz/316-fix
...
Fix #316
2014-08-19 21:31:18 +01:00
Ted John
c7edafc627
Merge pull request #332 from duncanspumpkin/update_viewport_left
...
Update viewport left and fix #318
2014-08-19 21:30:32 +01:00
qcz
8f33388d37
Typo in variable name
2014-08-19 22:19:32 +02:00
qcz
06114c2116
Fix #316
2014-08-19 22:16:05 +02:00
Duncan Frost
71b6389ec7
Fix 1 pixel width ride_window
2014-08-19 20:54:58 +01:00
Duncan Frost
5f68d4b2a0
Fix #318 . Issue caused by checking progressivly more incorrect coordinates for connection
2014-08-19 20:41:46 +01:00
Ted John
2a09b03c43
Merge pull request #331 from duncanspumpkin/fix_317
...
Fix #317 crash on viewing news items
2014-08-19 20:31:06 +01:00
qcz
a4bab7cd0d
Add Hungarian language
2014-08-19 21:17:20 +02:00
Duncan Frost
3307560a74
Merge branch 'upadate_viewport_left' of https://github.com/duncanspumpkin/OpenRCT2 into update_viewport_left
2014-08-19 19:56:41 +01:00
Ted John
274c2dc36f
Merge pull request #330 from qcz/window-staff-registers
...
Clean up most of the inline assembly from windows
2014-08-19 19:35:06 +01:00
Duncan Frost
3df3ff4d1c
Fix #317 crash on viewing news items caused by double pointer de ref and reuse of same pointers.
2014-08-19 19:34:31 +01:00
IntelOrca
37258b4710
add polish language entry, #329
2014-08-19 19:31:51 +01:00
qcz
6473fd2b97
Maybe this will statisfy Travis
2014-08-19 20:22:13 +02:00
qcz
5c22530965
Fix coordinate type to avoid invalid cast
2014-08-19 20:08:09 +02:00
qcz
bd06c7caee
Clean up most of the inline assembly from windows
2014-08-19 19:47:12 +02:00
Duncan
56e6028a56
Rewrote to use map_elements
...
not tested
2014-08-19 12:48:00 +01:00
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
IntelOrca
e222b88581
start work on new ride window
2014-08-17 23:57:41 +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
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
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
9b64c576c4
fixes #293 , closes #301 (min/max) and fixes #304 (research window bug)
2014-08-16 18:15:27 +01: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
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
