Commit Graph

  • 6819b787ed remove key debug check IntelOrca 2014-05-04 16:32:48 +01:00
  • 3ac5447abe fix news window multiple copies bug IntelOrca 2014-05-04 16:32:10 +01:00
  • 0477e2803b Implementing get_local_time() Maciek Baron 2014-05-04 16:31:32 +01:00
  • a0976e2f40 add load saved game IntelOrca 2014-05-04 16:21:15 +01:00
  • 61238c70f3 Removing dupe address, adding OS hour and minute Maciek Baron 2014-05-04 16:16:03 +01:00
  • f2b8c4984e Adding more possible locations for config.c Maciek Baron 2014-05-03 18:13:10 +01:00
  • d54a3c1507 Merge branch 'ZedThree-update_addresses' IntelOrca 2014-05-04 14:28:55 +01:00
  • d85e2f8a02 Merge branch 'update_addresses' of https://github.com/ZedThree/OpenRCT2 into ZedThree-update_addresses IntelOrca 2014-05-04 14:27:35 +01:00
  • 4a0d82541c Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git IntelOrca 2014-05-04 14:10:41 +01:00
  • 00cd901441 add news window IntelOrca 2014-05-04 14:10:32 +01:00
  • aaf5d5e52b Merge remote-tracking branch 'upstream/master' Jørn Lomax 2014-05-04 14:02:58 +02:00
  • b3ea71c080 Replace more addresses with their named constants ZedThree 2014-05-04 12:56:35 +02:00
  • dc26319694 intermidiate commit Jørn Lomax 2014-05-04 12:14:18 +02:00
  • ddf51a7edd Merge pull request #56 from Philpax/patch-1 Ted John 2014-05-04 09:57:22 +01:00
  • 20ee164e7b Improved the readme Philpax 2014-05-04 18:38:49 +10:00
  • d4d9f09904 Merge branch 'atmaxinger-settings-screenshot-enum-extension' IntelOrca 2014-05-03 23:37:03 +01:00
  • 7e6800dc0d Merge branch 'settings-screenshot-enum-extension' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-settings-screenshot-enum-extension IntelOrca 2014-05-03 23:35:25 +01:00
  • e9bccf07df refactor map and add get surface tile helper IntelOrca 2014-05-03 21:34:22 +01:00
  • 5360a207b5 Settings: Use enum for screenshot format, Extension name for screenshot format in config file atmaxinger 2014-05-03 22:30:29 +02:00
  • e5c79f051c add end game update in load or quit command IntelOrca 2014-05-03 20:39:34 +01:00
  • 669b65e77d Merge pull request #54 from ZedThree/readme Ted John 2014-05-03 20:05:03 +01:00
  • 300ae52a0d Update readme to reflect changes to game_path ZedThree 2014-05-03 20:18:33 +02:00
  • a3b015e2a0 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-03 16:14:35 +01:00
  • 456ddebc1f clean peep.h IntelOrca 2014-05-03 16:14:16 +01:00
  • 16c08a5743 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-03 16:12:06 +01:00
  • 49affa9c75 Adding enum with trigger flags for peeps Maciek Baron 2014-05-03 16:04:14 +01:00
  • 7271dd9f33 cleaned new config functions. Removed memory leak Jørn Lomax 2014-05-03 15:59:23 +02:00
  • 038dbe9668 fix call for scenario_entrance_fee_too_high_check IntelOrca 2014-05-03 14:43:56 +01:00
  • 973872558c fix scenario_entrance_fee_too_high_check IntelOrca 2014-05-03 14:38:03 +01:00
  • c5e4af4670 Merge branch 'lnz-update_objective' IntelOrca 2014-05-03 14:28:44 +01:00
  • e54b67f843 Merge branch 'update_objective' of https://github.com/lnz/OpenRCT2 into lnz-update_objective IntelOrca 2014-05-03 14:23:33 +01:00
  • f0e5657286 move settings to config and improve IntelOrca 2014-05-03 14:04:40 +01:00
  • 3d0e800c70 Merge branch 'update_objective' of github.com:lnz/OpenRCT2 into update_objective Matthias Lanzinger 2014-05-03 15:04:22 +02:00
  • 72adb4d8bf Documentation and copyright. Matthias Lanzinger 2014-05-03 14:57:50 +02:00
  • 97cab96ea6 Renamed some ride values and some fixups from the merge. Matthias Lanzinger 2014-05-03 14:51:35 +02:00
  • 02ae959a85 Implemented check for objective 8 (10 rollercoasters, min excitement, min length) Matthias Lanzinger 2014-05-03 14:31:23 +02:00
  • 15fc63eecb Refactoring Matthias Lanzinger 2014-05-03 13:43:57 +02:00
  • 6c2a7a0a29 Implement news_item_add_to_queue and some bugfixes. Matthias Lanzinger 2014-05-02 16:09:07 +02:00
  • b3d36869ef Leftover debug call Matthias Lanzinger 2014-05-02 15:06:58 +02:00
  • 68ab137571 Rename marketing_finished to marketing_update. Matthias Lanzinger 2014-05-02 12:31:24 +02:00
  • 935284f53d Implement marketing campaign updating. Matthias Lanzinger 2014-05-02 12:30:39 +02:00
  • bf03c21de9 Implement entrance fee too high check. Some refactoring. Matthias Lanzinger 2014-05-02 11:04:05 +02:00
  • ddce193f4a Implement "Finish 5 rollercoaster..:" objective check and some fixups Matthias Lanzinger 2014-05-02 00:46:27 +02:00
  • efc4095d85 Added check for 10 rollercoaster objective Matthias Lanzinger 2014-05-02 00:37:23 +02:00
  • e1f5c62fcc Implement scenario success and failure procedures. Matthias Lanzinger 2014-05-01 23:51:30 +02:00
  • fc02eef2a9 Implement simple objective checks Matthias Lanzinger 2014-05-01 22:58:44 +02:00
  • c2965a4f9e Make scenario update timeframes clearer Matthias Lanzinger 2014-05-01 19:27:42 +02:00
  • ad0d77a49c Start implementation of scenario_update. Matthias Lanzinger 2014-05-01 19:15:02 +02:00
  • 30a5793ac1 rename current day to current month ticks IntelOrca 2014-05-01 15:07:51 +01:00
  • 9f71cea261 update project file for settings merge IntelOrca 2014-05-03 13:18:56 +01:00
  • 20005e8540 Merge branch 'jvlomax-jvlomax-settings' IntelOrca 2014-05-03 13:18:29 +01:00
  • 4dcf64ac36 Merge branch 'master' into jvlomax-settings Jørn Lomax 2014-05-03 13:54:30 +02:00
  • 730fe6d46b Added setting file. Settings are placed in <user home>\OpenRCT2\config.ini. Jørn Lomax 2014-05-03 13:51:45 +02:00
  • b52797cc79 Merge branch 'ddevrien-master' IntelOrca 2014-05-03 12:44:37 +01:00
  • 9cf6f8f98a Added some GAME_FLAGS ddevrien 2014-05-03 13:39:36 +02:00
  • 74041396a1 fix scenario name string bug IntelOrca 2014-05-03 12:21:12 +01:00
  • c355d27459 Merge remote-tracking branch 'upstream/master' Maciek Baron 2014-05-03 12:07:26 +01:00
  • 92d24a46c4 Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-03 10:40:21 +01:00
  • c6c44b5df2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master IntelOrca 2014-05-03 10:38:45 +01:00
  • a69e5c9911 Merge branch 'ZedThree-element_height' IntelOrca 2014-05-03 10:34:27 +01:00
  • a38b95755a remove unfinished comment and credit author IntelOrca 2014-05-03 10:34:11 +01:00
  • efe5ede9c6 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-03 10:33:11 +01:00
  • 57cff462c4 Fixed offset locations due to missing byte. Duncan Frost 2014-05-03 10:32:17 +01:00
  • 289b7d2811 Merge branch 'element_height' of https://github.com/ZedThree/OpenRCT2 into ZedThree-element_height IntelOrca 2014-05-03 10:30:11 +01:00
  • 9b46c74279 add load game and landscape dialog IntelOrca 2014-05-03 10:27:48 +01:00
  • 3cd254fbbb Change formatting to VS style, improve comments ZedThree 2014-05-03 10:24:25 +02:00
  • d4583339f4 squash! Add map_element_height (finishes sub_662783) ZedThree 2014-05-03 10:22:20 +02:00
  • 5f8db5e115 add pause toggle game command IntelOrca 2014-05-03 09:00:49 +01:00
  • 2cc3a56ffc Slowed down the cheat guests tab animation Duncan Frost 2014-05-03 08:37:07 +01:00
  • 634ae0dbeb allow new quit game or load code to run IntelOrca 2014-05-03 02:33:01 +01:00
  • 51fa837caf add more peep fields IntelOrca 2014-05-03 00:31:53 +01:00
  • 59d0e94f06 use written cancel tool function IntelOrca 2014-05-02 22:38:16 +01:00
  • b9925cd5a0 Merge branch 'master' into path-window IntelOrca 2014-05-02 22:36:04 +01:00
  • 9e3fedad59 add more peep fields IntelOrca 2014-05-02 22:34:14 +01:00
  • 74283010c8 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 IntelOrca 2014-05-02 22:26:43 +01:00
  • 1fdab25cb8 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-02 22:24:29 +01:00
  • a872065a83 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-02 22:22:38 +01:00
  • af5ef5e75d add game_load_or_quit function IntelOrca 2014-05-02 22:21:08 +01:00
  • c87ec51c28 Labelled some of the peep financial offsets. Duncan Frost 2014-05-02 21:54:19 +01:00
  • 297043fecd Add map_element_height (finishes sub_662783) ZedThree 2014-05-02 21:25:42 +02:00
  • d4b5a05307 Merge remote-tracking branch 'upstream/master' Maciek Baron 2014-05-02 21:15:20 +01:00
  • ca81c5e06d Adding enum with peep states Maciek Baron 2014-05-02 21:07:48 +01:00
  • 8da8519b6f Capping money in cheats Maciek Baron 2014-05-02 21:07:20 +01:00
  • fcd3daec57 Merge remote-tracking branch 'upstream/master' into update_objective Matthias Lanzinger 2014-05-02 16:17:51 +02:00
  • 002e914122 Reset a accidental change to the project file during a merge. Matthias Lanzinger 2014-05-02 16:16:32 +02:00
  • 039c398f20 Implement news_item_add_to_queue and some bugfixes. Matthias Lanzinger 2014-05-02 16:09:07 +02:00
  • 8915f5982c Leftover debug call Matthias Lanzinger 2014-05-02 15:06:58 +02:00
  • 0cd98609da Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-02 13:48:43 +01:00
  • b60cee2d43 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master IntelOrca 2014-05-02 13:46:04 +01:00
  • c52521bd5a Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 IntelOrca 2014-05-02 13:44:19 +01:00
  • 67ed7dec8e Merge branch 'dlunch-dlunch' IntelOrca 2014-05-02 13:43:49 +01:00
  • a3a8c1248f Implement loading savefile from commandline argument. Inseok Lee 2014-05-02 21:32:44 +09:00
  • 36a681fe22 Merge pull request #39 from RollingStar/patch-4 Ted John 2014-05-02 13:10:05 +01:00
  • db6374dfda Merge remote-tracking branch 'refs/remotes/upstream/master' ZedThree 2014-05-02 14:01:04 +02:00
  • ace1d2eabb Rename marketing_finished to marketing_update. Matthias Lanzinger 2014-05-02 12:31:24 +02:00
  • 440a21b421 Implement marketing campaign updating. Matthias Lanzinger 2014-05-02 12:30:39 +02:00
  • 341563d9a0 Merge remote-tracking branch 'upstream/master' into update_objective Matthias Lanzinger 2014-05-02 11:04:42 +02:00
  • 5c0bca3f16 Implement entrance fee too high check. Some refactoring. Matthias Lanzinger 2014-05-02 11:04:05 +02:00
  • 168df9171a Added seperate mouseup events so that happy cheat works. Duncan Frost 2014-05-02 06:59:12 +01:00
  • eaba88897b Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-02 06:47:05 +01:00