IntelOrca
4a0d82541c
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git
2014-05-04 14:10:41 +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
Ted John
ddf51a7edd
Merge pull request #56 from Philpax/patch-1
...
Fixed and improved grammar in readme
2014-05-04 09:57:22 +01:00
Philpax
20ee164e7b
Improved the readme
...
The current readme suffered from several grammar mistakes which detracted from important information. I cleaned up the grammar and added some more information where needed.
2014-05-04 18:38:49 +10:00
IntelOrca
d4d9f09904
Merge branch 'atmaxinger-settings-screenshot-enum-extension'
2014-05-03 23:37:03 +01: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
Ted John
669b65e77d
Merge pull request #54 from ZedThree/readme
...
Update readme to reflect changes to game_path
2014-05-03 20:05:03 +01:00
ZedThree
300ae52a0d
Update readme to reflect changes to game_path
2014-05-03 20:18:33 +02:00
IntelOrca
a3b015e2a0
Merge branch 'MaciekBaron-master'
2014-05-03 16:14:35 +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
c5e4af4670
Merge branch 'lnz-update_objective'
2014-05-03 14:28:44 +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
3d0e800c70
Merge branch 'update_objective' of github.com:lnz/OpenRCT2 into update_objective
...
Conflicts:
src/news_item.c
src/news_item.h
src/peep.h
src/scenario.c
2014-05-03 15:04:22 +02: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
IntelOrca
9f71cea261
update project file for settings merge
2014-05-03 13:18:56 +01:00
IntelOrca
20005e8540
Merge branch 'jvlomax-jvlomax-settings'
2014-05-03 13:18:29 +01: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
IntelOrca
b52797cc79
Merge branch 'ddevrien-master'
2014-05-03 12:44:37 +01: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
Maciek Baron
c355d27459
Merge remote-tracking branch 'upstream/master'
2014-05-03 12:07:26 +01:00
IntelOrca
92d24a46c4
Merge branch 'duncanspumpkin-master'
2014-05-03 10:40:21 +01:00