27657 Commits

Author SHA1 Message Date
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
IntelOrca
9f71cea261 update project file for settings merge 2014-05-03 13:18:56 +01:00
IntelOrca
20005e8540 Merge branch 'jvlomax-jvlomax-settings' 2014-05-03 13:18:29 +01: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
IntelOrca
b52797cc79 Merge branch 'ddevrien-master' 2014-05-03 12:44:37 +01: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
IntelOrca
74041396a1 fix scenario name string bug 2014-05-03 12:21:12 +01:00
Maciek Baron
c355d27459 Merge remote-tracking branch 'upstream/master' 2014-05-03 12:07:26 +01:00
IntelOrca
92d24a46c4 Merge branch 'duncanspumpkin-master' 2014-05-03 10:40:21 +01:00
IntelOrca
c6c44b5df2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-03 10:38:45 +01:00
IntelOrca
a69e5c9911 Merge branch 'ZedThree-element_height' 2014-05-03 10:34:27 +01:00
IntelOrca
a38b95755a remove unfinished comment and credit author 2014-05-03 10:34:11 +01:00
Duncan Frost
efe5ede9c6 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-03 10:33:11 +01:00