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
333 Commits 8 Branches 59 Tags
513108cd50fb9c5bfe81f4680e2edd9d21640a6f
Commit Graph

267 Commits

Author SHA1 Message Date
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
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
MakaHost
bab2790027 Fixed spelling in peep thought types 2014-05-04 21:45:40 +02:00
IntelOrca
c062992e78 add play intro config setting 2014-05-04 19:59:24 +01:00
IntelOrca
ff992e1fc0 Merge branch 'MaciekBaron-master' 2014-05-04 19:04:20 +01:00
IntelOrca
da7563c7c9 add unknown map element function 2014-05-04 18:51:36 +01:00
Maciek Baron
d18ff2bb1b Adding peep thought types 2014-05-04 18:49:29 +01:00
IntelOrca
160c388739 name more functions in editor.c 2014-05-04 18:02:28 +01:00
IntelOrca
9b6873f09e add checksum validation for load sc6 and sv6 2014-05-04 17:34:13 +01:00
IntelOrca
e2414bf9f7 Merge branch 'MaciekBaron-master' 2014-05-04 17:09:44 +01:00
Maciek Baron
cde954ba63 Removing leftover debug code 2014-05-04 16:34:35 +01:00
IntelOrca
6819b787ed remove key debug check 2014-05-04 16:32:48 +01:00
IntelOrca
3ac5447abe fix news window multiple copies bug 2014-05-04 16:32:10 +01:00
Maciek Baron
0477e2803b Implementing get_local_time() 2014-05-04 16:31:32 +01:00
IntelOrca
a0976e2f40 add load saved game 2014-05-04 16:21:15 +01:00
Maciek Baron
61238c70f3 Removing dupe address, adding OS hour and minute 2014-05-04 16:16:03 +01:00
Maciek Baron
f2b8c4984e Adding more possible locations for config.c 2014-05-04 14:45:04 +01:00
IntelOrca
d85e2f8a02 Merge branch 'update_addresses' of https://github.com/ZedThree/OpenRCT2 into ZedThree-update_addresses 2014-05-04 14:27:35 +01:00
IntelOrca
00cd901441 add news window 2014-05-04 14:10:32 +01:00
ZedThree
b3ea71c080 Replace more addresses with their named constants 
Also named window.var_4B2/4 as saved_view_x/y
 2014-05-04 13:11:31 +02:00
IntelOrca
7e6800dc0d Merge branch 'settings-screenshot-enum-extension' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-settings-screenshot-enum-extension 2014-05-03 23:35:25 +01:00
IntelOrca
e9bccf07df refactor map and add get surface tile helper 2014-05-03 21:34:22 +01:00
atmaxinger
5360a207b5 Settings: Use enum for screenshot format, Extension name for screenshot format in config file 2014-05-03 22:30:29 +02:00
IntelOrca
e5c79f051c add end game update in load or quit command 2014-05-03 20:39:34 +01:00
IntelOrca
456ddebc1f clean peep.h 2014-05-03 16:14:16 +01:00
IntelOrca
16c08a5743 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-03 16:12:06 +01:00
Maciek Baron
49affa9c75 Adding enum with trigger flags for peeps 2014-05-03 16:04:14 +01:00