Commit Graph

206 Commits

Author SHA1 Message Date
zsilencer 98d27b44fd fix things 2014-10-15 20:03:15 -06:00
zsilencer 9df2ee4b77 use mixer for title music, crowd noise, rain/thunder, and sound effects 2014-10-07 23:00:11 -06: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 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 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
Renamed from src/vehicle.c (Browse further)