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

4426 Commits

Author SHA1 Message Date
Marijn van der Werf 6eadf824ea Replace raw addresses of `RIDE_ENTRIES` 2016-01-11 13:34:08 +01:00
Ted John 9c648e01bc Merge pull request #2696 from marijnvdwerf/common-format-args 
Replace RCT2_ADDRESS_COMMON_FORMAT_ARGS magic numbers with constant
 2016-01-11 12:18:36 +00:00
Marijn van der Werf 64646a501a Add missing brackets 2016-01-11 13:00:40 +01:00
Marijn van der Werf e961cc885a Use RCT2_ADDRESS_COMMON_FORMAT_ARGS instead of raw address 2016-01-11 12:55:33 +01:00
IntelOrca 1710a10493 fix mistake in command line example 2016-01-11 00:00:12 +00:00
Ted John 1b62f22bde Merge pull request #2690 from janisozaur/debian 
Support for debian packaging.
 2016-01-10 23:46:37 +00:00
Ruben De Smet c675993d3f Fix a bug where some paths get truncated on posix. 
Especially when editing the title screen on.
 2016-01-10 23:55:56 +01:00
LRFLEW 7956922f26 Fixed branch new-argparse compilation on OS X 2016-01-10 22:50:53 +00:00
IntelOrca c7feb72a69 move compiler normalisation to rct2.h 2016-01-10 22:50:35 +00:00
IntelOrca 5a1a531d60 fix running without arguments 2016-01-10 22:50:34 +00:00
IntelOrca 6774412bce use _stricmp instead of _strcmpi 2016-01-10 22:50:33 +00:00
IntelOrca e79edcb1d6 fix posix.c headers 2016-01-10 22:50:32 +00:00
IntelOrca e9d222fdd3 new-argparse: finish new argparse integration and clean up 2016-01-10 22:50:31 +00:00
IntelOrca 3f0073f29c new-argparse: implement most of the root commands, fix issues 2016-01-10 22:50:30 +00:00
IntelOrca 9d98147b75 new-argparse: implement argument and option parsing 2016-01-10 22:50:29 +00:00
IntelOrca 14a266c177 new-argparse: add basic definitions and help display 2016-01-10 22:50:28 +00:00
Duncan 8997f2aa6a Merge pull request #2605 from OpenRCT2/vehicle-update 
Vehicle Update
 2016-01-10 17:13:02 +00:00
Duncan 052254ca1f Merge pull request #2640 from janisozaur/exit-fix 
Fix for missing exit
 2016-01-10 10:08:22 +00:00
LRFLEW 072bb52e42 Implemented sub_69A5F0 2016-01-10 02:28:20 -07:00
duncanspumpkin b16337a035 Refactor to remove all remaining warnings and remove redundant comments 2016-01-10 09:24:56 +00:00
duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update 
Conflicts:
 openrct2.vcxproj
 2016-01-10 08:57:41 +00:00
LRFLEW 3f714750ee Fixed first-launch "crash" issue on OS X 2016-01-09 18:29:20 -07:00
Ted John 9610ce4427 Merge pull request #2675 from Gymnasiast/fix-requires-expansion-pack 
Show names of missing expansion packs; cleanup
 2016-01-10 00:35:00 +00:00
Ted John 0dc219bc45 Merge pull request #2668 from Broxzier/staff_list 
Consistent usage of FOR_EACH_* macros, and moving buttons on the right when resizing.
 2016-01-10 00:31:36 +00:00
Ted John 9bb6aba2b3 Merge pull request #2682 from Gymnasiast/clear-scenery-zc 
Don't remove walls when raising/lowering land/water, fixes #2681
 2016-01-09 22:58:41 +00:00
Gymnasiast 03c35ab0b6 Don't remove walls when raising/lowering land/water, fixes #2681 2016-01-09 23:46:08 +01:00
IntelOrca 5796cf3053 use native line endings for config.ini and themes, closes #2678 2016-01-09 22:43:12 +00:00
Gymnasiast 24448f2734 Show names of missing expansion packs and use localised names; cleanup 2016-01-09 22:55:10 +01:00
IntelOrca 5fbd17293a fix argparse warnings 2016-01-09 21:50:08 +00:00
IntelOrca 00f0f06e83 update VS project to use new dependencies 2016-01-09 21:50:03 +00:00
IntelOrca 25237bf810 fix #2679: game_command_set_ride_appearance did not work correctly for non-apply flag 2016-01-09 21:15:51 +00:00
Hielke Morsink 39ae12eeb1 Using window width and height to define locations 2016-01-09 19:27:04 +01:00
Hielke Morsink e4d3c546ad Moving staff costs along with the hire button 2016-01-09 19:26:13 +01:00
Hielke Morsink 19ddbaa84f Buttons on the right move when scaling the window. 2016-01-09 19:26:12 +01:00
Hielke Morsink f9dc3f3454 replace FOR_ALL_PEEPS with FOR_ALL_STAFF 2016-01-09 19:26:11 +01:00
duncanspumpkin 268e2d34ce Merge branch 'develop' into vehicle-update 
Conflicts:
 object.c
 2016-01-09 16:51:23 +00:00
duncanspumpkin 326c1f276a Fix fixed broken restraints causing the train to get stuck in a loop 2016-01-09 16:17:04 +00:00
duncanspumpkin 8e0413bd2f Fix mechanics not being called to broken down rides 2016-01-09 15:57:55 +00:00
IntelOrca 635fae15da move assertion outside of loop, rowBytes does not change 2016-01-09 15:17:02 +00:00
IntelOrca f84c659010 fix #2670: title was not being loaded when a scenario failed to load 2016-01-09 15:11:12 +00:00
IntelOrca 19c38e0b34 move RCT2 paths to C file and remove file integrity checking 2016-01-09 00:34:34 +00:00
IntelOrca 3073bc64fd remove rct2_endupdate 2016-01-09 00:25:30 +00:00
Michał Janiszewski 687bac4699 Specify C linkage for log functions 2016-01-08 22:20:37 +01:00
IntelOrca 15bc414581 add stopwatch class for profiling 2016-01-08 20:50:23 +00:00
IntelOrca 0012470504 change last two rct_realloc to realloc 2016-01-08 19:04:38 +00:00
Ted John a83807d58e Merge pull request #2665 from janisozaur/font-outline 
shadows for fonts
 2016-01-08 18:07:33 +00:00
IntelOrca 17c01a36a7 don't paint track of an invalid ride, should help reduce crashes 2016-01-07 23:16:17 +00:00
IntelOrca 43a5cc92cc define STR_NONE as a rct_string_id 2016-01-07 22:14:53 +00:00
IntelOrca 5e071ed032 change more rct2_malloc / rct_free to malloc / free 2016-01-07 22:10:08 +00:00
IntelOrca 053f4f4f38 fix object list memory error, rct2_malloc being used instead of malloc 2016-01-07 22:10:07 +00:00
Michał Janiszewski abf0801725 Fix erroneous address 2016-01-07 21:26:38 +01:00
IntelOrca 8f4c8006b5 Merge branch 'refactor-object-paint' into develop 2016-01-07 19:24:36 +00:00
IntelOrca 569026f36b fix #1333: added missing logic from finance_pay_ride_upkeep to make rides safe again 2016-01-07 19:20:11 +00:00
IntelOrca 48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca 40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
Michał Janiszewski 2d82bf344e shadows for fonts 2016-01-07 15:48:52 +01:00
IntelOrca 01c67b6146 refactor object_paint, part 1 2016-01-07 00:34:15 +00:00
IntelOrca ab38828e03 integrate object list variables: 
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
 2016-01-06 20:41:21 +00:00
IntelOrca c0eeefa609 integrate variables: _currentScrollIndex, _currentScrollArea 2016-01-06 18:47:55 +00:00
IntelOrca 29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
Gymnasiast b89025ae62 Improve object loading 2016-01-06 08:58:56 +01:00
IntelOrca 023ac79494 optimise object_calculate_checksum 2016-01-06 00:59:07 +00:00
IntelOrca 2b343838e0 fix scrollbar scrolling 2016-01-05 23:37:57 +00:00
IntelOrca 50eaa99eac fix widget index size & size for consistency 2016-01-05 23:16:09 +00:00
IntelOrca f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca 94ae72f228 integrate variable: gHoverWidget 2016-01-05 22:05:00 +00:00
Ted John 923b3daf40 Merge pull request #2644 from LRFLEW/invalid-entrance-fix 
Resolved leaving guests searching for invalid entrance
 2016-01-05 21:49:17 +00:00
IntelOrca 586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca c181f18309 remove left over RCT2 drag variables 2016-01-05 21:37:15 +00:00
LRFLEW 63ddfa53cd Resolved leaving guests searching for invalid entrance 2016-01-05 14:36:49 -07:00
IntelOrca f5db0a83e5 refactor mouse input queue 2016-01-05 21:20:59 +00:00
IntelOrca e94b7d5338 fix unable to right click to remove scenery 
regression introduced f0adf90660
 2016-01-05 20:53:08 +00:00
IntelOrca ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction 
also fix ride construction window closing immediately after placing first track piece of a ride for clients
 2016-01-05 20:37:21 +00:00
IntelOrca e4c6c79552 fix #2650: validate game commands sent from clients in multiplayer 2016-01-05 18:30:39 +00:00
Ted John f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving 
Prevent extension from showing when "saving as"
 2016-01-05 10:14:20 +00:00
Michał Janiszewski 133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
LRFLEW db76615af0 Fixed typo in viewport_interaction.c 2016-01-05 00:17:10 -07:00
Michał Janiszewski e63f43c337 Fix for missing exit 2016-01-05 08:16:14 +01:00
IntelOrca d842708f90 refactor drag widget in input.c 2016-01-05 00:10:28 +00:00
IntelOrca 88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Hielke Morsink 3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
Michał Janiszewski 9c4cf14069 Game commands hardening 2016-01-04 22:03:28 +01:00
IntelOrca 3b4928c041 fix windows file enumerate pattern matching 2016-01-04 18:29:18 +00:00
Ted John 015c76084e Merge pull request #2616 from atmaxinger/autosave-timestamp 
Append timestamp to autosave
 2016-01-04 17:54:11 +00:00
Maximilian Irlinger a0bb568889 Append timestamp to autosave 2016-01-04 16:22:15 +01:00
duncanspumpkin d5bce19af1 Fix race car mode collisions 2016-01-04 10:06:26 +00:00
duncanspumpkin ccc7b1f228 Refactor var_4C into seperate variables 2016-01-04 09:36:29 +00:00
duncanspumpkin 5e6befe20b Fix 3D films only lasting 1 ticks time 2016-01-04 09:11:36 +00:00
IntelOrca b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
Michał Janiszewski b45ca38d52 UTC epoch time for POSIX 2016-01-03 21:41:21 +01:00
duncanspumpkin 3d2a456481 Rework logic to make flow clearer. Fix issue with invalid direction. Fix small logic mistake. 2016-01-03 11:10:02 +00:00
IntelOrca 99e0d999b2 add timestamp to highscores.dat 2016-01-03 01:48:52 +00:00
Michał Janiszewski 2b1b0f76f3 Whitespace fixes. 
This is just whitespace fixup for all files affected in vehcile-update
branch.
 2016-01-03 00:59:10 +01:00
IntelOrca 9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca 9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca a4e919b023 fix scenario sorting for real and other parks 2016-01-02 21:06:01 +00:00