ddevrien
|
e6e3fce74d
|
Merge branch 'master' of https://github.com/ddevrien/OpenRCT2
Conflicts:
projects/openrct2.vcxproj
projects/openrct2.vcxproj.filters
|
2014-05-09 10:12:05 +02:00 |
ddevrien
|
3eff5ebf6f
|
Added basic code for banner window
|
2014-05-09 10:11:31 +02:00 |
ddevrien
|
1eda151c70
|
Added basic code for banner window
|
2014-05-09 10:04:40 +02:00 |
IntelOrca
|
dce8c9eaf1
|
Merge branch 'MaciekBaron-master'
|
2014-05-08 22:44:55 +01: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
|
196bc68acd
|
Merge branch 'duncanspumpkin-master'
|
2014-05-08 19:48:53 +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
|
56bef5f328
|
Merge branch 'ZedThree-open_news_item'
|
2014-05-08 17:50:36 +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 |
Duncan Frost
|
6af1306c23
|
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
|
2014-05-08 17:38: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
|
17389d18b3
|
Merge branch 'mzmiric5-master'
|
2014-05-08 16:08:15 +01: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 |
IntelOrca
|
c7b7976743
|
Merge branch 'jvlomax-master'
|
2014-05-08 15:43:41 +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
|
1610970bfe
|
Merge branch 'MaciekBaron-master'
|
2014-05-07 22:42:54 +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
|
cf80dd42d1
|
Merge branch 'lnz-scenario_update'
|
2014-05-07 22:41:11 +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
|
35ea6300fb
|
Merge branch 'duncanspumpkin-fix_park_rating'
|
2014-05-07 22:39:38 +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
|
b47127f464
|
Merge branch 'ddevrien-master'
|
2014-05-07 22:37:15 +01:00 |
IntelOrca
|
604f61732c
|
Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master
|
2014-05-07 22:36:47 +01:00 |
IntelOrca
|
6ca9058b70
|
Merge branch 'ZedThree-loadgame'
|
2014-05-07 22:36:00 +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 |
Duncan Frost
|
c70574104d
|
Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2
|
2014-05-07 19:58:20 +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
|
e7baa73b2c
|
Merge branch 'MaciekBaron-master'
|
2014-05-07 00:41:31 +01: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 |