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

6025 Commits

Author SHA1 Message Date
Ted John f64f258e02 Merge pull request #2788 from LRFLEW/security 
Fixed a theoretical security issue for OS X and Linux
 2016-01-23 00:07:18 +00:00
LRFLEW 58d258038f Improve security on OSX and Linux 2016-01-22 16:44:08 -07:00
IntelOrca 414c97ed8c fix command line parsing of options 2016-01-21 18:18:44 +00:00
IntelOrca e012cd20e9 fix VS errors / warnings 2016-01-21 18:18:20 +00:00
Ted John 4973b54464 Merge pull request #2785 from janisozaur/vs-libs 
Update VS lib version
 2016-01-21 18:08:39 +00:00
Michał Janiszewski 9ada346fc6 Update VS lib version 2016-01-21 14:58:50 +01:00
Ted John ed1ba15163 Merge pull request #2781 from janisozaur/zlib 
Use zlib for muliplayer game transfer
 2016-01-20 23:58:37 +00:00
Michał Janiszewski abe6841e0b Update libraries 2016-01-21 00:01:03 +01:00
janisozaur 1baeff13fc Merge pull request #3 from LRFLEW/zlib 
Updated Xcode project to link against zlib
 2016-01-20 19:31:17 +01:00
LRFLEW 86baebd24b Updated Xcode project to link against zlib 2016-01-20 10:16:24 -07:00
Michał Janiszewski 08fc5f817a Disable using RLE when saving for network 2016-01-20 15:30:59 +01:00
Michał Janiszewski 9afcd15335 Make network use zlib compression for transferring map. 2016-01-20 15:30:59 +01:00
Michał Janiszewski 753d430eaa Add zlib-based compression and decompression 2016-01-20 15:30:59 +01:00
OpenRCT2 git bot d4864108a6 Merge Localisation/master into OpenRCT2/develop. 2016-01-20 04:00:14 +00:00
Ted John 0e96cb53cf Merge pull request #2779 from zsilencer/multiplayer 
small mp fixes
 2016-01-19 20:31:00 +00:00
zsilencer 30d57916c2 fix dropdown menu position in scrolled list 2016-01-19 13:11:16 -07:00
zsilencer 7b280adf8d Fix #2760: Server join click 2016-01-19 12:46:55 -07:00
zsilencer 6a13de29c8 Fix #2591: Close client after loading save 2016-01-19 12:27:43 -07:00
IntelOrca 162710d86a remove strange random game command call from loadsave 2016-01-19 18:04:15 +00:00
IntelOrca 24a796c3bc fix #2778: encode_chunk_repeat reads out of range memory 2016-01-19 17:54:51 +00:00
Ted John 9cf4707f57 Merge pull request #2776 from janisozaur/travis 
Fix travis matrix
 2016-01-19 17:42:41 +00:00
Michał Janiszewski 69ac0b1fee Fix travis matrix 2016-01-19 16:54:13 +01:00
Duncan 64e17cc830 Fix cable lift test reset. 
Code now matches the non cable lift code. Refactor in the future.
 2016-01-19 12:41:20 +00:00
Ted John bcbf375d04 Merge pull request #2753 from janisozaur/travis 
Push travis builds to openrct2.org
 2016-01-19 12:37:22 +00:00
Ted John 5ef00393a4 Merge pull request #2739 from janisozaur/evergreen-gardens 
Assert for evergreen gardens
 2016-01-19 12:36:41 +00:00
Ted John 6412aa5c37 Merge pull request #2772 from Broxzier/fix_mapsprite 
Fix #2747 map sprite issue.
 2016-01-19 00:09:48 +00:00
Hielke Morsink 0b445ab1a5 Fix #2747 map sprite issue. 2016-01-19 00:05:14 +01:00
Ted John 1d2d9ce828 Merge pull request #2729 from janisozaur/fixes 
Minor fixes, mostly posix.c
 2016-01-18 20:02:09 +00:00
Michał Janiszewski 3bf1e0e06d Rename `safe_strncpy` to `safe_strcpy` 2016-01-18 20:49:52 +01:00
Michał Janiszewski 5bc330f8db Minor fixes, mostly posix.c 2016-01-18 20:48:41 +01:00
duncanspumpkin 3d6be6cb2a Fix track breaks when traveling backwards 2016-01-18 19:41:40 +00:00
Duncan 869a47a777 Merge pull request #2764 from LRFLEW/sub_69A997 
Fixed multiple issues with sub_69A997
 2016-01-18 12:38:29 +00:00
Ted John cee61f8929 Merge Localisation/master into OpenRCT2/develop. 2016-01-18 04:00:18 +00:00
LRFLEW c789529be6 Fixed multiple issues with sub_69A997 2016-01-17 19:42:32 -07:00
IntelOrca 1ffee2435a fix #2363: show default item highlight, refactor 2016-01-17 23:37:14 +00:00
IntelOrca f8507ec93e implement place_maze_design 2016-01-17 22:26:15 +00:00
Michał Janiszewski 60ce32bbe0 Make filenames include 8-char git hash and version 2016-01-17 17:25:39 +01:00
Michał Janiszewski 80b85d2d2f Make travis push build artifacts to openrct2.org 2016-01-17 16:51:28 +01:00
Michał Janiszewski b8b50684ba Bump CMakeLists' version to match other places 2016-01-17 16:19:54 +01:00
IntelOrca 0584de1501 fix part of #2747: mistake in map coordinate clamping for set ownership 2016-01-17 12:44:16 +00:00
IntelOrca 7c8245a63f fix #2749: inverse logic for removing colour tab on rides 2016-01-17 12:27:43 +00:00
Ted John 805b0dbb05 Merge Localisation/master into OpenRCT2/develop. 2016-01-17 04:00:18 +00:00
IntelOrca 88ae952db2 implement peep_easter_egg_peep_interactions 2016-01-17 00:57:37 +00:00
IntelOrca f6841bd3dc implement peep_update_name_sort 2016-01-16 22:38:59 +00:00
IntelOrca e57ac72e5a remove redundant peep_update_ride_sub_state callproc 2016-01-16 21:34:23 +00:00
Ted John d0d883904f Merge pull request #2744 from janisozaur/broken-language 
Fall-back to default language in case none is set
 2016-01-16 17:56:02 +00:00
Michał Janiszewski 6d8e048d96 Fall-back to default language in case none is set 
From thread https://openrct2.org/forums/topic/720-openrct2-doesnt-work/,
the object http://www.nedesigns.com/rct2-object/5130/scgletrs/ does not
set `pString` properly, so use a default fallback in such case.
 2016-01-16 18:39:57 +01:00
Michał Janiszewski f35fac6030 Update assert condition 2016-01-16 18:10:44 +01:00
Ted John e75270515c Merge pull request #2743 from Broxzier/disable_debugging_online 
Disabling Debug Button When Playing Over A Network
 2016-01-16 16:48:04 +00:00
Hielke Morsink 711afebf50 Hiding debug button while playing over a network. 2016-01-16 17:24:44 +01:00