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

5611 Commits

Author SHA1 Message Date
Michał Janiszewski f502b5ec1b Provide explicit option for static linkage 
This solves woes of missing libraries on some systems by providing
user-accessible option to control static linkage.
 2015-12-28 02:27:49 +01:00
Michał Janiszewski 6a5fc90cd4 Fix CMakeLists for MinGW cross-compilation 
This makes sure that shared library built with MinGW toolchain is linked
statically to *all* its dependencies, including libc, libstdc++, libsdl2
and all the others. This allows producing of working `openrct2.dll` by
cross-compiling.

I hit a bug with libcrypto, a dependency of libssl, which in turn is a
dependency of curl, which creates a `DllMain` entrypoint for static lib
too, but since we don't do anything in ours, this should be safe.

I have only had chance to try it out when cross-compiling, ideally it
should be tested under Cygwin/MSYS too, but it is too bothersome to
setup for me.
 2015-12-28 01:17:28 +01:00
Ted John 568dcf07f1 Merge pull request #1882 from LRFLEW/issue-1873 
Disable chain button on steep slopes that cannot have one
 2015-12-28 00:07:51 +00:00
LRFLEW 50a1f588ec Disable chain button on steep slopes that cannot have one 2015-12-27 17:31:43 -06:00
Ted John 2ce0f8ed4a Merge pull request #2569 from atmaxinger/develop 
Fix Xcode project
 2015-12-27 23:27:58 +00:00
Maximilian Irlinger 0e76ff3d97 Copy Resources after Build g2.dat 
Fix Xcode project

The build phase „Build g2.dat“ needs to be after „Embed Frameworks“ or
else the process will fail.

Fix Xcode project

The build phase „Build g2.dat“ needs to be after „Embed Frameworks“ or
else the process will fail.

Copy Resources after Build g2.dat

Update project.pbxproj
 2015-12-28 00:26:10 +01:00
Ted John c4dcd7d3fe Merge pull request #2570 from HaasJona/fixrefactor 
Fix memset
 2015-12-27 20:22:12 +00:00
Ted John 7b1fabc80c Merge pull request #2571 from janisozaur/fonts-xp 
Fix XP compatibility after #2546
 2015-12-27 20:15:15 +00:00
Michał Janiszewski 184b375dcb Fix XP compatibility after #2546 
8bdec9f68 (#2546) introduced call to SHGetKnownFolderPath which is only
available on Vista and later operating systems, but eda733165 restored
previous hard-coded functionality for MinGW. Use the same for XP
support.

According to
https://tedwvc.wordpress.com/2014/01/01/how-to-target-xp-with-vc2012-or-vc2013-and-continue-to-use-the-windows-8-x-sdk/
it should work.
 2015-12-27 20:34:04 +01:00
Jonathan Haas dfd6cfef87 Fix incorrect memset 2015-12-27 20:33:04 +01:00
Duncan 1c41b513b4 Merge pull request #2561 from HaasJona/refactor 
Refactor Ride Customer History
 2015-12-27 17:52:52 +00:00
Jonathan Haas cf67177a08 Extract ride data array, use memset for zeroing array 2015-12-27 18:42:32 +01:00
Ted John 6866c8839a Merge pull request #2566 from JarnoVgr/installerfix 
Added missing files to publish process
 2015-12-27 15:49:44 +00:00
Jarno Veuger db425bc0bd Added missing files to publish process 2015-12-27 16:48:19 +01:00
Ted John ce0442f4a2 Merge pull request #2559 from janisozaur/map-assert 
Add mapElementType entry for corrupt element
 2015-12-27 15:47:21 +00:00
Jonathan Haas bb01732f74 Fix indentation 2015-12-27 13:06:18 +01:00
Ted John 388ee91995 Merge pull request #2508 from Gymnasiast/fix-loadsave-sort-on-open 
Sort load/save window on open, fixes #2477
 2015-12-27 11:16:26 +00:00
Jonathan Haas cf78b28adf Use memmove for shifting 
Use memmove for shifting the customer history, rename ride fields, and add back the offset comments.
 2015-12-27 10:45:11 +01:00
Michał Janiszewski e3f5ea25ae Map unknown elem type to corrupt, update tile inspector 
In map view, all unknown types are mapped to MAP_ELEMENT_TYPE_CORRUPT,
the type that prevents rendering of all following elements on given
tile.

Tile inspector now displays element type (numeric value) for unknown
types.
 2015-12-27 10:34:02 +01:00
Gymnasiast f87bdb0eda Sort load/save window on open, fixes #2477 2015-12-27 10:28:10 +01:00
Duncan 2120933bcf Merge pull request #2563 from LRFLEW/xcode-add-news-options 
Added windows/news_options.c to Xcode project
 2015-12-27 09:01:08 +00:00
Ted John 5cf31b8de4 Merge Localisation/master into OpenRCT2/develop. 2015-12-27 04:00:16 +00:00
LRFLEW 7c5a6909ff Added windows/news_options.c to Xcode project 2015-12-26 20:16:53 -06:00
Ted John cbca0849d7 Merge pull request #2562 from Aroidzap/bugfix-StartResolution 
fixed bug in "Fix #2158"
 2015-12-26 23:13:29 +00:00
Tomáš Pazdiora 6ac38a6382 fixed bug in "Fix #2158" 
which caused (if fullscreen was set) starting game in desktop resolution instead of selected fullscreen resolution.
 2015-12-26 23:48:05 +01:00
Jonathan Haas b71c649d45 Refactor ride customer count 
Renamed some confusing ride fields, extracted function to get recent ride customer count.
 2015-12-26 22:03:33 +01:00
Ted John a84f04b541 Merge pull request #2549 from OpenRCT2/notification-settings 
Notification settings
 2015-12-26 17:40:38 +00:00
IntelOrca 56c2120f83 update changelog with notification feature 2015-12-26 17:35:22 +00:00
IntelOrca 2dfc43b8e8 close #2382: Don't suppress drown messages in Six Flags scenarios 2015-12-26 17:34:14 +00:00
IntelOrca 574774b2af add notification conditions 2015-12-26 17:33:33 +00:00
IntelOrca cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca 3b5768f5bc print '(debug)' to version string when build in debug configuration 2015-12-26 17:23:27 +00:00
IntelOrca 6240f063f1 fix a couple of sprite ID definitions 2015-12-26 17:19:25 +00:00
IntelOrca 4eb8192549 replace tutorial button with new multiplayer button 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
 2015-12-26 17:09:37 +00:00
Ted John 42292ea218 Merge pull request #2560 from HaasJona/stings 
New StringIds and condition fix.
 2015-12-26 16:40:09 +00:00
Jonathan Haas 2ed4802032 Fix and replace some StringIDs 
Create some additional named StringIDs.
Fix a broken condition for tracked peep notifications, as the in/on ride messages were reversed.
 2015-12-26 14:50:03 +01:00
Michał Janiszewski 53970c2d77 Add tile type for corrupt element 
Fixes #2558
 2015-12-26 13:36:32 +01:00
Michał Janiszewski 79e5bb758d Add an assert for getting proper mapElementType 2015-12-26 13:16:03 +01:00
Ted John de52321026 Merge pull request #2557 from janisozaur/max-path 
Use MAX_PATH define for path length, remove redefinition
 2015-12-26 10:54:19 +00:00
Ted John 34ab8c0d62 Merge pull request #2546 from AaronVanGeffen/fontdirs 
Proper font support for Linux and OS X
 2015-12-26 10:48:47 +00:00
Ted John 164b44fa6a Merge pull request #2556 from AaronVanGeffen/minor_refactor 
Refactoring: replace several magic numbers with named equivalents
 2015-12-26 10:28:08 +00:00
Michał Janiszewski 6d5c96d083 Use MAX_PATH define for path length, remove redefinition 2015-12-26 11:18:44 +01:00
Aaron van Geffen 3d99b73ae1 Name enabled widgets on scenario select screen. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 020334fa18 Name rct_window's var_494: highlighted_item. 2015-12-26 18:46:19 +09:00
Aaron van Geffen 9232a9906f Inventarised instances of RCT2_ADDRESS_COMMON_FORMAT_ARGS 2015-12-26 18:24:36 +09:00
Aaron van Geffen f44ee1ec04 Merge pull request #2 from janisozaur/fontconfig-memleak 
Fix memory leaks in font selection for Linux
 2015-12-26 15:05:14 +09:00
Ted John 799d377d90 Merge Localisation/master into OpenRCT2/develop. 2015-12-26 04:00:18 +00:00
Ted John 8ce98dc8c5 Merge pull request #2555 from JarnoVgr/distribution 
Publisher script improvements (installer)
 2015-12-25 23:46:04 +00:00
Michał Janiszewski c0830ae02e Fix memory leaks in font selection for Linux 
Add some logging too, in particular warning when no font was found.
 2015-12-25 20:32:54 +01:00
Aaron van Geffen eda733165e Added a hack for MINGW compatibility. 2015-12-26 01:00:34 +09:00