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

26362 Commits

Author SHA1 Message Date
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
Matthias Lanzinger 039c398f20 Implement news_item_add_to_queue and some bugfixes. 2014-05-02 16:09:07 +02:00
Matthias Lanzinger 8915f5982c Leftover debug call 2014-05-02 15:06:58 +02:00
IntelOrca 0cd98609da Merge branch 'duncanspumpkin-master' 2014-05-02 13:48:43 +01:00
IntelOrca b60cee2d43 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-02 13:46:04 +01:00
IntelOrca c52521bd5a Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-02 13:44:19 +01:00
IntelOrca 67ed7dec8e Merge branch 'dlunch-dlunch' 2014-05-02 13:43:49 +01:00
Inseok Lee a3a8c1248f Implement loading savefile from commandline argument. 2014-05-02 21:32:44 +09:00
Ted John 36a681fe22 Merge pull request #39 from RollingStar/patch-4 
Clarify "can" into "must".
 2014-05-02 13:10:05 +01:00
ZedThree db6374dfda Merge remote-tracking branch 'refs/remotes/upstream/master' 
* refs/remotes/upstream/master: (22 commits)
  fix bug with game_do_command
  add game_do_command
  add more info. to scenario_load_and_play
  set default screenshot format to PNG
  reorganise addresses
  fix peep structure
  Identified monthly ride income location.
  Label energy, thirst, hunger with offsets
  allow BMP to still be saved with PNG as default
  label nausea with offset
  Found nausea peep variable
  finish scenario start and add park size calculate
  Changed screenshot format from BMP to PNG (using LodePNG)
  add game flag for development only below tree height
  rename current day to current month ticks
  fix case and add author to source code header
  Fix comments
  Add rct_car sprite and tidy up news locator
  Change peep news item enum names
  Fix finding peep on ride news items
  ...

Conflicts:
	src/peep.h
 2014-05-02 14:01:04 +02:00
Matthias Lanzinger ace1d2eabb Rename marketing_finished to marketing_update. 2014-05-02 12:31:24 +02:00
Matthias Lanzinger 440a21b421 Implement marketing campaign updating. 2014-05-02 12:30:39 +02:00
Matthias Lanzinger 341563d9a0 Merge remote-tracking branch 'upstream/master' into update_objective 2014-05-02 11:04:42 +02:00
Matthias Lanzinger 5c0bca3f16 Implement entrance fee too high check. Some refactoring. 2014-05-02 11:04:05 +02:00
Duncan Frost 168df9171a Added seperate mouseup events so that happy cheat works. 2014-05-02 06:59:12 +01:00
Duncan Frost eaba88897b Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-02 06:47:05 +01:00
RollingStar 1efbb600b0 Clarify "can" into "must". 2014-05-02 00:12:44 -04:00
IntelOrca d524ad1622 make footpath window use game_do_command 2014-05-02 03:06:30 +01:00
IntelOrca 00b1989a2d Merge branch 'master' into path-window 2014-05-02 03:05:46 +01:00
IntelOrca 07c4c61b2e fix bug with game_do_command 2014-05-02 03:05:18 +01:00
IntelOrca d49cd5648d Merge branch 'master' into path-window 2014-05-02 02:14:39 +01:00
IntelOrca 34a1863291 add game_do_command 2014-05-02 02:12:14 +01:00
IntelOrca 9a95e73e3d add more info. to scenario_load_and_play 2014-05-02 00:18:49 +01:00
Matthias Lanzinger 7403ef68d7 Implement "Finish 5 rollercoaster..:" objective check and some fixups 2014-05-02 00:46:27 +02:00
Matthias Lanzinger 0669525fdc Added check for 10 rollercoaster objective 2014-05-02 00:37:23 +02:00
Duncan Frost 37dd73d166 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-01 22:55:51 +01:00
Duncan Frost 95649ba942 Added happy peeps cheat. Labeled Bathroom peep offset. 2014-05-01 22:55:26 +01:00
IntelOrca 689b82bed9 set default screenshot format to PNG 2014-05-01 22:53:44 +01:00
Matthias Lanzinger 632708c6e8 Implement scenario success and failure procedures. 2014-05-01 23:51:30 +02:00
Matthias Lanzinger e9e99b4869 Implement simple objective checks 2014-05-01 22:58:44 +02:00
IntelOrca c86c484b13 Merge branch 'lnz-master' 2014-05-01 21:44:56 +01:00
IntelOrca 2e5788c0ff reorganise addresses 2014-05-01 21:44:38 +01:00
IntelOrca 5c387dfc13 Merge branch 'master' of https://github.com/lnz/OpenRCT2 into lnz-master 2014-05-01 21:41:01 +01:00
Matthias Lanzinger 9bb7edd14e Merge branch 'master' into update_objective 
Conflicts:
	src/window_game_bottom_toolbar.c
 2014-05-01 22:39:05 +02:00
IntelOrca 373249dfe3 fix peep structure 2014-05-01 21:37:01 +01:00
Matthias Lanzinger 363f7c4c64 Identified monthly ride income location. 2014-05-01 22:32:14 +02:00
Matthias Lanzinger 66f7a0bcdc Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/rct2.h
	src/window_game_bottom_toolbar.c
 2014-05-01 22:30:44 +02:00
Duncan Frost d095adcff5 Merge with master 2014-05-01 21:17:00 +01:00
Duncan Frost 15d5eb4e43 Label energy, thirst, hunger with offsets 2014-05-01 21:13:19 +01:00
IntelOrca d985a54376 Merge branch 'atmaxinger-screenshot-png' 2014-05-01 20:56:13 +01:00
IntelOrca 8c2d28ca6d allow BMP to still be saved with PNG as default 2014-05-01 20:55:53 +01:00
IntelOrca 5260a1dbe4 Merge branch 'screenshot-png' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-screenshot-png 2014-05-01 20:44:42 +01:00
IntelOrca 34097299ec Merge branch 'duncanspumpkin-master' 2014-05-01 20:42:17 +01:00
IntelOrca 7e26477b3c label nausea with offset 2014-05-01 20:42:07 +01:00
Duncan Frost 8d1b374941 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-01 19:56:17 +01:00
Duncan Frost 29cb428368 Found nausea peep variable 2014-05-01 19:53:58 +01:00
IntelOrca 00dcb2941e finish scenario start and add park size calculate 2014-05-01 19:35:47 +01:00
Matthias Lanzinger c0f2b5f383 Make scenario update timeframes clearer 2014-05-01 19:27:42 +02:00