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
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
Matthias Lanzinger 38821f152a Start implementation of scenario_update. 2014-05-01 19:15:02 +02:00
atmaxinger f305a518b2 Changed screenshot format from BMP to PNG (using LodePNG) 
NOTE: The little popup window ("Screenshot saved to disk as") still
displays a BMP filename, but it saves a PNG file to disk.
 2014-05-01 19:10:07 +02:00
IntelOrca 90d38bf744 Merge branch 'master' into path-window 2014-05-01 17:02:37 +01:00
IntelOrca efa7e8fc2b add game flag for development only below tree height 2014-05-01 17:02:00 +01:00
IntelOrca 7de26e9931 rename current day to current month ticks 2014-05-01 16:55:42 +01:00
IntelOrca 89edc7693c fix case and add author to source code header 2014-05-01 16:55:01 +01:00
Matthias Lanzinger 262b1316c3 Merge remote-tracking branch 'upstream/master' into update_objective 
Conflicts:
	src/window_game_bottom_toolbar.c
 2014-05-01 16:24:32 +02:00
IntelOrca c788f36787 rename current day to current month ticks 2014-05-01 15:07:51 +01:00
IntelOrca ae637f6291 fix case and add author to source code header 2014-05-01 14:17:00 +01:00
ZedThree a5c85f0cbe Fix comments 2014-05-01 14:17:00 +01:00
ZedThree 63df868422 Add rct_car sprite and tidy up news locator 
Also add (x,y,z) coordinate variables for rct_peep
 2014-05-01 14:16:59 +01:00
ZedThree 6c550cbdd6 Change peep news item enum names 2014-05-01 14:16:59 +01:00
ZedThree d5ff2f2781 Fix finding peep on ride news items 
Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
 2014-05-01 14:16:58 +01:00
ZedThree 8c28dbaaef Name peep variables for current train and car 2014-05-01 14:16:58 +01:00
ZedThree b1fef8db57 Fix comments 2014-05-01 14:12:30 +02:00
ZedThree 7d38432796 Add rct_car sprite and tidy up news locator 
Also add (x,y,z) coordinate variables for rct_peep
 2014-05-01 14:02:28 +02:00
ZedThree 1e9d9c1887 Change peep news item enum names 2014-05-01 13:23:18 +02:00
ZedThree ecc51e2f4b Fix finding peep on ride news items 
Peep's current_* variables were offset by 1. Also fixed comparison
between 32-bit and 16-bit ints.
 2014-05-01 13:16:41 +02:00
ZedThree 1255d24be6 Name peep variables for current train and car 2014-05-01 13:03:43 +02:00
Matthias Lanzinger acf62f923c Merge branch 'master' into update_objective 2014-05-01 11:51:20 +02:00
Matthias Lanzinger c7db7c6013 Merge remote-tracking branch 'upstream/master' 2014-05-01 11:50:09 +02:00
IntelOrca b41ea1c141 add path removal 2014-04-30 19:35:37 +01:00
Ted John 023660cfbe Merge pull request #31 from kevinburke/game-flag 
Add game flag for development only below tree height.
 2014-04-30 17:31:26 +01:00
Kevin Burke 59c8090de5 Add game flag for development only below tree height. 2014-04-30 21:51:29 +05:30
IntelOrca 46308abfe3 add cancel and set tool along with path refactor 2014-04-30 16:57:27 +01:00