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 |
|