mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-24 03:12:03 -05:00
Code Issues Projects Releases Packages Wiki Activity
17725 commits 10 branches 46 tags 402 MiB
Commit graph

17725 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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