mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity
369 Commits 8 Branches 59 Tags
17389d18b3175dbec34ce1dc3e6b0c74529ade79
Commit Graph

295 Commits

Author SHA1 Message Date
IntelOrca
231777d131 clean up config 2014-05-08 16:07:57 +01:00
IntelOrca
0e7283679b Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master 2014-05-08 15:58:31 +01:00
Miso Zmiric (Mike Squinter)
b1017a839f fix late night typo 2014-05-08 13:06:36 +01:00
Jørn Lomax
7d4a80cea2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/config.c
	src/config.h
 2014-05-08 11:09:31 +02:00
Jørn Lomax
4e13b24104 Revamped the config system. Now enables sections and comments. 
Also enables some validation checking of the config file
 2014-05-08 11:05:07 +02:00
Miso Zmiric (Mike Squinter)
b04b25d013 Add directory_browser to config_create_default 
partially resolves #42 [https://github.com/IntelOrca/OpenRCT2/issues/42]
 2014-05-08 07:10:26 +01:00
IntelOrca
d5927e415f use finance_payment in do_game_command 2014-05-07 23:45:16 +01:00
IntelOrca
9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 22:42:01 +01:00
IntelOrca
3792b2b72e Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update 2014-05-07 22:40:23 +01:00
IntelOrca
8fff53f043 Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_park_rating 2014-05-07 22:38:22 +01:00
IntelOrca
604f61732c Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master 2014-05-07 22:36:47 +01:00
ZedThree
76611d054a Fix bug in open_load_game_dialog() 
Should return the result of osinterface_open_common_file_dialog()
 2014-05-07 23:11:23 +02:00
Maciek Baron
c70865457c Adding window_ride_init_vars and various enums 
Adding window_ride_init_vars and various enums, also decompiled one
unknown function.
 2014-05-07 21:17:26 +01:00
Duncan Frost
dc1386cca2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating 2014-05-07 19:58:55 +01:00
ddevrien
15c1213fb5 Identified WWT_6, added some strings 
WWT_6 is used for signs, it's the color selection button
 2014-05-07 20:53:33 +02:00
Duncan Frost
bfd4dbcbe9 Changed litter var_24 to unsigned 2014-05-07 19:46:30 +01:00
Duncan Frost
4e4fa93e14 Fixed litter bug. Removed debug notes. Made rides code more readable 2014-05-07 19:44:13 +01:00
Duncan Frost
8ddfc136f6 Fixed bug in second ride related equations 2014-05-07 18:57:50 +01:00
lnz
840c76b68e Fix month not changing bug and wage cost bug. 2014-05-07 16:28:42 +02:00
lnz
169a3b6b72 Implement Peep problem warnings update. 2014-05-07 16:24:36 +02:00
IntelOrca
18d95968f2 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 00:37:13 +01:00
Maciek Baron
aef83362bc Cleaning up small shared functions 
Cleaning up small shared functions and moving them to appropriate files
 2014-05-06 22:04:09 +01:00
Duncan Frost
b52c5c0b2d Peeps part now working 2014-05-06 21:54:42 +01:00
Duncan Frost
3629247056 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating 2014-05-06 21:18:17 +01:00
Duncan Frost
eb828c0041 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-06 21:14:02 +01:00
Duncan Frost
c26b944b6e Now uses string references 2014-05-06 21:13:38 +01:00
Duncan Frost
da0236ef84 Labeled init values for Shearwood Forest 2014-05-06 21:09:08 +01:00
IntelOrca
d74bae8023 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-05 23:30:04 +01:00
Maciek Baron
1f00ad9110 Implemented a few functions in editor.c 2014-05-05 23:10:47 +01:00
lnz
9de233e34b Actually add finance code. 2014-05-05 22:16:34 +02:00
lnz
589118d66d Implement some finance functions and added a few addresses & tables 2014-05-05 22:14:45 +02:00
lnz
48caec8b58 Label unimplemented functions in scenario_update 2014-05-05 22:14:17 +02:00
Duncan Frost
2b900bebb3 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-05 20:27:40 +01:00
Duncan Frost
5ca2b1a7fd Added more strings 2014-05-05 20:27:06 +01:00
IntelOrca
726c1a2312 fix peep structure 2014-05-05 20:16:27 +01:00
IntelOrca
73d9be16ab Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-05 20:14:53 +01:00
IntelOrca
720261f0ba Merge branch 'ride_vars' of https://github.com/ZedThree/OpenRCT2 into ZedThree-ride_vars 2014-05-05 20:08:27 +01:00
IntelOrca
46bcefc1fb Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-05 20:06:22 +01:00
IntelOrca
3a177fbb45 add grouping to guest list window 2014-05-05 20:04:17 +01:00
ZedThree
290255a32d Fix bug: rides not sorted correctly 2014-05-05 20:55:25 +02:00
Duncan Frost
ce14d72d16 Labeled ride photo 1-4 and time in park offsets. 2014-05-05 19:35:47 +01:00
ZedThree
d0d51e477b Add ride mode enum and name some ride variables 2014-05-05 19:36:07 +02:00
Maciek Baron
f20311ec6c Fixing typo 2014-05-05 18:26:55 +01:00
Maciek Baron
1c51c81622 Reverting struct changes 2014-05-05 16:52:19 +01:00
Maciek Baron
29459fb9bb Adding item flags, time in thought struct 2014-05-05 16:41:29 +01:00
IntelOrca
a35a9f29a4 add guest list window 2014-05-05 03:27:17 +01:00
Duncan Frost
b63c7c41f0 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-04 21:18:41 +01:00
Duncan Frost
c4b7dd8a5a Added PEEP_NAUSEA_TOLERANCE enum 2014-05-04 21:14:30 +01:00
Ted John
eedab37993 Merge pull request #61 from MakaHost/master 
Fixed spelling in peep thought types
 2014-05-04 20:52:21 +01:00
Duncan Frost
d0203aaeda Labelled more peep offsets 2014-05-04 20:48:47 +01:00