mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,465 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

21465 Commits

Author SHA1 Message Date
Gymnasiast 7feb3802fb
Show what a stall sells in Object Selection 2021-05-26 17:46:04 +02:00
Gymnasiast 8852f91437
Fix display of number of items in scenery group 2021-05-26 17:46:03 +02:00
Gymnasiast 5fcb1f7273
Show tracks list of music styles in Object Selection 2021-05-26 17:46:03 +02:00
Matt 426d9d264d
Fix #14742: Custom currency showing incorrect value 2021-05-26 17:17:48 +03:00
Matt 6e70cd53d5
Fix #14745: Mechanics ignoring rides with ids above 255 2021-05-26 16:08:52 +03:00
Matt 6e609961e2
Fix #14734: Use scenario ticks instead of resetting to zero 2021-05-24 22:28:24 +03:00
Ted John de6c4b7b76 Fix park value objective string for currency 64 2021-05-24 20:04:54 +01:00
Ted John 03339ce298 Fix adding scenery to primary tab 2021-05-24 19:52:00 +01:00
Gymnasiast 080343c99d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-24 19:30:05 +02: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
Gymnasiast d3503b3433
Fix references to old railings names 2021-05-21 09:09:50 +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
Hielke Morsink 6a64b5a63c Use min/max water height defines in mapgen 2021-05-20 11:49:12 +02:00
Hielke Morsink 18bb0a3c64 Raise water height limit 
Since the water height is not limited to the bits it was stored in before, it can be increased much higher now. This commits sets it to same max height as for surfaces.
 2021-05-20 11:49:12 +02:00
Ted John 0ff22e13d7
Fix clang builds 2021-05-20 10:46:17 +01:00
Ted John 650cec46e0 Fix import / export of staff fields 2021-05-19 22:39:02 +01:00
Ted John 20b9f96ea1 Fix ride window viewport 2021-05-19 22:17:15 +01:00
Ted John ac259bc7aa Fix scenery eyedropper crash 2021-05-19 21:56:58 +01:00
Gymnasiast d35b7baed2
Fix GameStateSnapshots compilation 2021-05-19 17:02:43 +02:00
Gymnasiast 153221df8e
Update objects version 2021-05-19 15:19:04 +02:00
Gymnasiast 3864281b92
Update object names 2021-05-19 15:12:50 +02:00
Ted John b6667b5b98 Update import of guests and peep thoughts 
Also fix banner import from S4/S6
 2021-05-17 22:38:12 +01:00
Ted John 2b2159976d Merge branch 'develop' into new-save-format 2021-05-17 21:33:29 +01: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
Hielke Morsink 693cfb2075
Correctly handle consecutive corrupt elements 2021-05-16 16:14:53 +02:00
Gymnasiast 971c7fa26b
Update footpath railings tab icon; update some descriptions 2021-05-16 14:15:41 +02: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
Keiya f317d9d5b8
Fix overly-long comment (#14650) 
There! Are you happy now, clang-format!?

Co-authored-by: Keiya Flee <keiya@tinyfairy.xyz>
 2021-05-14 19:35:56 -03:00