mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,509 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

23509 Commits

Author SHA1 Message Date
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
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
Duncan Frost 57cff462c4 Fixed offset locations due to missing byte. 2014-05-03 10:32:17 +01:00
IntelOrca 289b7d2811 Merge branch 'element_height' of https://github.com/ZedThree/OpenRCT2 into ZedThree-element_height 2014-05-03 10:30:11 +01:00
IntelOrca 9b46c74279 add load game and landscape dialog 2014-05-03 10:27:48 +01:00
ZedThree 3cd254fbbb Change formatting to VS style, improve comments 2014-05-03 10:24:25 +02:00
ZedThree d4583339f4 squash! Add map_element_height (finishes sub_662783) 2014-05-03 10:22:20 +02:00
IntelOrca 5f8db5e115 add pause toggle game command 2014-05-03 09:00:49 +01:00
Duncan Frost 2cc3a56ffc Slowed down the cheat guests tab animation 2014-05-03 08:37:07 +01:00
IntelOrca 634ae0dbeb allow new quit game or load code to run 2014-05-03 02:33:01 +01:00
IntelOrca 51fa837caf add more peep fields 2014-05-03 00:31:53 +01:00
IntelOrca 59d0e94f06 use written cancel tool function 2014-05-02 22:38:16 +01:00
IntelOrca b9925cd5a0 Merge branch 'master' into path-window 2014-05-02 22:36:04 +01:00
IntelOrca 9e3fedad59 add more peep fields 2014-05-02 22:34:14 +01:00
IntelOrca 74283010c8 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 2014-05-02 22:26:43 +01:00
IntelOrca 1fdab25cb8 Merge branch 'MaciekBaron-master' 2014-05-02 22:24:29 +01:00
IntelOrca a872065a83 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-02 22:22:38 +01:00
IntelOrca af5ef5e75d add game_load_or_quit function 2014-05-02 22:21:08 +01:00
Duncan Frost c87ec51c28 Labelled some of the peep financial offsets. 2014-05-02 21:54:19 +01:00
ZedThree 297043fecd Add map_element_height (finishes sub_662783) 
Possibly wrong for some slopes...
 2014-05-02 22:15:53 +02:00
Maciek Baron d4b5a05307 Merge remote-tracking branch 'upstream/master' 2014-05-02 21:15:20 +01:00
Maciek Baron ca81c5e06d Adding enum with peep states 2014-05-02 21:07:48 +01:00
Maciek Baron 8da8519b6f Capping money in cheats 2014-05-02 21:07:20 +01:00
Matthias Lanzinger fcd3daec57 Merge remote-tracking branch 'upstream/master' into update_objective 2014-05-02 16:17:51 +02:00
Matthias Lanzinger 002e914122 Reset a accidental change to the project file during a merge. 2014-05-02 16:16:32 +02:00