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

5862 Commits

Author SHA1 Message Date
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
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
Ted John 8a575a945d Merge pull request #2669 from janisozaur/osx-travis 
OS X job for Travis CI
 2016-01-08 16:31:54 +00:00
Michał Janiszewski 7520bde6d3 Add support for OS X 10.10 in Travis CI builds 
This downloads OS X 10.10 SDK, installs it and uses for compilation.

According to https://www.gosquared.com/global/mac/el-capitan/, current
market share among OS X versions is:
* 10.11 — 41.53%
* 10.10 — 38.65%
* 10.9  — 14.72%
* 10.8  — 5.60%
* 10.7  — 5.62%

I tried adding 10.9 SDK, but it fails to compile. With this change, we
should cover around 80% of OS X users.
 2016-01-08 15:01:02 +01:00
Michał Janiszewski 683033d3f2 OS X job for Travis CI 
This adds automated builds for OS X to our CI infrastructure.

XCode's `xcodebuild` tool is quite spammy by default, so I used a
prettifier for its output. Since this could potentially cover errors
from XCode due to piping of commands, I enabled `pipefail` option which
would cause all of pipe construct fail, should any of its commands exit
with non-zero code.

The created app bundle is packaged into dmg and uploaded to transfer.sh,
if the build was successful. To the best of my knowledge, this is *the*
way of packaging and distributing OS X applications.
 2016-01-08 11:45:12 +01: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
Ted John 474d6757e3 Merge pull request #2666 from janisozaur/address-fix 
Fix erroneous address
 2016-01-07 20:31:35 +00:00