mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Code Issues Releases Wiki Activity
197 Commits 8 Branches 59 Tags
51fa837cafc7e8bdca03bd5a33b8b66d0e336bad
Commit Graph

174 Commits

Author SHA1 Message Date
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
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
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
IntelOrca
b60cee2d43 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-02 13:46:04 +01:00
Inseok Lee
a3a8c1248f Implement loading savefile from commandline argument. 2014-05-02 21:32:44 +09: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
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
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
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
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
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
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
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
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
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
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