mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
13,965 Commits 8 Branches 59 Tags
3f76bd214f99bbd8ed5ffa53bd390b2a49ef0fcf
Commit Graph

13965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
3f76bd214f Const all the painted tile elements 
Extracted from https://github.com/OpenRCT2/OpenRCT2/pull/7036
 2018-02-12 16:03:20 +01:00
Michael Steenbeek
76a997aa18 Extract scenario descriptions from the STEX .DATs 
This is another step in removing support for STEX .DATs.
 2018-02-12 10:56:05 +01:00
Ted John
2da0f86b9b Merge pull request #7163 from IntelOrca/fix/cold-startup 
Fix cold startup
 2018-02-11 22:50:19 +00:00
ZehMatt
4f011163d0 Fix #6667: Match sample rate to games audio content. 2018-02-11 12:51:33 +01:00
Ted John
0f00659c8e Do not show file index error if it doesn't exist 2018-02-11 10:39:15 +00:00
Ted John
3c29b15de9 Fix segfault if no RCT2 install path 2018-02-11 10:39:15 +00:00
Ted John
e996c83b70 Create config directory if it doesn't exist 2018-02-11 10:39:15 +00:00
Michał Janiszewski
a9afe3253c Fix #7160: Crash when trying to play the Dynamite Dunes scenario 
The fix shouldn't modify guests that don't have any ride set.

This also fixes how peeps get removed and adds name of the offending
guest in the warning message.
 2018-02-11 09:47:52 +01:00
OpenRCT2 git bot
f431ecd37c Merge Localisation/master into OpenRCT2/develop. 2018-02-11 04:01:02 +00:00
Ted John
4dfed04cef Merge pull request #7161 from janisozaur/deleters-s4importer 
Fix mismatched deallocators in S4Importer.cpp
 2018-02-10 22:48:54 +00:00
jensj12
06e52f2d6f Fix #7137: Water, gentle and transport rides can only have 1 vehicle... (#7159) 
.../train
 2018-02-10 19:22:28 +00:00
Michał Janiszewski
30cbd0128f Fix mismatched deallocator in FileClassifier.cpp 2018-02-10 19:59:49 +01:00
Michał Janiszewski
86ca1581f7 Fix mismatched deallocators in S4Importer.cpp 2018-02-10 19:55:54 +01:00
wolfreak99
204fdaa66a Correct STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE_TIP 2018-02-10 15:22:49 +01:00
Michał Janiszewski
ab6ce6fd13 Don't try removing sprites past the end of list 2018-02-10 13:07:52 +01:00
Michał Janiszewski
73c861ab59 Improve selecting destination station when fixing imported sprites 2018-02-10 13:07:52 +01:00
Michał Janiszewski
61770b1dd7 Fix possibly invalid values of sprite fields on import 2018-02-10 13:07:52 +01:00
Michał Janiszewski
441b7ebe71 Don't try setting null ride type as invented 2018-02-10 13:07:52 +01:00
Michał Janiszewski
4732afa315 Add some bounds checks 2018-02-10 13:07:52 +01:00
Hielke Morsink
8e55c811f6 Check for server version instead of address (#7155) 2018-02-09 19:16:54 +00:00
Gymnasiast
f003366d22 Remove STEX selection from Object Selection window 2018-02-09 13:47:15 +01:00
Gymnasiast
3261753510 Ignore missing STEX entries 2018-02-09 13:47:15 +01:00
Gymnasiast
b1ab852fb7 Add object_entry_get_type() 2018-02-09 13:47:15 +01:00
Ted John
504e635933 Merge pull request #7150 from Broxzier/absolute-path 
Make custom paths absolute and show full path in load/save window
 2018-02-08 17:25:52 +00:00
Ted John
9f533d7265 Merge pull request #7143 from IntelOrca/refactor/server-list 
Refactor server list
 2018-02-08 17:25:37 +00:00
Michael Steenbeek
acc6136847 Do not pack Ride struct 2018-02-08 15:33:43 +01:00
Michael Steenbeek
e2dd629aaf Remove padding and offsets in Ride struct 2018-02-08 15:33:43 +01:00
Michael Steenbeek
34c8409251 Clean up ride struct and num_riders import, update changelog 2018-02-08 15:33:43 +01:00
Gymnasiast
02196a1919 Fix #3330: Current number of passengers overflows 2018-02-08 15:33:43 +01:00
Hielke Morsink
ced75956d1 Populate loadsave window with absolute path 
When pressing "up", the code would look for the parent in the given path, which doesn't work well with relative paths. This commit fixes this behaviour.
 2018-02-08 14:23:21 +01:00
Hielke Morsink
e1b99479a2 Make custom paths absolute 
Then gCustomUserDataPath and relatant variables are set, they overwrite the gBasePath array, which uses absolute paths. This commit makes the custom paths absolute as well, to prevent issues with assumptions in the code (file dialog for example).
 2018-02-08 14:23:21 +01:00
Michał Janiszewski
35b86e3aa1 Fix Android assertion (#7148) 2018-02-08 07:47:48 +00:00
Michał Janiszewski
0e032c9ca4 Avoid shifting negative values in Audio.cpp (#7147) 
Rather than shifting negative values, which invokes undefined behaviour,
use a multiplication.
 2018-02-08 07:47:35 +00:00
OpenRCT2 git bot
00cc6fd7fe Merge Localisation/master into OpenRCT2/develop. 2018-02-08 04:01:27 +00:00
Michał Janiszewski
282553f0c5 Upgrade some char arrays to strings 2018-02-07 23:14:29 +01:00
Michał Janiszewski
4c7053f581 Fix remaining usages of strings used in intents 2018-02-07 23:14:29 +01:00
Michał Janiszewski
20f95d073a Fix remaining uses of WC_LOADSAVE intent 2018-02-07 23:14:29 +01:00
Michał Janiszewski
d08924a9c2 Add missing breaks in WindowManager 2018-02-07 23:14:29 +01:00
Ted John
142facb8a3 Remove Memory::Duplicate and Memory::DuplicateArray (#7142) 2018-02-07 19:56:46 +00:00
Ted John
9d50a36f2c More improvements to server list 2018-02-07 19:23:44 +00:00
Ted John
c7128ec988 Refactor ServerList more 2018-02-07 13:01:36 +00:00
Ted John
c42a63c52c Refactor memory handling in ServerList more 2018-02-07 12:51:52 +00:00
Ted John
5d51676523 Refactor memory handling in ServerList 2018-02-07 12:51:52 +00:00
Michał Janiszewski
04ea015302 Fix #7135: Pass save path as std::string, not a pointer (#7141) 2018-02-07 12:11:37 +00:00
OpenRCT2 git bot
ac8353eef9 Merge Localisation/master into OpenRCT2/develop. 2018-02-07 04:00:58 +00:00
Ted John
214df1cf75 Fix #6958: Recent messages are not coloured 
This fix is a workaround to what I believe is a bug in MSVC's optimised code generator. Somehow the casting of a wchar_t to a sint32 is causing some strange behaviour where the number 147 gets changed to 0x??93. Adding a printf to display codepoint was enough to alter the behaviour, making it very difficult to understand what was going on.
 2018-02-06 23:29:23 +00:00
Michał Janiszewski
8b72c4f1ad Fix mismatched deleter in TextureCache (#7138) 2018-02-06 20:51:40 +00:00
Ted John
fbf0243aa3 Fix #7136: Wrong categorisation of objects 
Regression introduced in DuplicateArray when converting CopyArray to memcpy
 2018-02-06 18:19:23 +00:00
Ted John
0fc0d16e85 Remove unused String::Substring 2018-02-06 18:19:23 +00:00
Hielke Morsink
b6823242b6 Add temporary fix to make mechanics find ride exits 2018-02-06 19:09:51 +01:00