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

9937 Commits

Author SHA1 Message Date
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
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