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

10809 Commits

Author SHA1 Message Date
Michael Steenbeek 528843184c Fix RCT1 research import, fixes #5014 2017-02-05 20:54:01 +01:00
Michael Steenbeek f0f26ee297 Fix one failing testpaint test 2017-02-05 12:41:37 +00:00
OpenRCT2 git bot 0b4aa0d771 Merge Localisation/master into OpenRCT2/develop. 2017-02-05 04:00:18 +00:00
Ted John 652cad15c4 Refactor memory stream 
Clean up a few things.
 2017-02-05 02:40:16 +00:00
Ted John b21378b7f5 Fix #4689: Object selection tabs sometimes flicker 
8466de7cbf only reset w->frame on object type tabs. This also does it does it for the ride type filter tabs.
 2017-02-04 11:31:07 +00:00
Ted John 94bde929e7 Fix nullptr access when removing banners 2017-02-04 11:24:20 +00:00
Duncan b1ffe19a74 Merge pull request #5172 from duncanspumpkin/refactor 
Flags Refactor
 2017-02-04 11:12:35 +00:00
Ted John 601a8e633c Fix #5171: Latest build doesn't allow server connection 
Network park streams do not have checksums so do not try to validate.
 2017-02-04 11:05:25 +00:00
duncanspumpkin fef7445f0c Use flags where known. Refactor large 3d signs slightly 2017-02-04 08:12:44 +00:00
Ted John afc8943e34 Fix #5169: Parks containing packed objects fail to open 
Regression from 3b02b05dc6. Forgot to implement reading packed objects with IStream.
 2017-02-04 00:34:14 +00:00
Ted John 3b02b05dc6 Merge pull request #5151 from IntelOrca/refactor/park-import 
Refactor / park import
 2017-02-03 17:44:44 +00:00
danidoedel e5fbf5bfe4 Update Xcode project 2017-02-03 12:32:07 +00:00
Ted John 44120b2e7e Fix build issues 2017-02-02 22:00:01 +00:00
Ted John bb62bbebb3 Re-introduce checksum validation 2017-02-02 22:00:01 +00:00
Ted John fed4c248e3 Remove use of SDL RWOps from title sequence player 2017-02-02 22:00:01 +00:00
Ted John 5d7a712672 Use new S6 importer for title screen and fix issues 2017-02-02 22:00:01 +00:00
Ted John 8998b2ae18 Refactor S6 importer to use IParkImporter interface 2017-02-02 22:00:01 +00:00
Ted John 5c1f2f4c43 Replace IS4Importer with IParkImporter 2017-02-02 22:00:01 +00:00
Ted John 2b045ddb9b Use streams for reading parks in S4 importer 2017-02-02 22:00:01 +00:00
Ted John f30a3b315c Add common load method for S4 importer 2017-02-02 22:00:01 +00:00
Michał Janiszewski 04a2734593 Merge pull request #5162 from duncanspumpkin/refactor 
Small refactor of world files
 2017-02-02 22:53:37 +01:00
Michał Janiszewski 6ac6b272c4 Bump network version 2017-02-02 22:46:37 +01:00
Ted John 676903e65c Reduce false positive desync 
The staff list window modifies the sprites purely for local state causing a false positive desync warning to pop up in multiplayer. This now causes it to only happen if the map window is also open. This is also a performance improvement.

#5164
 2017-02-02 21:31:36 +00:00
Michael Steenbeek 695f7c33bf Fix all known incorrect land ownership in RCT1 2017-02-02 22:21:05 +01:00
Michael Steenbeek cad39c788a Remove more magic values from metal_a_supports_paint_setup 2017-02-02 21:54:19 +01:00
duncanspumpkin e384b9a508 Label known offsets and flags of wall/fence 2017-02-02 18:52:35 +00:00
duncanspumpkin e1ea820111 Remove unnecessery read. Add offsets 2017-02-02 18:20:16 +00:00
duncanspumpkin 6a9cddf2d8 Label water object offsets 2017-02-02 18:13:51 +00:00
duncanspumpkin e749285e48 Label PARK_FLAGS_18 and adjust SCENARIO_NO_MONEY comment 2017-02-02 17:59:23 +00:00
Gymnasiast 2381bd5cfb Fix RCT1 Splash Boats import 2017-02-02 15:47:08 +01:00
Ted John 5d20803fb2 Remove version build from msbuild & NSIS (#5143) 
This also passes the version to NSIS removing another file containing the current version.
 2017-02-02 11:53:56 +01:00
OpenRCT2 git bot ae2e0faad0 Merge Localisation/master into OpenRCT2/develop. 2017-02-02 04:00:23 +00:00
Michael Steenbeek eb45ec95ce Merge pull request #5145 from IntelOrca/feature/rct1-scenario-select 
Enable RCT1 SC4s for scenario select
 2017-02-01 18:32:45 +01:00
danidoedel 0a2b63eced Update Xcode project 2017-02-01 11:32:49 +00:00
OpenRCT2 git bot 457d3db612 Merge Localisation/master into OpenRCT2/develop. 2017-02-01 04:00:20 +00:00
Ted John 1625a2434f Update changelog 
[ci skip]
 2017-01-31 20:34:33 +00:00
muemart a64dae573a Fix data path command line on windows 2017-01-31 19:41:26 +00:00
Ted John 72800acd5c Fix std::string used as char * 2017-01-31 17:59:42 +00:00
Ted John 4670d2f770 Fix some SC enum items missing prefix 2017-01-31 17:57:10 +00:00
Ted John 612e268e5f Allow SC4s to be loaded by title seq player 2017-01-31 17:54:39 +00:00
Ted John daaf6c69a3 Use missing SC IDs in scenario sources 2017-01-31 17:54:39 +00:00
Ted John a8e329ef99 Implement getting sc entries from SC4s 2017-01-31 17:54:39 +00:00
Ted John c9d7cd8216 Refactor loading of SC6 information when scanning scenarios 2017-01-31 17:54:39 +00:00
Michael Steenbeek 94d38b9f7a Don't remove vehicles when removing all guests, name some interaction fields 2017-01-30 23:51:01 +01:00
Ted John 2008f4add4 Remove known_issues.txt (#5142) 
This file is out of date and adds extra maintenance to releasing. Instead users should check the project's issue tracker on GitHub.
 2017-01-30 21:45:29 +01:00
spacek531 fbd19db704 Credit spacek531 as author of 0.0.5/0.0.6 title sequence 
[ci skip]
 2017-01-30 21:44:32 +01:00
Michał Janiszewski 39f881e1d7 Update CMakeLists.txt for CPack with 0.0.7 version 2017-01-30 13:54:13 +01:00
Ted John f54e73061a Remove references to stable in readme.md 
[ci skip]
 2017-01-30 00:07:50 +00:00
Michał Janiszewski bde17f2b30 Start v0.0.7 2017-01-29 23:35:17 +00:00
Ted John 0d025fd541 Merge branch 'master' into develop 2017-01-29 23:35:04 +00:00