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

6199 Commits

Author SHA1 Message Date
Ted John d621fafb3e Merge pull request #2795 from AaronVanGeffen/invalidate_ride_window 
Repopulate ride list when invalidating the ride construction window
 2016-01-23 14:51:48 +00:00
Aaron van Geffen 18a8ef0924 Repopulate ride list when invalidating the ride construction window. 
When toggling the 'select by track type' option with the ride construction window open,
the ride list would not be repopulated until the player switched tabs. This commit
adds repopulation on window invalidation, too.
 2016-01-23 23:43:13 +09:00
IntelOrca 62eeaaf405 fix severe regression from #2787, use object entry array instead of ride entry array 2016-01-23 12:47:04 +00:00
duncanspumpkin a4ccea81e9 Fix issue with curved track. Use new getter functions. 
Also fixed an issue with cable lifts spamming the log
 2016-01-23 08:07:50 +00:00
duncanspumpkin a04417f61d Fix bugs in create vehicles 2016-01-23 07:23:07 +00:00
duncanspumpkin 8316e7e1a4 Fix merge mistakes 2016-01-23 07:23:06 +00:00
IntelOrca 554567d012 implement ride_create_vehicles 2016-01-23 07:23:05 +00:00
Duncan 660eca56b2 Merge pull request #2791 from LRFLEW/develop 
Fixed Uploading Builds
 2016-01-23 06:49:48 +00:00
OpenRCT2 git bot 1b2edef980 Merge Localisation/master into OpenRCT2/develop. 2016-01-23 04:00:13 +00:00
LRFLEW d585f85267 Fixed Uploading Builds 2016-01-22 19:21:45 -07:00
Ted John 8ad5827c57 Merge pull request #2789 from LRFLEW/develop 
(Temp) Fix Travis OS X Build
 2016-01-23 01:17:09 +00:00
LRFLEW 394c0423f6 (Temp) Fix Travis OS X Build 2016-01-22 18:09:07 -07:00
Ted John 729e9f0481 Merge pull request #2787 from janisozaur/ride-refactor 
Refactor rides to be only accessible with getters
 2016-01-23 00:25:26 +00:00
IntelOrca d81fd0c4ea fix #2786: use gfx_draw_string_centred_wrapped which centres line by line 2016-01-23 00:24:02 +00:00
zsilencer 6d81369e1a fix issue with same price throughout park 2016-01-22 17:19:15 -07:00
Michał Janiszewski 6d6f9f3c23 Refactor rides to be only accessible with getters 
This changes how rides are accessed from macros to getter functions.
 2016-01-23 01:13:36 +01:00
zsilencer 62c1780d65 fix couple other issues mentioned in pull request 2016-01-22 17:08:06 -07:00
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
zsilencer c557f02f4b fix issue with incorrect game_command_playerid 2016-01-22 16:57:00 -07:00
LRFLEW 58d258038f Improve security on OSX and Linux 2016-01-22 16:44:08 -07:00
Yaroslav Tretyakov 5db2a37194 Merge pull request #1 from LRFLEW/multiplayer 
Added #2783 files to Xcode
 2016-01-22 16:10:31 -07:00
LRFLEW cfc3ec552c Added #2783 files to Xcode 2016-01-22 15:57:50 -07:00
zsilencer 1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer 7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -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
zsilencer 6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07: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