mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity
159 Commits 8 Branches 58 Tags
1efbb600b0c8b016a6e09b9bc368f06bbe7904bc
Commit Graph

159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RollingStar
1efbb600b0 Clarify "can" into "must". 2014-05-02 00:12:44 -04:00
IntelOrca
07c4c61b2e fix bug with game_do_command 2014-05-02 03:05:18 +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
IntelOrca
689b82bed9 set default screenshot format to PNG 2014-05-01 22:53:44 +01: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
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
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
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
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
f236c077bf draw OpenRCT2 text and version on title screen 2014-04-30 14:31:52 +01:00
IntelOrca
d50e1f1bb9 Merge branch 'title-logo-paint' of https://github.com/benpye/OpenRCT2 into benpye-title-logo-paint 2014-04-29 22:29:45 +01:00
Ben Pye
0d8f2e43cf Use colour defines over magic numbers 2014-04-29 22:12:04 +01:00
Matthias Lanzinger
9f321fa339 Identified peep.staff_type and days_in_month table. 2014-04-29 22:51:51 +02:00
Ben Pye
7c387f5ace Implement exit button paint and mouseup 2014-04-29 21:12:39 +01:00
Ben Pye
066bd67141 Fix comment relating to prefix for expansion 2014-04-29 21:03:22 +01:00
Ben Pye
7c79d25c97 Add the logo window paint function and move some constants to addresses 2014-04-29 20:34:53 +01:00
Peter Hill
2d69f50444 Define named constant for null sprite locations 2014-04-29 18:40:06 +02:00
Matthias Lanzinger
4cb286d8b9 Merge remote-tracking branch 'upstream/master' 2014-04-29 15:17:26 +02:00
IntelOrca
073057dbbe add author credit to source code header 2014-04-29 12:39:18 +01:00
IntelOrca
a325bcc856 define next climate variables, all refs rewritten 2014-04-29 12:35:37 +01:00
IntelOrca
1dcfdbe355 refactor climate 2014-04-29 12:18:50 +01:00
Matthias Lanzinger
702674f13e Merge remote-tracking branch 'upstream/master' into update_climate 2014-04-29 12:42:49 +02:00
Matthias Lanzinger
bda09d93d5 Move include inside guard block. 2014-04-28 23:19:18 +02:00
Matthias Lanzinger
b5bb145f03 Move all the transition tables to our code. 2014-04-28 23:12:08 +02:00
Peter Hill
34e06ea3ce Merge remote-tracking branch 'upstream/master' 2014-04-28 22:15:04 +02:00
IntelOrca
6f11cc90ff credit author in source code header 2014-04-28 22:03:52 +02:00