Commit Graph

5 Commits

Author SHA1 Message Date
IntelOrca d7212c1b14 implement inventions list window, fixes #630 2014-12-16 01:24:13 +00:00
Duncan Frost cbd7e0c096 Reversed 684ac3 2014-11-30 22:00:41 +00:00
IntelOrca 93c5bddd4e fix various research issues and improve 2014-10-08 22:11:50 +01:00
IntelOrca 141f33acf8 implement research_next_design 2014-10-07 23:42:17 +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