mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity
1,926 Commits 8 Branches 59 Tags
f22cc6bbebf02cdcbaa6dc197756ed66ad7d9669
Commit Graph

28 Commits

Author SHA1 Message Date
IntelOrca
f22cc6bbeb Merge branch 'master' into viewport-window 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-10-12 17:28:17 +01:00
IntelOrca
9ebf6e5550 add open extra viewport to map button on top toolbar 2014-10-12 15:48:21 +01:00
Duncan Frost
18db536f87 Less magic numbers 2014-10-12 15:04:37 +01:00
Duncan Frost
bab896ad1e Finished staff window. 2014-10-12 11:37:07 +01:00
Duncan Frost
2774c63eba Added first draft of tool update and down 2014-10-12 11:37:06 +01:00
Duncan Frost
5ee4616685 Added remaining paint and invalidate functions 2014-10-12 11:37:05 +01:00
Duncan Frost
d02017cb48 Refactored widgets. Added staff stats invalidate 2014-10-12 11:37:05 +01:00
Duncan Frost
0ba79d70ab Added remaining widgets 2014-10-12 11:37:04 +01:00
Duncan Frost
950bbccb34 Fix bugs introduced by previous commit. 2014-10-12 11:37:03 +01:00
Duncan Frost
10793011c4 Fix small mistakes in fire prompt 2014-10-12 11:37:02 +01:00
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
a12c771190 add locate button to viewport 2014-10-12 03:10:03 +01:00
IntelOrca
17e9ea1fc4 implement the viewport window 2014-10-12 02:55:42 +01:00
IntelOrca
c91c4f7ea0 implement mine train coaster rating calculation 2014-10-11 23:07:20 +01:00
Neranjen
9f556549c7 fix #516 2014-10-09 21:19:29 +05:30
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
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
zsilencer
9df2ee4b77 use mixer for title music, crowd noise, rain/thunder, and sound effects 2014-10-07 23:00:11 -06:00
IntelOrca
141f33acf8 implement research_next_design 2014-10-07 23:42:17 +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
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
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