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 |
|
IntelOrca
|
7e63aaaef6
|
Merge branch 'master'
|
2014-04-30 14:32:12 +01:00 |
|
IntelOrca
|
f236c077bf
|
draw OpenRCT2 text and version on title screen
|
2014-04-30 14:31:52 +01:00 |
|
IntelOrca
|
46472c35ae
|
improve footpath code
|
2014-04-30 13:38:27 +01:00 |
|
IntelOrca
|
6dd861a815
|
fix construct path bridge or tunnel button
|
2014-04-30 02:25:54 +01:00 |
|
IntelOrca
|
8632b76271
|
add provisional and placement of paths
|
2014-04-30 01:59:11 +01:00 |
|
IntelOrca
|
d981ead0f3
|
Merge branch 'master' into path-window
|
2014-04-29 23:46:55 +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 |
|
IntelOrca
|
c20d209b69
|
add path dropdowns and disabled widgets
|
2014-04-29 22:25:37 +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
|
9cf658356f
|
Merge branch 'master' into path-window
|
2014-04-29 12:40:14 +01: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 |
|
IntelOrca
|
e617b16e33
|
add left over footpath window events
|
2014-04-29 03:12:52 +01: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 |
|
Alexander Overvoorde
|
4201ff06d2
|
Add separate key buffer for shortcuts to fix misbehaving panning with keyboard
|
2014-04-28 22:03:52 +02:00 |
|
IntelOrca
|
eba38c7bb9
|
add about window
|
2014-04-28 22:03:52 +02:00 |
|