Commit Graph

62 Commits

Author SHA1 Message Date
IntelOrca
30e6358fd4 implement more awards WIP 2014-05-27 15:14:45 +01:00
IntelOrca
bfc35511f2 Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master 2014-05-25 23:18:47 +01:00
IntelOrca
092764ea6b separate marketing and add finances window 2014-05-25 23:17:55 +01:00
adrian17
c3a5ce2c7c Remove settings.h from project 2014-05-25 21:51:00 +02:00
IntelOrca
5b568f376c add peep_applause 2014-05-25 19:47:11 +01:00
IntelOrca
275f66d287 add vehicle_update_all 2014-05-25 18:40:11 +01:00
IntelOrca
99ca1c2b90 Merge branch 'crooked-house-excitement' of https://github.com/kevinburke/OpenRCT2 into kevinburke-crooked-house-excitement 2014-05-24 14:21:08 +01:00
IntelOrca
36e2cce045 add object list load 2014-05-24 01:34:17 +01:00
IntelOrca
075e0619c1 fix filters 2014-05-24 00:00:07 +01:00
IntelOrca
98b01edaaa clean up scenario list 2014-05-23 23:52:13 +01:00
Kevin Burke
a35fc6bdef add new files to sln 2014-05-23 21:18:45 +09:00
Duncan Frost
dc3804bfa2 Fixes one of the issues of #121 but 526 cannot be easily fixed 2014-05-23 11:28:35 +01:00
Kevin Burke
eccb4af048 Add new files to vcxproj, vcxproj +filters 2014-05-23 07:45:19 +09:00
anyc
82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
ddevrien
c069d0fa50 Started work on map window 2014-05-14 12:43:14 +02:00
IntelOrca
8dcca91092 mass clean up and reduce warnings 2014-05-12 01:45:45 +01:00
ddevrien
b39cf4d1af Started work on options window 2014-05-11 09:01:01 +02:00
Maciek Baron
d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
ddevrien
6ddeb610f0 Some additions to window_banner 2014-05-09 20:59:41 +02:00
ddevrien
6eb635fd2b master project files 2014-05-09 10:15:10 +02:00
ddevrien
e6e3fce74d Merge branch 'master' of https://github.com/ddevrien/OpenRCT2
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
2014-05-09 10:12:05 +02:00
ddevrien
1eda151c70 Added basic code for banner window 2014-05-09 10:04:40 +02:00
Maciek Baron
0c34c3791c Cleaning up files and code related to windows 2014-05-08 21:48:31 +01:00
lnz
589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
IntelOrca
a35a9f29a4 add guest list window 2014-05-05 03:27:17 +01:00