mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity
303 Commits 8 Branches 59 Tags
eedab3799310a21e793d3d87a128ea01b6974699
Commit Graph

244 Commits

Author SHA1 Message Date
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
IntelOrca
038dbe9668 fix call for scenario_entrance_fee_too_high_check 2014-05-03 14:43:56 +01:00
IntelOrca
973872558c fix scenario_entrance_fee_too_high_check 2014-05-03 14:38:03 +01:00
IntelOrca
e54b67f843 Merge branch 'update_objective' of https://github.com/lnz/OpenRCT2 into lnz-update_objective 2014-05-03 14:23:33 +01:00
IntelOrca
f0e5657286 move settings to config and improve 2014-05-03 14:04:40 +01:00
Matthias Lanzinger
72adb4d8bf Documentation and copyright. 2014-05-03 14:57:50 +02:00
Matthias Lanzinger
97cab96ea6 Renamed some ride values and some fixups from the merge. 2014-05-03 14:51:35 +02:00
Matthias Lanzinger
02ae959a85 Implemented check for objective 8 (10 rollercoasters, min excitement, min 
length)
 2014-05-03 14:36:36 +02:00
Matthias Lanzinger
15fc63eecb Refactoring 2014-05-03 14:36:35 +02:00
Matthias Lanzinger
6c2a7a0a29 Implement news_item_add_to_queue and some bugfixes. 2014-05-03 14:36:34 +02:00
Matthias Lanzinger
b3d36869ef Leftover debug call 2014-05-03 14:35:12 +02:00
Matthias Lanzinger
68ab137571 Rename marketing_finished to marketing_update. 2014-05-03 14:35:12 +02:00
Matthias Lanzinger
935284f53d Implement marketing campaign updating. 2014-05-03 14:35:11 +02:00
Matthias Lanzinger
bf03c21de9 Implement entrance fee too high check. Some refactoring. 2014-05-03 14:35:11 +02:00
Matthias Lanzinger
ddce193f4a Implement "Finish 5 rollercoaster..:" objective check and some fixups 2014-05-03 14:35:11 +02:00
Matthias Lanzinger
efc4095d85 Added check for 10 rollercoaster objective 2014-05-03 14:35:10 +02:00
Matthias Lanzinger
e1f5c62fcc Implement scenario success and failure procedures. 2014-05-03 14:35:10 +02:00
Matthias Lanzinger
fc02eef2a9 Implement simple objective checks 2014-05-03 14:35:09 +02:00
Matthias Lanzinger
c2965a4f9e Make scenario update timeframes clearer 2014-05-03 14:35:08 +02:00
Matthias Lanzinger
ad0d77a49c Start implementation of scenario_update. 2014-05-03 14:35:08 +02:00
IntelOrca
30a5793ac1 rename current day to current month ticks 2014-05-03 14:35:07 +02:00
Jørn Lomax
4dcf64ac36 Merge branch 'master' into jvlomax-settings 2014-05-03 13:54:30 +02:00
Jørn Lomax
730fe6d46b Added setting file. Settings are placed in <user home>\OpenRCT2\config.ini. 2014-05-03 13:51:45 +02:00
ddevrien
9cf6f8f98a Added some GAME_FLAGS 
Also renamed them to PARK_FLAGS and moved them to park.h, since they
have to do with each park, and are probably saved somewhere in the sv6
file.
 2014-05-03 13:39:36 +02:00