mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,672 Commits 7 Branches 39 Tags 357 MiB
Commit Graph

18672 Commits

Author SHA1 Message Date
ddevrien 977fe5f485 forgot debug code 2014-05-11 09:04:25 +02:00
ddevrien b39cf4d1af Started work on options window 2014-05-11 09:01:01 +02:00
IntelOrca 70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +01:00
IntelOrca f8363e098b add park_init 2014-05-11 00:35:45 +01:00
Duncan Frost 26f4b35e61 Cleaned up code so that it makes more sense. 2014-05-10 12:26:19 +01:00
Duncan Frost 16ed98348a Found bug due to signness on global var 2014-05-10 10:16:23 +01:00
Duncan Frost 601305a4e3 Still searching for bug. Must be some external memory not set 2014-05-10 10:12:48 +01:00
ddevrien 5f690ac134 Added basic code for banner window 2014-05-10 09:27:19 +02:00
Duncan Frost 45bd2d789c Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-10 07:14:44 +01:00
Duncan Frost 1086c4e524 added notes to help find bug 2014-05-10 07:14:12 +01:00
IntelOrca 61ceee26a7 remove extra scenario name address macro 2014-05-10 00:40:47 +01:00
IntelOrca bfbb5b810b Merge branch 'MaciekBaron-master' 2014-05-10 00:38:42 +01:00
Maciek Baron d3382e3a38 Renaming ride construction content 2014-05-09 23:43:10 +01:00
Maciek Baron 73d06418b6 Adding ride build date, reset function 2014-05-09 23:40:38 +01:00
IntelOrca 3b8f0d685b convert handling shortcut keys to switch 2014-05-09 23:05:50 +01:00
IntelOrca 9d07c4a508 Merge branch 'ZedThree-shortcuts' 2014-05-09 22:28:53 +01:00
IntelOrca 10b4c3cfab Merge branch 'shortcuts' of https://github.com/ZedThree/OpenRCT2 into ZedThree-shortcuts 2014-05-09 22:28:26 +01:00
IntelOrca 4e50980b61 Merge branch 'ddevrien-window_banner' 2014-05-09 22:26:59 +01:00
IntelOrca b8dd77c1d7 Merge branch 'window_banner' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_banner 2014-05-09 22:25:10 +01:00
ZedThree 2523b1f328 Fix a couple of window bugs 2014-05-09 23:10:26 +02:00
ZedThree 93d062704d Add code to handle shortcuts 2014-05-09 23:10:25 +02:00
ZedThree bc413fede9 Add helper function for calling widget events 
Add window_event_helper
 2014-05-09 23:10:13 +02:00
ZedThree b2d1f0dfd6 Add functions for closing top/all window(s) 2014-05-09 22:53:26 +02:00
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
Duncan Frost 0ea838358b Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-09 19:47:54 +01:00
IntelOrca 1bedba626d Merge branch 'atmaxinger-os-specific' 2014-05-09 14:41:02 +01: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 1f6d7353c1 Merge branch 'mzmiric5-master' 2014-05-09 14:37:40 +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 6eb635fd2b master project files 2014-05-09 10:15:10 +02:00
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