mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,867 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

10867 Commits

Author SHA1 Message Date
Michał Janiszewski 3f8f513a47 Verify access to RCT1 fields 2017-01-07 11:19:04 +00:00
Lastorder 84d2f6c4c7 Fix #5010 windows builds not pushed 
windows builds not pushed to openrct2.org due to invalid condition
 2017-01-07 11:18:22 +00:00
Ted John 44d9464d6b Merge pull request #4995 from IntelOrca/refactor/track-design-repository-stdstring 
Refactor track design repository to use std::string
 2017-01-06 21:48:37 +00:00
Ted John e7a7704efb Fix RCT1 (original) imported parks having no ride music 2017-01-06 21:48:27 +00:00
zaxcav 9772c34cee Update debugging messages to reflect changes in how pathfind_history[].direction is updated. 2017-01-06 12:26:23 +01:00
Michał Janiszewski bd140e78fb Compile fixes for MinGW (#4998) 
* Fix mismatched condition in CMakeLists.txt

* Fix MinGW release builds
 2017-01-06 07:04:25 +01:00
OpenRCT2 git bot 2d47ddb1b3 Merge Localisation/master into OpenRCT2/develop. 2017-01-06 04:00:15 +00:00
zaxcav 64a2d105e5 Reword comments with "from from". 2017-01-05 21:43:57 +01:00
Ted John 8d0f281728 Update changelog 
[ci skip]
 2017-01-05 19:56:58 +00:00
Ted John 038ea82777 Fix #4996: Objects unloaded after loading landscape 2017-01-05 19:55:36 +00:00
zaxcav 78715fa1c0 Increment network version 2017-01-05 20:46:14 +01:00
Ted John 60cb84fd9d Handle nullptr for object when getting track designs 2017-01-05 18:19:20 +00:00
Ted John e1ace9528d Use std::string for File and FileScanner 2017-01-05 18:19:01 +00:00
Ted John 11477c5869 Refactor more of TrackDesignRepository to std::string 2017-01-05 17:51:31 +00:00
zaxcav f98b8e9de9 Restrict peep backtracking further via pathfind_history[i].direction 
Dependent on the path layout it is possible for peeps to get stuck in backtracking cycles between two or more path tiles - each such tile is a turn around point because from that tile, the reachable tile on the search boundary that is closest to the peep destination is in the direction the peep came from.

When storing/updating the pathfind_histroy, remove the direction the peep came from (in addition to the chosen direction) from the directions left to try to prevent such backtracking.
 2017-01-05 17:45:18 +01:00
Ted John be035dcdb2 Refactor various methods to use std::string 2017-01-05 13:13:22 +00:00
Ted John f201a8b43a Refactor TrackDesignRepository.cpp 2017-01-05 12:55:41 +00:00
Ted John 4fbecc2f60 Replace magic numbers with constant SPRITE_INDEX_NULL 2017-01-05 12:49:42 +00:00
Michael Steenbeek 2b35986746 Add and use constant for number of ride types 2017-01-05 09:19:22 +01:00
OpenRCT2 git bot 397806af19 Merge Localisation/master into OpenRCT2/develop. 2017-01-05 04:00:15 +00:00
Michał Janiszewski 3a2f8a29d0 Disable MSVC 2017 RC on AppVeyor 
I don't recall a build that would fail on MSVC15, but not on MSVC14.
Testing with both of them provides little benefit, while causing huge
delays in builds on AppVeyor.

In due time this can be re-enabled or AppVeyor setup can be moved fully
to MSVC15 when it becomes released.

Last known commit to pass is b1018ae.
 2017-01-04 23:45:05 +00:00
Ted John b1018aecb6 Merge pull request #4932 from IntelOrca/reorganise-src 
Reorganise src/
 2017-01-04 18:30:48 +00:00
Marijn van der Werf 24a0405345 Update testpaint 2017-01-04 18:28:40 +00:00
Marijn van der Werf 93f1eb7166 Update Xcode project 2017-01-04 18:28:40 +00:00
Michał Janiszewski 6684851115 Fix MinGW builds 2017-01-04 18:28:39 +00:00
Michał Janiszewski 0d88276abe Fix tests for new source layout 2017-01-04 18:28:39 +00:00
Ted John a2e3f10ca1 Update VS project files 2017-01-04 18:28:37 +00:00
Ted John 25bc798ff8 Move contents of src into project sub directory 2017-01-04 17:44:12 +00:00
Michał Janiszewski 67c2ab8849 Add libpng to required Linux libraries 
[ci skip]
 2017-01-04 16:12:35 +01:00
Michał Janiszewski 2f530c8ba2 Update required libraries for Linux 
[ci skip]
 2017-01-04 16:10:30 +01:00
Michał Janiszewski fa51d15c34 Remove fontconfig from TTF-less configuration 2017-01-04 16:09:53 +01:00
Michał Janiszewski 360018a82b Merge pull request #4980 from janisozaur/ttf-less 
Add configuration allowing builds without SDL2_ttf
 2017-01-04 15:52:52 +01:00
Michał Janiszewski 02bcaabac2 Improve NO_TTF build 2017-01-04 13:51:49 +01:00
Michał Janiszewski 5214cb7223 Use TTF-less builds on Travis 2017-01-04 13:51:49 +01:00
Michał Janiszewski 34b8c2034e Allow building without SDL2_ttf 2017-01-04 13:51:49 +01:00
Ted John 73d1c6a1f0 Merge pull request #4971 from IntelOrca/refactor/mixer 
Refactor mixer
 2017-01-04 12:16:14 +00:00
Marijn van der Werf d7fd3632dc Update Xcode project 2017-01-04 11:57:57 +01:00
OpenRCT2 git bot b1b73a7745 Merge Localisation/master into OpenRCT2/develop. 2017-01-04 04:00:15 +00:00
Ted John dbe694f7c8 Remove all usages of Uint types 2017-01-03 20:39:15 +00:00
Ted John 5ee43a26ac Create buffer type to reduce duplicated code 2017-01-03 20:38:46 +00:00
Ted John c549fe0fba Rename mixer to AudioMixer 2017-01-03 20:15:02 +00:00
Ted John f23d3c4e1c Refactor callback code 2017-01-03 19:53:36 +00:00
Ted John 983c59c9ff Refactor resampling code 2017-01-03 19:47:38 +00:00
Ted John cb592726d9 Fix convert buffer, wrong allocation size 2017-01-03 19:27:35 +00:00
Michael Steenbeek 7312d81e17 Add constants for max stations per ride (#4979) 2017-01-03 16:25:17 +01:00
Ted John a277419855 Use appropriate integer types 2017-01-03 12:43:34 +00:00
Ted John 683fc90ea7 Add cmath include to fix MacOS build 2017-01-02 23:36:09 +00:00
Marijn van der Werf cfa1c62490 Add new files to Xcode project 2017-01-02 23:56:11 +01:00
Michał Janiszewski 2f7ee8460e Fix compilation with clang 2017-01-02 23:37:04 +01:00
Michał Janiszewski e45301b104 Fix compilation with GCC 2017-01-02 23:36:56 +01:00