8 Commits

Author	SHA1	Message	Date
Duncan Frost	2a3989019b	Fix merge fails. Renamed a few functions	2014-10-12 11:37:02 +01:00
Duncan Frost	719ca2ddd2	Added start of window_staff_fire. Refactored some of window_staff_peep	2014-10-12 11:35:09 +01:00
IntelOrca	93c5bddd4e	fix various research issues and improve	2014-10-08 22:11:50 +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	1770e82643	organise: refactor peep / staff window names	2014-10-07 19:39:52 +01:00
IntelOrca	daf231a2e9	organisation: move peep and staff to sub directory of its own	2014-10-06 19:41:43 +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