Commit Graph

6025 Commits

Author SHA1 Message Date
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
Duncan b6f921ccda Merge pull request #2673 from LRFLEW/sub_69A5F0
Implemented sub_69A5F0
2016-01-10 10:06:34 +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
Ted John aa908012b2 Merge pull request #2684 from LRFLEW/psn-osx-fix
Fixed first-launch "crash" issue on OS X
2016-01-10 01:45:59 +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 7a12599f8c Merge pull request #2683 from LRFLEW/vehicle-update
Added ride/cable_lift.c to Xcode project
2016-01-09 23:00:24 +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
LRFLEW 8e74815200 Added ride/cable_lift.c to Xcode project 2016-01-09 15:58:25 -07:00
IntelOrca 3f70a3f4f0 update distributed readme.txt 2016-01-09 22:57:16 +00:00
Gymnasiast 03c35ab0b6 Don't remove walls when raising/lowering land/water, fixes #2681 2016-01-09 23:46:08 +01:00
IntelOrca 1d1599fd56 remove SDL2.dll 2016-01-09 22:44:07 +00:00
IntelOrca 5796cf3053 use native line endings for config.ini and themes, closes #2678 2016-01-09 22:43:12 +00:00
Ted John 4425693ba2 Merge pull request #2676 from OpenRCT2/new-vs-sdk
Update VS dependencies
2016-01-09 22:40:36 +00:00
Gymnasiast 24448f2734 Show names of missing expansion packs and use localised names; cleanup 2016-01-09 22:55:10 +01:00
Michał Janiszewski 59ad01db59 Stop downloading libs when targetting linux native
All the things required are either available as a package or in the main
repo.
2016-01-09 21:50:09 +00:00
IntelOrca 5fbd17293a fix argparse warnings 2016-01-09 21:50:08 +00:00
Michał Janiszewski e7ea6381cc Drop support for lodepng
All platforms can now use libpng 1.6
2016-01-09 21:50:08 +00:00
Michał Janiszewski ed8ac6f1cd Update CMakeLists.txt with new argparse location
Argparse library got merged into main repository, there's no need to
call out to it now.
2016-01-09 21:50:07 +00:00
Michał Janiszewski d29faf25c4 Remove tests
Tests were quite old, used very simple framework which did not allow
much fidelity and were probably never executed.
2016-01-09 21:50:06 +00:00
IntelOrca c7128a95ed remove libs VS project 2016-01-09 21:50:06 +00:00
IntelOrca 27c8cf126f update build / publish scripts for new VS dependencies 2016-01-09 21:50:05 +00:00
IntelOrca df279b178b clean up VS solution and project 2016-01-09 21:50:04 +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
Ted John 842484eff5 Merge pull request #2672 from LRFLEW/xcode-noloadpng
Removed loadpng from Xcode project to prevent building it
2016-01-09 14:55:54 +00:00
LRFLEW 106cf8d501 Removed loadpng from Xcode project to prevent building it 2016-01-08 23:40:14 -07: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
Ted John 20697ac2bc Merge pull request #2671 from janisozaur/extern-c
Specify C linkage for log functions
2016-01-08 22:16:31 +00:00