Duncan
|
f700e560ca
|
Added missing enabled widgets
1 widx is missing
|
2014-08-23 08:08:25 +01:00 |
Duncan
|
7500fccc79
|
Now uses new viewport_scroll function
|
2014-08-23 08:08:24 +01:00 |
Duncan
|
16cddec597
|
Fixed slight mistake with order.
not tested.
|
2014-08-23 08:08:23 +01:00 |
Duncan
|
c2557be14d
|
Fixed slight mistake with order.
|
2014-08-23 08:08:22 +01:00 |
Duncan
|
967af50f4d
|
Added window_scroll_to_viewport based off previous function
|
2014-08-23 08:08:21 +01:00 |
Duncan
|
8379262ea4
|
Added viewport focus struct.
Definitely breaks build
|
2014-08-23 08:08:20 +01:00 |
Duncan
|
52d69be031
|
added locate function
not tested.
|
2014-08-23 08:08:19 +01:00 |
Duncan
|
ba76d6e4e5
|
added window_close mouse down
|
2014-08-23 08:08:19 +01:00 |
Duncan
|
ca5e60639e
|
Added set_page
Not tested.
|
2014-08-23 08:08:18 +01:00 |
Duncan
|
4db53e2bfb
|
Added start of window_peep_overview_mouse_down
Not tested.
|
2014-08-23 08:08:17 +01:00 |
Duncan
|
ed753875d6
|
Finish peep_resize
not tested.
|
2014-08-23 08:08:15 +01:00 |
Duncan
|
6524f27706
|
Started addition of window_peep_resize
Not tested.
|
2014-08-23 08:08:14 +01:00 |
Duncan
|
581114b1e5
|
Added window_peep_close
Not tested. Cancels any tool that was in use by the window.
|
2014-08-23 08:08:14 +01:00 |
IntelOrca
|
a5fcb473ab
|
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
|
2014-08-22 23:57:29 +01:00 |
IntelOrca
|
ef21458140
|
Merge branch 'zsilencer-master'
|
2014-08-22 23:57:02 +01:00 |
IntelOrca
|
1158a8876b
|
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master
Conflicts:
src/window_research.c
|
2014-08-22 23:55:19 +01:00 |
zsilencer
|
0992a6adcd
|
window_research_development_paint() ride names fix
stringId from typeId was not working right, this fixes it and gives
correct research ride names
|
2014-08-22 15:37:18 -06:00 |
Ted John
|
f4164a4c2b
|
Merge pull request #345 from zsilencer/master
window_research_development_paint() crash fix
|
2014-08-22 22:29:56 +01:00 |
zsilencer
|
6414d44306
|
window_research_development_paint() crash fix
When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
|
2014-08-22 14:05:41 -06:00 |
IntelOrca
|
306ff79bc7
|
fix merge error
|
2014-08-21 22:54:27 +01:00 |
IntelOrca
|
e9fab52db2
|
Merge branch 'new-ride-window'
Conflicts:
src/language.c
|
2014-08-21 22:51:47 +01:00 |
IntelOrca
|
76ca655b0e
|
finish window_new_ride
|
2014-08-21 22:50:06 +01:00 |
IntelOrca
|
25a31b9875
|
clear up window_new_ride a bit
|
2014-08-21 22:33:36 +01:00 |
IntelOrca
|
b4e72cf960
|
add window_new_ride_paint_ride_information
|
2014-08-21 21:48:23 +01:00 |
Ted John
|
6f912b213b
|
Merge pull request #343 from Balletie/master
Fix build on OSX by adding missing include (fixes #342)
|
2014-08-21 12:43:52 +01:00 |
Balletie
|
afaec0557b
|
Merge branch 'master' of https://github.com/Balletie/OpenRCT2
|
2014-08-21 11:58:12 +02:00 |
Balletie
|
8d75552cf4
|
Fix build on OSX (missing include)
|
2014-08-21 11:57:54 +02:00 |
Balletie
|
9612eb6876
|
Fix build on OSX (missing include)
|
2014-08-21 11:56:45 +02:00 |
Ted John
|
0969c0bcff
|
Merge pull request #341 from qcz/hire-staff-command
Decompile the hire staff game command
|
2014-08-20 23:44:40 +01:00 |
qcz
|
3a55af7403
|
Fix new file encodings
|
2014-08-20 23:53:51 +02:00 |
qcz
|
fa6caa856a
|
Move staff related stuff to its own file
|
2014-08-20 23:48:36 +02:00 |
IntelOrca
|
8644ed5b57
|
implement scroll mouse events for new ride window
|
2014-08-20 22:06:47 +01:00 |
IntelOrca
|
941b6ccb99
|
Merge branch 'mdtrooper-spanish_translation'
|
2014-08-20 20:33:16 +01:00 |
IntelOrca
|
6ab6c5d9a6
|
add spanish language entry, #338
|
2014-08-20 20:32:25 +01:00 |
IntelOrca
|
d02d6224d3
|
Merge branch 'spanish_translation' of https://github.com/mdtrooper/OpenRCT2 into mdtrooper-spanish_translation
|
2014-08-20 20:31:44 +01:00 |
IntelOrca
|
8e4cc238cc
|
fix window_new_ride_populate_list and add window_new_ride_scroll_to_focused_ride
|
2014-08-20 20:18:17 +01:00 |
qcz
|
250acea957
|
Rename tabIndex to staff_type, move staff max count constant to #define
|
2014-08-20 17:48:47 +02:00 |
qcz
|
12f6d57876
|
Fix pointer type
|
2014-08-20 17:39:41 +02:00 |
qcz
|
f142cddbd6
|
Add return type to remove Travis warnings
|
2014-08-20 16:04:10 +02:00 |
qcz
|
1007e79baa
|
Fix Travis error
|
2014-08-20 16:00:47 +02:00 |
qcz
|
92f0139b5a
|
Move typedef to header file
|
2014-08-20 15:48:53 +02:00 |
qcz
|
cb169952ac
|
Remove unused variable, add indices to new_game_command_table
|
2014-08-20 15:38:21 +02:00 |
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 |
Ted John
|
931c91e211
|
Merge pull request #339 from qcz/fix-missing-comma
Fix missing comma
|
2014-08-20 08:46:25 +01: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 |
mdtrooper
|
864a989ba8
|
Starting the translation into spanish.
|
2014-08-20 02:58:08 +02:00 |
mdtrooper
|
b25d3626a5
|
Copy the file english_uk.txt to spanish_sp.txt. At the moment the file has not any string in spanish (spain).
|
2014-08-20 02:45:43 +02:00 |