Ted John
67c0ed8a2f
Add new windows project
2017-01-10 17:29:02 +00:00
Christian F. Coors
06d1d2116f
Remove unnecessary code
2017-01-10 12:44:30 +01:00
Christian F. Coors
e0a6955924
Remove openssl dependency when building without network support
2017-01-10 12:44:30 +01:00
X123M3-256
7c7b67f665
Do not deselect boosters after building one, fixes #4975
2017-01-09 22:51:16 +01:00
Michael Steenbeek
1c2458b6dd
Combine drawing of the Spiral and Mini RC ( #5025 )
2017-01-09 22:09:33 +01:00
Michael Steenbeek
4f61cae8a8
Merge pull request #4997 from zaxcav/restrictBacktrack
...
Restrict backtracking during peep pathfinding
2017-01-09 21:55:23 +01:00
wolfreak99
bdc34b608d
Make tile inspector selector draggable
2017-01-09 19:30:42 +00:00
Michael Steenbeek
6bbbf0a6ce
Merge pull request #5019 from IntelOrca/feature/rct1/import-things
...
Import other RCT1 things
2017-01-09 19:22:46 +01:00
Ted John
acba8ee63f
Fix code style
2017-01-08 23:51:22 +00:00
Gymnasiast
9521911719
Import money effect
2017-01-08 23:35:30 +00:00
Gymnasiast
8c1926e41c
Import jumping fountain water
2017-01-08 23:35:30 +00:00
Gymnasiast
5a51f28ba0
Fix balloons, import balloons, ducks and steam particles
2017-01-08 23:35:29 +00:00
Gymnasiast
70f6f638ca
Fix negative queue lengths, fix guests thoughts, import litter, import more fields, fix monorail, fix chairlift crashes
2017-01-08 23:35:26 +00:00
Ted John
9c11b051ee
Add some max constants for RCT1
2017-01-08 23:34:49 +00:00
Ted John
3037e6fb59
Merge pull request #5013 from IntelOrca/refactor/imageio
...
Refactor image_io
2017-01-08 22:30:58 +00:00
danidoedel
4fdc0e674f
Update Xcode project
2017-01-08 22:17:12 +00:00
OpenRCT2 git bot
e537a378dd
Merge Localisation/master into OpenRCT2/develop.
2017-01-08 04:00:21 +00:00
duncanspumpkin
ac5b0b0cf5
Rename sprite list vehicle to train to reflect true use
...
This was found during the rct1 vehicle import branch. When importing it would load all vehicles into this list only to find that each car was treated as a seperate train.
2017-01-07 16:59:46 +00:00
Michał Janiszewski
1a2227289a
Limit vehicle search to valid ones only
2017-01-07 14:54:30 +00:00
Ted John
4680aeab9b
Use FileStream instead of SDL2
2017-01-07 12:23:59 +00:00
Ted John
a21cbae82a
Move image_io to C++
2017-01-07 12:10:42 +00:00
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
