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 |
|
qcz
|
92afe2d5e8
|
Merge remote-tracking branch 'upstream/master' into scenery-window
|
2014-08-22 18:23:19 +02: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 |
|
qcz
|
168537d338
|
Add window_scenery.c, start working on scenery window
|
2014-08-21 21:53:17 +02: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 |
|