mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,121 Commits 9 Branches 41 Tags 366 MiB
Commit Graph

14121 Commits

Author SHA1 Message Date
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
Hielke Morsink 5e86782f0a Check for nullptr instead of using !ptr + format document 
This changes all similar checks in the TileInspector file to use `ptr == nullptr` instead of `!ptr`
and applies the coding style.
 2018-02-06 19:09:51 +01:00
Hielke Morsink 3e4981af85 Add changelog entry 
[ci skip]
 2018-02-06 19:09:51 +01:00
Hielke Morsink 915dbdf869 Add button to tile inspector to make entrances usable 
With this, entrances and exits that have been moved away from its original XY
location can be made usable. Only one entrance or exit will be usable per
station.
 2018-02-06 19:09:51 +01:00
Hielke Morsink 7fe50a481f Allow building queues from raised/lowered entrances 
The original code assumes the entrance is at the exact same height as the
station, which is not always the case with hacked rides.
 2018-02-06 19:09:51 +01:00
Ted John 97032f7044
Merge pull request #7062 from rwjuk/fix7052 
Fix #7052: Infinite loops occur in track circuit iteration
 2018-02-06 11:42:19 +00:00
Ted John a6cb15c3b6
Merge pull request #7130 from IntelOrca/improve-bad-g1-handling 
Improve bad g1.dat handling
 2018-02-06 11:37:22 +00:00
Michael Steenbeek 9629f50294 Update changelog for #7125 [ci skip] 2018-02-06 10:41:31 +01:00
Michael Steenbeek b78a744b8e Create footpath_get_edges() 2018-02-06 10:41:31 +01:00
zaxcav 688577375f Correct identification of thin junctions in the heuristic search. 
Previously, thin junctions were identified based on the permitted edges - i.e. exit edges from the tile. This causes incorrect handling of tiles with 'no entry' signs. In the worst case, this breaks the heuristic search for paths with 'no entry' signs. Correct to identify thin junctions based on all edges rather than only the permitted edges.

Fixes #7125.
 2018-02-06 10:41:31 +01:00
OpenRCT2 git bot 1037eb5dae Merge Localisation/master into OpenRCT2/develop. 2018-02-06 04:01:17 +00:00
Gymnasiast cc4f7e144a Remove most usages of 'new Intent' 2018-02-05 23:23:26 +01:00
Gymnasiast e3c0f6606d Clean up Intent.{cpp,h} 
This gets rid of the C transfer functions, add licence and does some alignment fixes
 2018-02-05 23:23:26 +01:00
Ted John f031763531 Use rct_gx for g1 2018-02-05 19:04:01 +00:00
Ted John b8e93177d8 Use std::vector for g2 and csg 2018-02-05 18:56:03 +00:00
Ted John b0755123fd Fix loading of bad g1.dat 2018-02-05 18:47:40 +00:00
Ted John 8e7a0e9110 Fix memcpy to copy_n mistake from 0c71855 2018-02-05 18:32:23 +00:00
Gymnasiast ba7548089c Fix warnings when converting RCT1 research 2018-02-05 19:06:10 +01:00
Ted John 76344498bb Fix outPath not set in platform_get_user_directory 2018-02-05 17:19:39 +00:00
Gymnasiast 34a6b5ef92 Remove __cplusplus ifdefs 2018-02-05 16:20:15 +01:00
Gymnasiast 778ba466c5 Remove almost every extern C block 2018-02-05 16:20:15 +01:00
Marijn van der Werf d9d4bbd3b6 Update Xcode project 
- Compile all files in src/openrct2 as part of libopenrct2, fixing CLI-builds
- Remove testpaint from xcode project
 2018-02-05 15:34:45 +01:00
Marijn van der Werf 941f433aa8 Use Objective-C++ for macOS platform file 2018-02-05 15:34:45 +01:00
Richard Jenkins 9a10218275 Update official domain 2018-02-05 13:32:53 +01:00
OpenRCT2 git bot 04b5fe84b9 Merge Localisation/master into OpenRCT2/develop. 2018-02-05 04:02:18 +00:00
Richard Jenkins bc5fffd0cc Add changelog entry and tweak menu text 2018-02-05 00:20:12 +00:00
Aaron van Geffen e3db8be68c Highlight full litter bins, too. 2018-02-05 00:20:12 +00:00
Aaron van Geffen f5db6dbde9 Replace constants with palette codes. 2018-02-05 00:20:12 +00:00
Aaron van Geffen ead49fa84e Name Unk141E9DC as WaterHeight. 2018-02-05 00:20:12 +00:00
Aaron van Geffen 0acf423031 Don't hide water when highlighting vandalism and vomit. 2018-02-05 00:20:12 +00:00
Richard Jenkins 95dfcea6bd Implement #4984: Add option to highlight vomit, litter and handymen 2018-02-05 00:20:12 +00:00
Ted John 73e7fca86e
Merge pull request #7116 from IntelOrca/refactor/memory-operations-3 
Refactor memory operations 3
- Replace Memory::Set, Memory::Copy and Memory::Move with standard C++.
 2018-02-04 14:32:58 +00:00
Ted John a84c05f1eb Fix gcc 2018-02-04 12:40:25 +00:00
Ted John 0c71855769 Replace Memory::Copy with std::copy 2018-02-04 12:40:24 +00:00
Ted John bb8b6a3f68 Replace Memory::Move with std::copy 2018-02-04 12:40:24 +00:00
Ted John 7851446a6f Replace Memory::Set with std::fill or similar 2018-02-04 12:35:02 +00:00
Ted John 522e113929 Fix wrong highlighted tab in object selection window 2018-02-04 12:34:41 +00:00
Gymnasiast ca12a4336b Fix custom SV4 files crashing the game 2018-02-03 18:48:57 +01:00
OpenRCT2 git bot ecb6661370 Merge Localisation/master into OpenRCT2/develop. 2018-02-03 04:03:43 +00:00
Joshua Moerman 5800a0874d Mac: updates cmake files to reflect previous commit(s) 
The new file Platform.mm added in the previous commit was added
to the XCode project, but not to the cmake files.

I copied the pattern from src/openrct2-ui/CMakeFiles.txt
 2018-02-02 23:16:37 +01:00
Michael Steenbeek 9bd812c855 Move most of _legacy.c to C++ (#7117) 2018-02-02 23:11:41 +01:00
Ted John f932dcf9ca
Merge pull request #6765 from IntelOrca/refactor/resolve-data-path 
Rewrite Platform::GetInstallPath
 2018-02-02 13:43:04 +00:00
Brian Callahan e8484d1816 Fix build on OpenBSD and FreeBSD 2018-02-02 12:41:26 +00:00
Richard Jenkins 172b5907fa Fix platform functions for macOS 2018-02-02 12:41:26 +00:00
Ted John 87cd9f88b3 Rewrite Platform::GetInstallPath 2018-02-02 12:41:26 +00:00