IntelOrca
a35a9f29a4
add guest list window
2014-05-05 03:27:17 +01:00
Ted John
a1a53c4c61
Merge pull request #62 from duncanspumpkin/master
...
Peep nausea tolerance enum
2014-05-04 21:26:56 +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
Ted John
3c55f9aaaa
Merge pull request #60 from duncanspumpkin/master
...
Labelled more peep offsets
2014-05-04 20:51:49 +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
d54a3c1507
Merge branch 'ZedThree-update_addresses'
2014-05-04 14:28:55 +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
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