Miso Zmiric (Mike Squinter)
5522eedac2
make the main schema shared, allow for archive and export of Release app on build servers
2015-12-31 00:26:22 +01:00
Ted John
087b03c5bb
Merge pull request #2600 from LRFLEW/develop
...
Change SHA hashes for orctlibs-osx.zip
2015-12-30 22:11:56 +00:00
LRFLEW
ccd5329d4e
Change SHA hashes for orctlibs-osx.zip
2015-12-30 16:08:53 -06:00
Ted John
f32e89a6db
Merge pull request #2599 from LRFLEW/develop
...
Switched to libpng in the Xcode project
2015-12-30 20:41:36 +00:00
LRFLEW
97a1809fca
Switched to libpng with Xcode
2015-12-30 14:23:27 -06:00
Ted John
067858e969
Merge pull request #2598 from LRFLEW/develop
...
Added image_io.c and image_io.h to Xcode Project
2015-12-30 19:57:37 +00:00
LRFLEW
dd7b111391
Added image_io.c to Xcode
2015-12-30 13:38:36 -06:00
Duncan
9884ad416e
Merge pull request #2593 from xiane/develop
...
Applied enum value to ride type flags.
2015-12-30 18:54:23 +00:00
Ted John
48afb33af6
Merge pull request #2597 from ecnepsnai/develop
...
Fix #2550 Program crashes when executing "exit" command from the console
2015-12-30 18:35:20 +00:00
Ian Spence
ae7da3e830
Fix #2550 Program crashes when executing "exit" command from the console
...
- exit and quit commands are aliased to "hide"
- value of the command was being set to a constant value and could not be freed
- updated command value to use a freeable value
2015-12-30 08:57:43 -08:00
Ted John
edaec24228
Merge pull request #2582 from OpenRCT2/use-libpng
...
Use libpng instead of lodepng
2015-12-30 13:39:34 +00:00
Michał Janiszewski
83a1b36088
Update mingw libs with libpng16
2015-12-30 13:36:16 +00:00
Michał Janiszewski
94a3ccdab5
Detect libpng>=1.6 and fall back to lodepng
2015-12-30 13:36:15 +00:00
IntelOrca
68a600f679
finish converting last lodepng calls to libpng
2015-12-30 13:36:14 +00:00
IntelOrca
cabd0fdc3a
use image_io_png_write in cmdline_sprite
2015-12-30 13:36:14 +00:00
IntelOrca
00e5c4418d
refactor image IO to new source file
2015-12-30 13:36:09 +00:00
Michał Janiszewski
9321c53b87
Enable libpng on Linux builds
...
Lodepng is still available.
2015-12-30 13:34:51 +00:00
IntelOrca
8ae43fd0ff
use libpng for screenshots
2015-12-30 13:34:51 +00:00
IntelOrca
652e9f6829
update VS project and filters
2015-12-30 13:20:28 +00:00
sangch.go
fce5eab9d8
Refactored code. bugfix and more define.
2015-12-30 17:13:00 +09:00
sangch.go
94d5eb86c8
Applied enum value to ride type flags.
2015-12-30 13:56:56 +09:00
Ted John
604e516d5b
Merge pull request #2584 from janisozaur/util-fix
...
Fix warnings
2015-12-29 15:16:58 +00:00
Michał Janiszewski
36de7a9027
Fix warnings
...
Some off-by-one errors, truncation warning fix, main() in posix.c no
longer a stub.
2015-12-29 16:09:36 +01:00
IntelOrca
64b589770a
remove obsolete callprocs
2015-12-29 11:57:47 +00:00
IntelOrca
c6b023df86
fix warnings
2015-12-29 11:39:06 +00:00
Ted John
69f0e9d55d
Merge pull request #2398 from Broxzier/comments_and_optimizations
...
Refactored some util functions and some minor tweaks for saving tracks
2015-12-29 11:31:58 +00:00
Ted John
27819ed9e2
Merge pull request #2580 from janisozaur/mapgen-fixes
...
Minor fixes for mapgen
2015-12-29 11:31:37 +00:00
Michał Janiszewski
bcfdbbd25b
Minor fixes for mapgen
2015-12-29 12:03:38 +01:00
Ted John
4e465edeea
Merge Localisation/master into OpenRCT2/develop.
2015-12-29 04:00:18 +00:00
IntelOrca
292ce3b103
don't show IP address when hovering over servers for basic security
2015-12-29 01:01:26 +00:00
IntelOrca
43b31c25a1
use sprite constants for tab animations
2015-12-28 19:44:43 +00:00
IntelOrca
08d47e26a7
improve player list
...
- animate tab
- show number of players
2015-12-28 19:44:43 +00:00
Ted John
f83d60e30d
Merge pull request #2573 from janisozaur/cmake-mingw
...
Fix CMakeLists for MinGW cross-compilation
2015-12-28 19:01:30 +00:00
IntelOrca
1a5c5a5017
fix #2577 : interest rate can be set to -1 and no protection from erroneous values
2015-12-28 18:43:11 +00:00
Michał Janiszewski
c293572d3f
Add SSL dependency from curl
2015-12-28 10:54:06 +01:00
Michał Janiszewski
8ebc3e7f85
Modify CMakeLists to enable STATIC support on Linux
...
This enables compilation with `-DSTATIC=ON` for native Linux builds.
Do note that Linux systems rarely come with static libraries, so it may
not be a popular option.
2015-12-28 10:10:13 +01:00
Ted John
38edde37c0
Merge Localisation/master into OpenRCT2/develop.
2015-12-28 04:00:18 +00:00
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