mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity
21,240 Commits 8 Branches 59 Tags
21bb949322feee37db5bc4e3a4bdbccf2d2008ea
Commit Graph

21240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Duncan
21bb949322 Fix 14774: Scenery research always unlocks on load (#14777) 
* Fix #14774: Incorrect import of scenery research

Mistake during a refactor caused all scenery to be imported as already researched.

* Update changelog

* Update network version
 2021-05-28 18:55:19 +01:00
Michael Steenbeek
380d3a6cbe Turn vehicle sprite flags into a 32-bit integer 
At the request of X7123M3-256.
 2021-05-28 19:16:16 +02:00
OpenRCT2 git bot
4c1ab8d934 Merge Localisation/master into OpenRCT2/develop 2021-05-28 05:22:13 +00:00
Michael Steenbeek
3fe910781a Merge pull request #14761 from Gymnasiast/backport-object-selection-improvements 
Backport object selection improvements
 2021-05-27 22:39:17 +02:00
Michael Steenbeek
e5c61f2a44 Close #14511: Unlock all music with 'Unlock operating limits' cheat 2021-05-27 22:38:35 +02:00
Gymnasiast
b214a9fd97 Show what a stall sells in Object Selection 2021-05-27 19:54:44 +02:00
Gymnasiast
1d693f9751 Fix display of number of items in scenery group 2021-05-27 19:54:44 +02:00
Gymnasiast
f2ac658935 Show tracks list of music styles in Object Selection 2021-05-27 19:53:52 +02:00
Michael Steenbeek
4be838a9b8 Reserve strings for the new-save-format branch 
Avoiding constant merge conflicts
 2021-05-27 19:52:11 +02:00
OpenRCT2 git bot
1b11e691c9 Merge Localisation/master into OpenRCT2/develop 2021-05-26 04:43:40 +00:00
OpenRCT2 git bot
15bb5f53f8 Merge Localisation/master into OpenRCT2/develop 2021-05-25 04:28:28 +00:00
Michael Steenbeek
0a98f0e3bd Merge pull request #14731 from Gymnasiast/feature/opaque-water 
Add option to make water opaque
 2021-05-24 18:50:04 +02:00
Gymnasiast
74ef312533 Also make the water splash use opaque water 2021-05-24 17:07:48 +02:00
Gymnasiast
8f6713a4f1 Reverse option, add shortcut 2021-05-24 16:54:30 +02:00
Gymnasiast
89eae5198b Add option to make water opaque 2021-05-24 16:39:39 +02:00
Michael Steenbeek
ea47c3ffe9 Merge pull request #14716 from CookiePLMonster/startup-speed-optimizations-2 
More startup speed optimizations
 2021-05-24 12:42:12 +02:00
ζeh Matt
9991573817 Fix #14682: Crash when painting Swinging Ships with invalid subtype 2021-05-24 12:38:31 +02:00
ζeh Matt
ebcdfd06e9 Fix #14707: Crash when window is closed during text input 2021-05-24 00:11:04 +02:00
Michael Steenbeek
8d6b1c0da3 Merge pull request #14726 from ZehMatt/fix-14724 
Fix #14724: Money was ignored for ride creation
 2021-05-24 00:08:37 +02:00
Matt
7c8beededb Bump network version 2021-05-23 20:01:42 +03:00
Matt
2b4b204ad8 Fix #14724: Money was ignored for ride creation 2021-05-23 19:58:47 +03:00
Michael Steenbeek
9a76224a22 Downgrade “Image table longer than expected” to a verbose warning (#14722) 
There are lots of custom objects like this and there is little point spewing the console full of them, since they’re unlikely to cause many problems.
 2021-05-23 15:43:57 +02:00
Adam
dbd84f9f40 Fix #14415: Entrances/exits are removed when built on top of each other (#14490) 2021-05-23 15:41:34 +02:00
Silent
66abc69690 Add a persistentChunks flag to SawyerChunkReader 
New behaviour of SawyerChunkReader is to skip shrinking the chunk
memory unless persistentChunks is set to true. At the moment all uses
of SawyerChunks created by the reader are temporary and shrinking memory
right before freeing them is a waste of time.

Speeds up loading times and index building
 2021-05-23 15:04:50 +02:00
Silent
fb602ec0c9 Fix allocator mismatch in SawyerChunk on Windows with Debug 
This change allows to use HeapReAlloc in FinaliseLargeTempBuffer
when running Debug builds.
 2021-05-23 15:04:02 +02:00
ζeh Matt
38c7a70025 Fix #14710: Preview not shown without enough money (#14711) 
* Fix #14710: Preview not shown without enough money

* Bump up network version

* Add changelog.txt entry
 2021-05-23 09:45:48 -03:00
Michael Steenbeek
236c80fea1 Merge pull request #14712 from CookiePLMonster/startup-speed-optimization 
Startup speed optimizations
 2021-05-21 20:49:44 +02:00
Silent
e280eb2083 FileStream::Read: Throw the exception basing on fread return value 
This change removes ftell/GetPosition() from hot spots during the startup,
"optimizing" the function for success cases - reading past EOF should
never/rarely happen so it seems fine to let it try to read before checking
 2021-05-21 19:55:43 +02:00
Silent
724a3c0579 Obtain file sizes without seeking where possible 2021-05-21 19:55:43 +02:00
Silent
95388cfbb1 Add File::GetSize to get object size in a simpler way 
Drastically reduces startup speed because of the
optimization applied to ObjectAsset::GetSize - now the file
size is obtained without reading the entire file into memory.
 2021-05-21 19:55:42 +02:00
Duncan
dc11021192 Merge pull request #14706 from CookiePLMonster/fix-13445 
Fix #13445: Make FileScanner::ScanDirectory return a unique_ptr instead of a raw one
 2021-05-20 19:12:19 +01:00
Silent
94da3cf422 Fix #13445: Make FileScanner::ScanDirectory return a unique_ptr 
Also fixes a resource leak in TitleSequence::GetSaves.
 2021-05-20 19:22:36 +02:00
Tulio Leao
efd5d7dfe7 Fix formatting on d309a7c 2021-05-16 21:11:42 -03:00
Ryan
d309a7c871 Add climate information to Park API (#14636) 2021-05-16 21:06:36 -03:00
ζeh Matt
1fef332f6a Fix #14668: Ensure to flush network data when paused (#14673) 2021-05-16 13:14:29 +02:00
Dan Silk
05977e6d14 Fix #14468: Cannot close Options window on Android 
Issue was caused by the WIDX_ALWAYS_NATIVE_LOADSAVE flag not being enabled/disabled correctly.
 2021-05-15 23:43:50 +02:00
ZeeMajora
0123a3d141 Close #14655: make Changelog window brown in RCT1 theme 2021-05-15 16:53:44 +02:00
Gymnasiast
9fe9e67138 Add #14587 to changelog 2021-05-13 20:06:36 +02:00
Michael Steenbeek
513398b1f6 Fix #14488: Crash when building too many rides 2021-05-13 19:23:53 +02:00
Duncan
d22afe2372 Merge pull request #14625 from ZehMatt/refactor/peep 
Rename PeepActionType None1/None2
 2021-05-13 18:15:54 +01:00
Michael Steenbeek
f06bf3681d Fix #14638: Make 'About OpenRCT2' themeable; more RCT1 window colours 2021-05-13 18:28:09 +02:00
Matt
f73abc900d Add IsActionIdle/IsActionInterruptable getter and refactor uses 2021-05-13 18:05:55 +03:00
Matt
088b476dc5 Add IsActionWalking getter and refactor uses 2021-05-13 18:05:55 +03:00
Matt
8d9e47ee1c Remove unnecessary condition 2021-05-13 18:05:55 +03:00
Matt
4c11e11fe2 Rename PeepActionType None1 and None2 2021-05-13 18:05:55 +03:00
Michael Steenbeek
d35b28325a Merge pull request #14641 from duncanspumpkin/split2 
Refactor of misc entity functions
 2021-05-13 16:50:02 +02:00
zrowny
f6f5b41b76 Correct palette indexes of remap colors in image importer 
The codes that finds the closest entry that isn't used for remapping has the indices of remappable colors slightly off, and would make some colors in the imported image remappable even though they shouldn't have been.

Comment in header file describing the standard palette corrected as well.
 2021-05-13 16:30:35 +02:00
Gymnasiast
8c374b07e6 Make litterNames static 2021-05-13 16:26:23 +02:00
Gymnasiast
52918736d0 Rename Sick to Vomit 2021-05-13 16:26:23 +02:00
duncanspumpkin
8282fde827 move Litter functions into class and refactor 2021-05-13 16:11:13 +02:00