mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity
21,482 Commits 8 Branches 59 Tags
5b194974ef6402bc204df07df8ddceb510283436
Commit Graph

21482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted John
5b194974ef Add support for zoom offsets to parkobj 2021-05-29 18:33:39 +01:00
Ted John
87e7179650 Support multiple images per .png in parkobj 2021-05-29 18:26:02 +01:00
duncanspumpkin
3a0394440e Fix path find history logs 2021-05-28 17:51:10 +01:00
duncanspumpkin
35c8fee368 Fix peep thought desync issues and handle >255 rides 2021-05-28 17:38:44 +01:00
Gymnasiast
3e357e6148 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-27 22:40:34 +02: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
Gymnasiast
a9c03e3c11 Removed forgotten debug statement and fix MSVC compilation 2021-05-26 18:26:39 +02:00
Gymnasiast
7c6a92fed2 Unlock all music with 'Unlock operating limits' cheat 2021-05-26 18:10:27 +02:00
Matt
fec2b70f2b Use money64 for track design costs 2021-05-26 19:03:24 +03:00
Gymnasiast
8bc8a0df14 Remove Music Acknowledgements window 
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
 2021-05-26 17:56:02 +02:00
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
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
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