ddevrien
b280675ab5
cleanup
2014-05-09 21:03:00 +02:00
ddevrien
6ddeb610f0
Some additions to window_banner
2014-05-09 20:59:41 +02:00
IntelOrca
f813a70cd6
Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific
2014-05-09 14:39:27 +01:00
IntelOrca
f315013e76
Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master
2014-05-09 14:36:49 +01:00
atmaxinger
45f78eded4
Moved platform specific UI code (MessageBox, DirectoryChooser) into osinterface.c
2014-05-09 11:40:06 +02:00
Duncan Frost
f3e7c6c23c
Added more of draw_sprite still needs work. Function call does not work
2014-05-09 09:18:49 +01:00
ddevrien
3eff5ebf6f
Added basic code for banner window
2014-05-09 10:11:31 +02:00
Maciek Baron
0c34c3791c
Cleaning up files and code related to windows
2014-05-08 21:48:31 +01:00
Duncan Frost
2276c198fd
Removed a pointless call in palette tried to make draw sprite more understandable
2014-05-08 20:43:10 +01:00
Duncan Frost
f448929f73
First couple lines decoded
2014-05-08 20:13:58 +01:00
Miso Zmiric (Mike Squinter)
240662ee39
another typo fixed :)
2014-05-08 19:55:35 +01:00
IntelOrca
62df9a91bd
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master
2014-05-08 19:47:47 +01:00
Duncan Frost
63681f6877
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-05-08 19:16:34 +01:00
Duncan Frost
d3be99cc98
Added get_guest_face_sprite small and large functions.
2014-05-08 19:15:31 +01:00
IntelOrca
1523ac818d
Merge branch 'open_news_item' of https://github.com/ZedThree/OpenRCT2 into ZedThree-open_news_item
2014-05-08 17:48:57 +01:00
ZedThree
85b102c5b0
Change NEWS_ITEM_SCENERY to NEWS_ITEM_RESEARCH
2014-05-08 17:53:57 +02:00
ZedThree
c1ac6edb96
Add function to open park window to guests tab
2014-05-08 17:35:32 +02:00
ZedThree
c94fd53022
Add news_item_open_subject()
2014-05-08 17:14:08 +02:00
ZedThree
a35289fc9f
Add functions to open park window to awards/rating
...
Also update replace some address that have constants/functions
2014-05-08 17:11:26 +02:00
IntelOrca
231777d131
clean up config
2014-05-08 16:07:57 +01:00
IntelOrca
0e7283679b
Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master
2014-05-08 15:58:31 +01:00
Miso Zmiric (Mike Squinter)
b1017a839f
fix late night typo
2014-05-08 13:06:36 +01:00
Jørn Lomax
7d4a80cea2
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/config.c
src/config.h
2014-05-08 11:09:31 +02:00
Jørn Lomax
4e13b24104
Revamped the config system. Now enables sections and comments.
...
Also enables some validation checking of the config file
2014-05-08 11:05:07 +02:00
Miso Zmiric (Mike Squinter)
b04b25d013
Add directory_browser to config_create_default
...
partially resolves #42 [https://github.com/IntelOrca/OpenRCT2/issues/42 ]
2014-05-08 07:10:26 +01:00
IntelOrca
d5927e415f
use finance_payment in do_game_command
2014-05-07 23:45:16 +01:00
IntelOrca
9e6d19a672
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
2014-05-07 22:42:01 +01:00
IntelOrca
3792b2b72e
Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update
2014-05-07 22:40:23 +01:00
IntelOrca
8fff53f043
Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_park_rating
2014-05-07 22:38:22 +01:00
IntelOrca
604f61732c
Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master
2014-05-07 22:36:47 +01:00
ZedThree
76611d054a
Fix bug in open_load_game_dialog()
...
Should return the result of osinterface_open_common_file_dialog()
2014-05-07 23:11:23 +02:00
Maciek Baron
c70865457c
Adding window_ride_init_vars and various enums
...
Adding window_ride_init_vars and various enums, also decompiled one
unknown function.
2014-05-07 21:17:26 +01:00
Duncan Frost
dc1386cca2
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating
2014-05-07 19:58:55 +01:00
ddevrien
15c1213fb5
Identified WWT_6, added some strings
...
WWT_6 is used for signs, it's the color selection button
2014-05-07 20:53:33 +02:00
Duncan Frost
bfd4dbcbe9
Changed litter var_24 to unsigned
2014-05-07 19:46:30 +01:00
Duncan Frost
4e4fa93e14
Fixed litter bug. Removed debug notes. Made rides code more readable
2014-05-07 19:44:13 +01:00
Duncan Frost
8ddfc136f6
Fixed bug in second ride related equations
2014-05-07 18:57:50 +01:00
lnz
840c76b68e
Fix month not changing bug and wage cost bug.
2014-05-07 16:28:42 +02:00
lnz
169a3b6b72
Implement Peep problem warnings update.
2014-05-07 16:24:36 +02:00
IntelOrca
18d95968f2
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
2014-05-07 00:37:13 +01:00
Maciek Baron
aef83362bc
Cleaning up small shared functions
...
Cleaning up small shared functions and moving them to appropriate files
2014-05-06 22:04:09 +01:00
Duncan Frost
b52c5c0b2d
Peeps part now working
2014-05-06 21:54:42 +01:00
Duncan Frost
3629247056
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating
2014-05-06 21:18:17 +01:00
Duncan Frost
eb828c0041
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-05-06 21:14:02 +01:00
Duncan Frost
c26b944b6e
Now uses string references
2014-05-06 21:13:38 +01:00
Duncan Frost
da0236ef84
Labeled init values for Shearwood Forest
2014-05-06 21:09:08 +01:00
IntelOrca
d74bae8023
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
2014-05-05 23:30:04 +01:00
Maciek Baron
1f00ad9110
Implemented a few functions in editor.c
2014-05-05 23:10:47 +01:00
lnz
9de233e34b
Actually add finance code.
2014-05-05 22:16:34 +02:00
lnz
589118d66d
Implement some finance functions and added a few addresses & tables
2014-05-05 22:14:45 +02:00
lnz
48caec8b58
Label unimplemented functions in scenario_update
2014-05-05 22:14:17 +02:00
Duncan Frost
2b900bebb3
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-05-05 20:27:40 +01:00
Duncan Frost
5ca2b1a7fd
Added more strings
2014-05-05 20:27:06 +01:00
IntelOrca
726c1a2312
fix peep structure
2014-05-05 20:16:27 +01:00
IntelOrca
73d9be16ab
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master
2014-05-05 20:14:53 +01:00
IntelOrca
720261f0ba
Merge branch 'ride_vars' of https://github.com/ZedThree/OpenRCT2 into ZedThree-ride_vars
2014-05-05 20:08:27 +01:00
IntelOrca
46bcefc1fb
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
2014-05-05 20:06:22 +01:00
IntelOrca
3a177fbb45
add grouping to guest list window
2014-05-05 20:04:17 +01:00
ZedThree
290255a32d
Fix bug: rides not sorted correctly
2014-05-05 20:55:25 +02:00
Duncan Frost
ce14d72d16
Labeled ride photo 1-4 and time in park offsets.
2014-05-05 19:35:47 +01:00
ZedThree
d0d51e477b
Add ride mode enum and name some ride variables
2014-05-05 19:36:07 +02:00
Maciek Baron
f20311ec6c
Fixing typo
2014-05-05 18:26:55 +01:00
Maciek Baron
1c51c81622
Reverting struct changes
2014-05-05 16:52:19 +01:00
Maciek Baron
29459fb9bb
Adding item flags, time in thought struct
2014-05-05 16:41:29 +01:00
IntelOrca
a35a9f29a4
add guest list window
2014-05-05 03:27:17 +01:00
Duncan Frost
b63c7c41f0
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-05-04 21:18:41 +01:00
Duncan Frost
c4b7dd8a5a
Added PEEP_NAUSEA_TOLERANCE enum
2014-05-04 21:14:30 +01:00
Ted John
eedab37993
Merge pull request #61 from MakaHost/master
...
Fixed spelling in peep thought types
2014-05-04 20:52:21 +01:00
Duncan Frost
d0203aaeda
Labelled more peep offsets
2014-05-04 20:48:47 +01:00
MakaHost
bab2790027
Fixed spelling in peep thought types
2014-05-04 21:45:40 +02:00
IntelOrca
c062992e78
add play intro config setting
2014-05-04 19:59:24 +01:00
IntelOrca
ff992e1fc0
Merge branch 'MaciekBaron-master'
2014-05-04 19:04:20 +01:00
IntelOrca
da7563c7c9
add unknown map element function
2014-05-04 18:51:36 +01:00
Maciek Baron
d18ff2bb1b
Adding peep thought types
2014-05-04 18:49:29 +01:00
IntelOrca
160c388739
name more functions in editor.c
2014-05-04 18:02:28 +01:00
IntelOrca
9b6873f09e
add checksum validation for load sc6 and sv6
2014-05-04 17:34:13 +01:00
IntelOrca
e2414bf9f7
Merge branch 'MaciekBaron-master'
2014-05-04 17:09:44 +01:00
Maciek Baron
cde954ba63
Removing leftover debug code
2014-05-04 16:34:35 +01:00
IntelOrca
6819b787ed
remove key debug check
2014-05-04 16:32:48 +01:00
IntelOrca
3ac5447abe
fix news window multiple copies bug
2014-05-04 16:32:10 +01:00
Maciek Baron
0477e2803b
Implementing get_local_time()
2014-05-04 16:31:32 +01:00
IntelOrca
a0976e2f40
add load saved game
2014-05-04 16:21:15 +01:00
Maciek Baron
61238c70f3
Removing dupe address, adding OS hour and minute
2014-05-04 16:16:03 +01:00
Maciek Baron
f2b8c4984e
Adding more possible locations for config.c
2014-05-04 14:45:04 +01:00
IntelOrca
d85e2f8a02
Merge branch 'update_addresses' of https://github.com/ZedThree/OpenRCT2 into ZedThree-update_addresses
2014-05-04 14:27:35 +01:00
IntelOrca
00cd901441
add news window
2014-05-04 14:10:32 +01:00
Jørn Lomax
aaf5d5e52b
Merge remote-tracking branch 'upstream/master'
2014-05-04 14:02:58 +02:00
ZedThree
b3ea71c080
Replace more addresses with their named constants
...
Also named window.var_4B2/4 as saved_view_x/y
2014-05-04 13:11:31 +02:00
Jørn Lomax
dc26319694
intermidiate commit
2014-05-04 12:14:18 +02:00
IntelOrca
7e6800dc0d
Merge branch 'settings-screenshot-enum-extension' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-settings-screenshot-enum-extension
2014-05-03 23:35:25 +01:00
IntelOrca
e9bccf07df
refactor map and add get surface tile helper
2014-05-03 21:34:22 +01:00
atmaxinger
5360a207b5
Settings: Use enum for screenshot format, Extension name for screenshot format in config file
2014-05-03 22:30:29 +02:00
IntelOrca
e5c79f051c
add end game update in load or quit command
2014-05-03 20:39:34 +01:00
IntelOrca
456ddebc1f
clean peep.h
2014-05-03 16:14:16 +01:00
IntelOrca
16c08a5743
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
2014-05-03 16:12:06 +01:00
Maciek Baron
49affa9c75
Adding enum with trigger flags for peeps
2014-05-03 16:04:14 +01:00
Jørn Lomax
7271dd9f33
cleaned new config functions. Removed memory leak
2014-05-03 15:59:23 +02:00
IntelOrca
038dbe9668
fix call for scenario_entrance_fee_too_high_check
2014-05-03 14:43:56 +01:00
IntelOrca
973872558c
fix scenario_entrance_fee_too_high_check
2014-05-03 14:38:03 +01:00
IntelOrca
e54b67f843
Merge branch 'update_objective' of https://github.com/lnz/OpenRCT2 into lnz-update_objective
2014-05-03 14:23:33 +01:00
IntelOrca
f0e5657286
move settings to config and improve
2014-05-03 14:04:40 +01:00
Matthias Lanzinger
72adb4d8bf
Documentation and copyright.
2014-05-03 14:57:50 +02:00
Matthias Lanzinger
97cab96ea6
Renamed some ride values and some fixups from the merge.
2014-05-03 14:51:35 +02:00
Matthias Lanzinger
02ae959a85
Implemented check for objective 8 (10 rollercoasters, min excitement, min
...
length)
2014-05-03 14:36:36 +02:00
Matthias Lanzinger
15fc63eecb
Refactoring
2014-05-03 14:36:35 +02:00
Matthias Lanzinger
6c2a7a0a29
Implement news_item_add_to_queue and some bugfixes.
2014-05-03 14:36:34 +02:00
Matthias Lanzinger
b3d36869ef
Leftover debug call
2014-05-03 14:35:12 +02:00
Matthias Lanzinger
68ab137571
Rename marketing_finished to marketing_update.
2014-05-03 14:35:12 +02:00
Matthias Lanzinger
935284f53d
Implement marketing campaign updating.
2014-05-03 14:35:11 +02:00
Matthias Lanzinger
bf03c21de9
Implement entrance fee too high check. Some refactoring.
2014-05-03 14:35:11 +02:00
Matthias Lanzinger
ddce193f4a
Implement "Finish 5 rollercoaster..:" objective check and some fixups
2014-05-03 14:35:11 +02:00
Matthias Lanzinger
efc4095d85
Added check for 10 rollercoaster objective
2014-05-03 14:35:10 +02:00
Matthias Lanzinger
e1f5c62fcc
Implement scenario success and failure procedures.
2014-05-03 14:35:10 +02:00
Matthias Lanzinger
fc02eef2a9
Implement simple objective checks
2014-05-03 14:35:09 +02:00
Matthias Lanzinger
c2965a4f9e
Make scenario update timeframes clearer
2014-05-03 14:35:08 +02:00
Matthias Lanzinger
ad0d77a49c
Start implementation of scenario_update.
2014-05-03 14:35:08 +02:00
IntelOrca
30a5793ac1
rename current day to current month ticks
2014-05-03 14:35:07 +02:00
Jørn Lomax
4dcf64ac36
Merge branch 'master' into jvlomax-settings
2014-05-03 13:54:30 +02:00
Jørn Lomax
730fe6d46b
Added setting file. Settings are placed in <user home>\OpenRCT2\config.ini.
2014-05-03 13:51:45 +02:00
ddevrien
9cf6f8f98a
Added some GAME_FLAGS
...
Also renamed them to PARK_FLAGS and moved them to park.h, since they
have to do with each park, and are probably saved somewhere in the sv6
file.
2014-05-03 13:39:36 +02:00
IntelOrca
74041396a1
fix scenario name string bug
2014-05-03 12:21:12 +01:00
IntelOrca
c6c44b5df2
Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master
2014-05-03 10:38:45 +01:00
IntelOrca
a38b95755a
remove unfinished comment and credit author
2014-05-03 10:34:11 +01:00
Duncan Frost
efe5ede9c6
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
2014-05-03 10:33:11 +01:00
Duncan Frost
57cff462c4
Fixed offset locations due to missing byte.
2014-05-03 10:32:17 +01:00
IntelOrca
289b7d2811
Merge branch 'element_height' of https://github.com/ZedThree/OpenRCT2 into ZedThree-element_height
2014-05-03 10:30:11 +01:00
IntelOrca
9b46c74279
add load game and landscape dialog
2014-05-03 10:27:48 +01:00
ZedThree
3cd254fbbb
Change formatting to VS style, improve comments
2014-05-03 10:24:25 +02:00
ZedThree
d4583339f4
squash! Add map_element_height (finishes sub_662783)
2014-05-03 10:22:20 +02:00
IntelOrca
5f8db5e115
add pause toggle game command
2014-05-03 09:00:49 +01:00
Duncan Frost
2cc3a56ffc
Slowed down the cheat guests tab animation
2014-05-03 08:37:07 +01:00
IntelOrca
634ae0dbeb
allow new quit game or load code to run
2014-05-03 02:33:01 +01:00
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
ZedThree
297043fecd
Add map_element_height (finishes sub_662783)
...
Possibly wrong for some slopes...
2014-05-02 22:15:53 +02: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
ZedThree
db6374dfda
Merge remote-tracking branch 'refs/remotes/upstream/master'
...
* refs/remotes/upstream/master: (22 commits)
fix bug with game_do_command
add game_do_command
add more info. to scenario_load_and_play
set default screenshot format to PNG
reorganise addresses
fix peep structure
Identified monthly ride income location.
Label energy, thirst, hunger with offsets
allow BMP to still be saved with PNG as default
label nausea with offset
Found nausea peep variable
finish scenario start and add park size calculate
Changed screenshot format from BMP to PNG (using LodePNG)
add game flag for development only below tree height
rename current day to current month ticks
fix case and add author to source code header
Fix comments
Add rct_car sprite and tidy up news locator
Change peep news item enum names
Fix finding peep on ride news items
...
Conflicts:
src/peep.h
2014-05-02 14:01:04 +02: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
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
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
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
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
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
IntelOrca
6dff411f2d
fix bugs in game_handle_input_mouse
2014-04-28 22:03:51 +02:00
ZedThree
6f756bb458
Replace variable addresses with named constants
...
Done automatically with sed/unix
2014-04-28 22:00:54 +02:00
Matthias Lanzinger
b7ae1c7266
Slight climate refactoring
2014-04-28 20:39:10 +02:00
Matthias Lanzinger
22bcc5d201
Removed redundance in climate_reset
2014-04-28 20:14:50 +02:00
Matthias Lanzinger
573929fee9
Identified full weather data table.
...
Restructured weather data properly and made window_game_bottom_toolbar use
our table.
Used determine_future_weather in climate_reset.
2014-04-28 19:59:40 +02:00
IntelOrca
3d6bdd67ad
add path window invalidate and paint
2014-04-28 18:37:38 +01:00
IntelOrca
1246a14fe3
add footpath window
2014-04-28 17:35:12 +01:00
Matthias Lanzinger
80c1507fd4
Merge remote-tracking branch 'upstream/master' into update_climate
2014-04-28 17:17:52 +02:00
Matthias Lanzinger
039241cde4
Moved the weather table into our code.
...
Introduced the weather table struct used for future weather calculation.
Added a bit more explanation on how future weather is calculated.
2014-04-28 17:07:13 +02:00
IntelOrca
999429071e
credit author in source code header
2014-04-28 15:29:54 +01:00
Alexander Overvoorde
aeb5e2a0e4
Add separate key buffer for shortcuts to fix misbehaving panning with keyboard
2014-04-28 16:06:07 +02:00
IntelOrca
8b7a940aa4
add about window
2014-04-28 02:35:37 +01:00
IntelOrca
077d3b9d90
fix bugs in game_handle_input_mouse
2014-04-28 02:35:23 +01:00
Matthias Lanzinger
b3c279d9b5
Implement determining future weather.
2014-04-28 02:24:57 +02:00
Matthias Lanzinger
b557f5bf1c
Identified more climate related values.
2014-04-28 01:05:00 +02:00
Matthias Lanzinger
035fa16fc3
Crude start of a decompiled update_climate()
2014-04-27 23:46:18 +02:00
IntelOrca
b8f5385050
add additional authors in source code headers
2014-04-27 20:21:55 +01:00
IntelOrca
cdd65dbcee
Merge branch 'master' of https://github.com/ZedThree/OpenRCT2 into ZedThree-master
2014-04-27 20:09:35 +01:00
Peter Hill
746000f0cd
Replace call by address with function name
...
Call news_item_get_subject_location by name rather than its address.
Also add short description of function
2014-04-27 20:27:12 +02:00
IntelOrca
edba77dd9d
change to conform to consistent code style
2014-04-27 15:47:52 +01:00
Matthias Lanzinger
0760dab657
decompile get_system_info()
2014-04-27 13:04:45 +02:00
Matthias Lanzinger
d9f0225ee7
Fix RCT2_CALLFUNC
2014-04-27 04:22:50 +02:00
IntelOrca
781d0fdf26
add title options and block tutorial
2014-04-26 16:53:21 +01:00
IntelOrca
b9ea3b1143
decompile window mouse wheel input
2014-04-26 15:50:01 +01:00
IntelOrca
b8a0365475
fix park window viewport bug
2014-04-26 15:49:44 +01:00
IntelOrca
218cd32c7d
add bitmap screenshot saving
2014-04-26 03:17:32 +01:00
IntelOrca
9f91798514
implement keyboard shortcuts
2014-04-26 01:16:32 +01:00
IntelOrca
cd14e4b33f
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-04-25 18:25:46 +01:00
IntelOrca
2afb4e12eb
add screenshot and error window base functions
2014-04-25 18:25:34 +01:00
RollingStar
9f60a085e0
Comment explaining GAME_PATH.
2014-04-25 12:35:40 -04:00
IntelOrca
e63b027683
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-04-25 03:02:55 +01:00
IntelOrca
5ddaf0359e
increase land tool limit to 64 with nice number
2014-04-25 03:02:24 +01:00
IntelOrca
be81e69f56
add more input logic
2014-04-25 03:02:06 +01:00
RollingStar
f5f3926d51
Corrected typo in comment.
2014-04-24 18:19:58 -04:00
IntelOrca
66e4898217
add config save
2014-04-24 21:29:57 +01:00
IntelOrca
eaec44e896
refactor window flags
2014-04-24 20:26:05 +01:00
IntelOrca
ea4ea99212
add more input logic and tooltip window
2014-04-24 18:53:42 +01:00
IntelOrca
14dc250fcb
space out track definition table correctly
2014-04-23 17:44:46 +01:00
IntelOrca
f51a119388
Merge branch 'track-defs' of https://github.com/kevinburke/OpenRCT2 into kevinburke-track-defs
2014-04-23 17:33:57 +01:00
IntelOrca
c28c1eae47
add sorting and click to ride list window
2014-04-23 17:29:16 +01:00
Kevin Burke
f4352d3205
update some elements that had duplicate keys
2014-04-23 11:39:05 +05:30
Kevin Burke
cf5cf6a108
add remaining track defs
2014-04-23 11:33:45 +05:30
IntelOrca
4fa79e29f6
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-04-23 01:50:54 +01:00
IntelOrca
75dc8243c4
add track definitions
2014-04-23 01:50:40 +01:00
Kevin Burke
f82c2582c0
add address for ride properties
2014-04-22 23:13:53 +05:30
Kevin Burke
41358c734a
Replace address references with named constant
2014-04-21 15:00:18 +05:30
Kevin Burke
e5a925e26c
Add newlines to the end of every file (sed/unix do this)
2014-04-21 14:57:48 +05:30
IntelOrca
27d9fccfcf
add ride list window
2014-04-20 03:31:54 +01:00
IntelOrca
6b0ba5c6d0
add ride list window
2014-04-19 03:16:20 +01:00
IntelOrca
131673ab0d
add graph drawing to park window
2014-04-18 22:47:25 +01:00
IntelOrca
cfd9467e30
add clear scenery window
2014-04-18 19:51:18 +01:00
IntelOrca
3002c5dbe2
add land and image dropdown window
2014-04-18 19:00:27 +01:00
IntelOrca
8aed834665
add random title script
2014-04-18 16:26:45 +01:00
IntelOrca
d339df5784
improve input
2014-04-18 03:04:46 +01:00
IntelOrca
d5da8c41c0
fix viewport bug
2014-04-18 00:07:06 +01:00
IntelOrca
b366594a9c
allow resizable park window with price added
2014-04-17 19:33:31 +01:00
IntelOrca
7ea9866efb
get park window buttons working
2014-04-17 15:12:41 +01:00
IntelOrca
7bab1b34a2
discover text input and other events
2014-04-17 03:19:30 +01:00
IntelOrca
eba4b6da9d
add other pages to park window
2014-04-16 02:05:49 +01:00
IntelOrca
03db7f5bc0
anchor bottom toolbar to window width
2014-04-15 02:36:58 +01:00
IntelOrca
98aab20369
add cheat window and compile manual
2014-04-15 00:50:20 +01:00
IntelOrca
3f59b7ad9e
add park objective window
2014-04-14 21:25:20 +01:00
IntelOrca
b4b885a706
add right click viewport input
2014-04-14 20:26:29 +01:00
IntelOrca
c8f3c0ac2e
add viewport drag
2014-04-14 14:32:05 +01:00
IntelOrca
b5b23cb91b
add water and input logic
2014-04-14 03:09:51 +01:00
IntelOrca
b98ca0e45b
add land window
2014-04-13 22:23:56 +01:00
IntelOrca
f2f1f46880
add news item subject locating
2014-04-12 02:14:31 +01:00
IntelOrca
71ea2cc072
add news item location finding
2014-04-11 20:02:20 +01:00
IntelOrca
8cbe0e7aa1
add more drawing of bottom toolbar
2014-04-11 17:38:15 +01:00
IntelOrca
5cb1600417
add bottom toolbar
2014-04-11 03:58:17 +01:00
IntelOrca
ceb8f8113a
add top toolbar and ride types
2014-04-11 02:42:39 +01:00
IntelOrca
ee2b89a1b4
optimise drawing
2014-04-10 18:41:35 +01:00
IntelOrca
32dec4ab52
add some object loading
2014-04-10 17:08:41 +01:00
IntelOrca
b23c12d435
add scenario loading and title script
2014-04-10 15:14:47 +01:00
IntelOrca
9e9daaedfa
add more map definitions
2014-04-10 04:02:06 +01:00
IntelOrca
ea83736d5a
improve scenario structures
2014-04-10 03:23:12 +01:00
IntelOrca
3ae8971340
add scenario / saved game decoding
2014-04-10 00:22:57 +01:00
IntelOrca
5f74540a0f
add drawing of some widgets
2014-04-09 22:35:29 +01:00
IntelOrca
d86799e8fc
finish scenario select
2014-04-09 18:38:04 +01:00
IntelOrca
481b8e23c0
add editor loading
2014-04-09 17:06:47 +01:00
IntelOrca
0402ffe6fc
add title menu and dropdown
2014-04-09 14:43:27 +01:00
IntelOrca
c8d2b0bf1e
add climate and date
2014-04-09 11:16:35 +01:00
IntelOrca
535e62f3aa
add map initialisation
2014-04-09 03:09:30 +01:00
IntelOrca
f5917e71f5
add ride initialisation
2014-04-09 02:39:28 +01:00
IntelOrca
902bfc786e
add draw window
2014-04-08 19:49:04 +01:00
IntelOrca
286b43355a
start work on window drawing
2014-04-08 17:52:39 +01:00
IntelOrca
1b92d895a2
add some park functions
2014-04-08 00:41:35 +01:00
IntelOrca
880e741341
add config load
2014-04-08 00:05:05 +01:00
IntelOrca
882c3fa9ae
add scenario list loading
2014-04-06 17:45:09 +01:00
IntelOrca
5909a17dbc
add some news item functions
2014-04-04 21:46:26 +01:00
IntelOrca
88f517f907
add loading of g1.dat
2014-04-04 19:59:32 +01:00
IntelOrca
7a83a8b1a8
fix window problems and add scenario select
2014-04-03 19:49:00 +01:00
IntelOrca
d4c6993121
fixed source code errors and added play panned wrap
2014-04-03 17:52:25 +01:00
IntelOrca
3a6a55147f
add window functions and title screen windows
2014-04-03 03:08:06 +01:00
IntelOrca
0a12f15a25
add peep updating
2014-04-03 00:22:33 +01:00
IntelOrca
ffcbb5b26d
add non-commited files and improve window resize
2014-04-02 21:50:16 +01:00
IntelOrca
182db27ab3
add intro screen code
2014-04-02 16:46:58 +01:00
IntelOrca
bfd3ad8b28
add window definitions and update all subroutine
2014-04-02 04:56:26 +01:00
IntelOrca
643db7ae01
initial commit
...
Working game in SDL2 window but with various bugs and incomplete input
logic.
2014-04-02 00:31:55 +01:00