IntelOrca
3cf28d6ef8
refactor config and add window size
2014-10-09 15:55:47 +01:00
IntelOrca
edf2b9c93a
refactor openrct2 loop
2014-10-09 14:31:51 +01:00
IntelOrca
71e508c416
refactor various platform functions and includes
2014-10-09 14:03:54 +01:00
IntelOrca
faaba5addb
Merge branch 'cmdline-scenario'
2014-10-09 01:40:47 +01:00
IntelOrca
a35ebea72a
improve command line parsing
2014-10-09 01:36:59 +01:00
IntelOrca
e57a625c9f
refactor game startup and initialisation
2014-10-09 00:30:22 +01:00
IntelOrca
dcb7fde625
Merge branch 'master' into cmdline-scenario
2014-10-08 23:32:51 +01:00
IntelOrca
db85a215f9
move rain drawing functions into its own module
2014-10-08 23:17:16 +01:00
IntelOrca
99d2b1a325
Merge branch 'research-update'
2014-10-08 22:12:28 +01:00
IntelOrca
93c5bddd4e
fix various research issues and improve
2014-10-08 22:11:50 +01:00
IntelOrca
7607468a42
Merge branch 'master' into research-update
2014-10-08 21:30:20 +01:00
Ted John
5057d218fa
Merge pull request #514 from zsilencer/master
...
fix #513
2014-10-08 19:32:50 +01:00
zsilencer
6d2616b0ca
fix #513
2014-10-08 12:15:16 -06:00
Ted John
b20a7a6250
Merge pull request #510 from zsilencer/master
...
use mixer for title music, crowd noise, rain/thunder, and sound effects
2014-10-08 07:23:26 +01:00
zsilencer
9df2ee4b77
use mixer for title music, crowd noise, rain/thunder, and sound effects
2014-10-07 23:00:11 -06:00
IntelOrca
daeb4d8c6d
implement research_finish_item
2014-10-08 00:42:11 +01:00
IntelOrca
141f33acf8
implement research_next_design
2014-10-07 23:42:17 +01:00
IntelOrca
d2dd110253
organisation: fix filters
2014-10-07 21:42:23 +01:00
IntelOrca
6d023dc40c
Merge branch 'reorganise-src'
2014-10-07 21:33:34 +01:00
IntelOrca
a32f73d27f
Merge branch 'master' into reorganise-src
...
Conflicts:
projects/openrct2.vcxproj
src/interface/window.h
2014-10-07 20:07:15 +01:00
IntelOrca
b828f678b8
organisation: move wrongly categorised drawing functions and mark some addresses as obsolete
2014-10-07 19:53:21 +01:00
IntelOrca
1770e82643
organise: refactor peep / staff window names
2014-10-07 19:39:52 +01:00
Ted John
b80abdc0c2
Merge pull request #509 from duncanspumpkin/window_shortcut
...
Window shortcut
2014-10-07 19:29:37 +01:00
Ted John
26616a9bf0
Merge pull request #508 from zsilencer/master
...
mixer fix
2014-10-07 19:28:45 +01:00
Duncan Frost
880ae7cb94
Added the ability to read the current keyboard assignment
2014-10-07 19:17:02 +01:00
Duncan Frost
f2ec0a4bb7
Moved mini window into seperate file. Fixed all bugs
2014-10-07 19:17:01 +01:00
Duncan Frost
75f71de53a
Added missing functions and window_shortcut_change
2014-10-07 19:17:00 +01:00
Duncan Frost
160a1f8dda
Added the smaller shortcut functions
2014-10-07 19:16:59 +01:00
Duncan Frost
ff1b124572
Added start of shortcut window
2014-10-07 19:16:59 +01:00
zsilencer
c51b9d7cb0
mixer fix
2014-10-07 12:16:17 -06:00
IntelOrca
1d92e3d7ab
Merge branch 'master' into reorganise-src
...
Conflicts:
projects/openrct2.vcxproj
projects/openrct2.vcxproj.filters
src/audio/audio.c
src/audio/mixer.h
src/game.c
src/ride/vehicle.c
src/windows/finances.c
src/windows/research.c
2014-10-07 19:10:16 +01:00
IntelOrca
71e6f90e08
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-10-07 18:48:46 +01:00
IntelOrca
f9f7dcfe32
Merge branch 'research-update'
2014-10-07 18:46:57 +01:00
Ted John
0c90265da2
Merge pull request #507 from zsilencer/master
...
vehicle sounds now using Mixer
2014-10-07 14:22:56 +01:00
zsilencer
b0f5271985
vehicle sounds now using Mixer
...
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
vehicle sounds now using Mixer
Fixed bug that caused widgets to miss draw. Fix #335
Merge pull request #505 from duncanspumpkin/gfx_rect
Fixed bug that caused widgets to miss draw.
fix #506 Paths can no longer be placed
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/zsilencer/OpenRCT2
2014-10-06 20:21:55 -06:00
IntelOrca
4733089bf4
fix #506 Paths can no longer be placed
2014-10-07 00:08:32 +01:00
IntelOrca
daf231a2e9
organisation: move peep and staff to sub directory of its own
2014-10-06 19:41:43 +01:00
IntelOrca
dd6247f6ee
organisation: fix real name array sizes
2014-10-06 18:53:33 +01:00
IntelOrca
c8df6174b8
organisation: fix includes
2014-10-06 17:36:58 +01:00
IntelOrca
554e1fe70e
organisation: move files and update project
2014-10-06 10:21:07 +01:00
IntelOrca
f4b2d4b0b5
implement research_update_uncompleted_types and refactor research
2014-10-05 19:18:36 +01:00
IntelOrca
79ad5c0702
implement research_calculate_expected_date
2014-10-05 17:53:08 +01:00
IntelOrca
95a9b1ca2e
implement research_update
2014-10-05 15:23:52 +01:00
Ted John
95027654fc
Merge pull request #505 from duncanspumpkin/gfx_rect
...
Fixed bug that caused widgets to miss draw.
2014-10-05 13:28:56 +01:00
Duncan Frost
068e0c3396
Fixed bug that caused widgets to miss draw. Fix #335
2014-10-05 12:24:14 +01:00
IntelOrca
7869b8efd8
implement window_error
2014-10-05 02:51:17 +01:00
Ted John
f6bdab1eea
Merge pull request #498 from duncanspumpkin/renable_cso
...
Renable cso
2014-10-04 12:23:42 +01:00
Duncan Frost
bfb132146d
Fixed bugs in RLE code. Loading now works
2014-10-04 11:41:16 +01:00
IntelOrca
ff2dad17a0
Merge branch 'track-list-window'
2014-10-04 00:53:44 +01:00
Ted John
2b69e9e914
Merge pull request #501 from zsilencer/master
...
0x006838BD, 0x006BA8E0
2014-10-04 00:53:12 +01:00
