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

534 Commits

Author SHA1 Message Date
IntelOrca 99ca1c2b90 Merge branch 'crooked-house-excitement' of https://github.com/kevinburke/OpenRCT2 into kevinburke-crooked-house-excitement 2014-05-24 14:21:08 +01:00
IntelOrca 36e2cce045 add object list load 2014-05-24 01:34:17 +01:00
IntelOrca 075e0619c1 fix filters 2014-05-24 00:00:07 +01:00
IntelOrca 98b01edaaa clean up scenario list 2014-05-23 23:52:13 +01:00
IntelOrca bfb74ec39e add string format and SDL get audio devices 2014-05-23 20:04:42 +01:00
IntelOrca a5eb8b2f0c Merge branch 'anyc-testing' 2014-05-23 14:38:03 +01:00
IntelOrca b2b4647570 Merge branch 'testing' of https://github.com/anyc/OpenRCT2 into anyc-testing 2014-05-23 14:36:51 +01:00
Kevin Burke de3ab24fa1 fix more build errors 2014-05-23 05:37:52 -07:00
anyc 03db2f6106 Readme update and small fix for mingw 2014-05-23 14:29:09 +02:00
Kevin Burke 75f90559a5 Fix build errors. 2014-05-23 05:19:05 -07:00
Kevin Burke a35fc6bdef add new files to sln 2014-05-23 21:18:45 +09:00
Kevin Burke 9592ed0e53 move the last bit of data into a table 2014-05-23 20:57:50 +09:00
IntelOrca 2924c2ed6f Merge branch 'duncanspumpkin-bug_fixes' 2014-05-23 12:16:54 +01:00
IntelOrca 39581f265a Merge branch 'bug_fixes' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-bug_fixes 2014-05-23 12:16:26 +01:00
IntelOrca 01da128c14 add money types 2014-05-23 12:15:08 +01:00
Duncan Frost dc3804bfa2 Fixes one of the issues of #121 but 526 cannot be easily fixed 2014-05-23 11:28:35 +01:00
Duncan Frost f7b8d4567b Fixed #122. Changed config to use better sounding settings. 2014-05-23 11:14:34 +01:00
Kevin Burke e9751e00b6 move some data tables into C 2014-05-23 19:09:16 +09:00
anyc 7811497e8c rudimentary save prompt 2014-05-23 11:31:54 +02:00
Kevin Burke e701209282 clean up upkeep function a little more 2014-05-23 18:26:49 +09:00
Kevin Burke 33e2326070 add data about moving track 2014-05-23 18:14:52 +09:00
Kevin Burke 1d0a24e419 replace on ride photo value with simpler constant 2014-05-23 17:49:42 +09:00
IntelOrca b3c852a074 change exe to console subsystem and print launch info. 2014-05-23 00:53:52 +01:00
Kevin Burke eccb4af048 Add new files to vcxproj, vcxproj +filters 2014-05-23 07:45:19 +09:00
IntelOrca 3de0d80477 Merge branch 'anyc-mingw' 2014-05-22 23:33:23 +01:00
IntelOrca fec1edb51e Merge branch 'mingw' of https://github.com/anyc/OpenRCT2 into anyc-mingw 2014-05-22 23:32:45 +01:00
anyc 932add79e5 bug fixes and more error reporting 2014-05-22 23:47:23 +02:00
anyc 5e4f313471 added cmake build scripts 2014-05-22 23:47:23 +02:00
anyc 7504018373 fix skipping intro 2014-05-22 23:47:23 +02:00
anyc 656a0aafbf check SDL return values 2014-05-22 23:47:23 +02:00
anyc 95a56b1d1e make code compatible with mingw64 2014-05-22 23:47:23 +02:00
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
anyc 872f4521a0 fixed strcat and rct2_startup_checks() 2014-05-22 20:18:42 +02:00
anyc e95e6310dc use SDL_HasMMX() do detect MMX capability 2014-05-22 20:17:13 +02:00
IntelOrca 1a82a2268b Merge branch 'kevinburke-status-comment' 2014-05-22 17:28:18 +01:00
Kevin Burke cf5556d2fe feedback from code review 2014-05-22 21:16:22 +09:00
Kevin Burke 74b41b08ea it is used for upkeep 2014-05-22 09:13:53 +09:00
Kevin Burke 7483ac2307 refactor, fix tabbing 2014-05-22 09:02:55 +09:00
Kevin Burke 2c03908700 revert change in config.c 2014-05-22 08:59:58 +09:00
Kevin Burke cd414e98f6 minor changes to get it to compile 2014-05-21 09:06:38 -07:00
Kevin Burke c374536cbb more work on crooked house 2014-05-22 01:00:58 +09:00
Kevin Burke 5fbe85aded WIP: add ratings for crooked house 2014-05-21 23:27:31 +09:00
Kevin Burke 2d08752a04 comment ride status 2014-05-21 11:59:05 +09:00
anyc e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
IntelOrca bab6e9a290 Merge branch 'duncanspumpkin-c_based_window_event_handlers' 2014-05-20 03:18:50 +01:00
IntelOrca 5823e9dac1 Merge branch 'c_based_window_event_handlers' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-c_based_window_event_handlers 2014-05-20 03:18:18 +01:00
IntelOrca e13f0e0ed3 Merge branch 'MaciekBaron-master' 2014-05-20 03:17:39 +01:00
IntelOrca 827537945b Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-20 03:17:10 +01:00
IntelOrca 7304a96d63 Merge branch 'ddevrien-map-window' 2014-05-20 03:16:18 +01:00