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

10189 Commits

Author SHA1 Message Date
Gymnasiast f47cfa79c0
Use WoodenBSupportsSetupRotated() for scenery supports drawing 2023-11-14 20:30:09 +01:00
Fredrik Tegnell af7086e283
Close #12078: Add shortcut key for sloping walls (#20860) 
* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Apply code formatting fixes

* Apply code formatting fixes

* Apply modulus operator to make code more concise

* Change string ID

* Apply code formatting fix

* Apply code formatting fix
 2023-11-12 08:10:56 -03:00
KawkMob 135c8b9f9b
Fix #20747: handle staff speed permanency/serialization/apply for new staff (#20756) 2023-11-12 08:06:51 -03:00
Maciek d6a481b066
Close #20881: Replace monorail_diag_blocked_segments with DiagBlockedSegments (#20961) 
Removed monorail_diag_blocked_segments. Replaced the references with DiagBlockedSegments.
 2023-11-12 08:04:25 -03:00
ζeh Matt 37cdc40799
Fix #20964: Crash when invalid network group id is used 2023-11-11 18:59:46 +02:00
mrmbernardi e914ffedaf
Fix #20944: Add cstdint to EnumMap and EntryList (#20945) 2023-11-04 19:55:35 +00:00
Gymnasiast 56933d3cdc
Bump network version 2023-11-02 22:40:35 +01:00
Gymnasiast 6d87e3e56d
Make remove_park_fences multiplayer-safe 2023-11-02 22:40:11 +01:00
AuraSpecs f1bcbd97c2
Allow vertical pieces on the giga when vehicle allows (#20802) 
* Allow vertical pieces on the giga when drawable

* Update NetworkBase.cpp

* Re-Add Diag Brakes

seem to have gotten lost with rebasing.
 2023-10-30 20:44:06 +00:00
Gymnasiast d88abab74b
Move MetalSupportTypeCount to Supports.cpp 2023-10-25 19:43:35 +02:00
Gymnasiast 3b074be920
Confine RotatedMetalSupports to Supports.cpp 2023-10-25 19:43:34 +02:00
Gymnasiast 2d16df1072
Create TrackPaintUtilOnridePhotoPlatformPaint() 2023-10-25 19:43:34 +02:00
Gymnasiast 0e5c413385
Merge TrackPaintUtilDrawStationMetalSupports() and ...2() 2023-10-25 19:43:28 +02:00
Gymnasiast 4ee088e27d
Also include the thick supports in RotatedMetalSupports 2023-10-25 19:37:49 +02:00
Gymnasiast 7cf75ab11d
Use common method for station/on-ride supports 2023-10-25 19:37:49 +02:00
ζeh Matt 897579b5de
Print a warning if there is a disagreement with the imported data 2023-10-20 15:02:28 +03:00
ζeh Matt b43af1cf14
Remove obsolete code in s4 importer 2023-10-20 14:28:10 +03:00
ζeh Matt 37bc7238e6
Remove unnecessary scope 2023-10-20 14:27:02 +03:00
ζeh Matt 4e7587db13
Re-calculate the amount of guests heading to the park on import 2023-10-20 14:26:30 +03:00
ζeh Matt a45d72f562
Extract functions out of GameFixSaveVars 2023-10-20 14:22:14 +03:00
Michael Steenbeek 3f5be95972
Use strong enum for metal support placement (#20855) 
Co-authored-by: tupaschoal <tupaschoal@noreply.github.com>
 2023-10-18 06:09:44 -03:00
Michał Janiszewski beb28ff32a Properly initialize class loader on Android 
https://github.com/OpenRCT2/OpenRCT2/pull/20502 changed how startup is
handled. This affected Android as well and changed AndroidClassLoader to
be initialized statically, but this turns out to be problematic due to
JVM not being fully initialized in our context by this time.

To fix this, move AndroidClassLoader initialization to JNI_OnLoad call,
where JVM is fully available.

Additionally, guard against multiple calls to JNI_OnLoad, an issue
present on Linux-like systems (including Android).
 2023-10-17 23:55:31 +02:00
mawjMobi 519421d3a3
Ref: #11159 Reduce malloc() and free() usage (#20872) 2023-10-17 08:51:52 +01:00
Matt c2fe9ef96a
Filter certain game actions from being used in the replay system (#20886) 2023-10-15 07:22:00 +01:00
AuraSpecs 88608e0b7e
Fix 20866: Boosters for the Mini and B&M track are swapped (#20867) 
* Fix 20866: Boosters are swapped

* Update sprites.h

* Bump network version
 2023-10-12 07:58:49 +01:00
Silent 6bc6b63ed4
Fix #18199: Dots in the game save's name get truncated (#20691) 2023-10-11 21:45:43 +01:00
Matt f773adc508
Merge pull request #19919 from spacek531/track/diagonal-brakes 
Diagonal brakes and block brakes
 2023-10-10 02:39:09 +03:00
Spacek531 85810708b3 bump parkfile min version 2023-10-09 10:27:06 -07:00
ζeh Matt 0ffbd65576
Bump plugin API version 2023-10-08 02:30:55 +03:00
ζeh Matt b4376ab590
Add owner property to tile elements for scripting 2023-10-08 02:30:43 +03:00
fidwell ce269e0d53 Merge remote-tracking branch 'origin/develop' into invisibility-shortcut 2023-10-07 10:07:50 -04:00
Spacek531 1a2cd1d186 revert some changes 2023-10-04 22:26:23 -07:00
Spacek531 87f246ed36 re-add whitespace 2023-10-04 22:02:01 -07:00
Spacek531 1b730e88da maybe fix it but better 2023-10-04 21:50:40 -07:00
Spacek531 1563004592 maybe fix it 2023-10-04 21:40:19 -07:00
Spacek531 9ef6d0e32e trying again 2023-10-04 16:58:50 -07:00
Spacek531 dd4826e0fa add extern struct 2023-10-04 16:05:53 -07:00
Matt 4147e9ad73
Merge pull request #20847 from ZehMatt/fix-20846 
Fix #20843: Remove 0 padding from file path in scenario index filename
 2023-10-04 22:07:49 +03:00
Andrew e17bca3b53
Made setting the game speed a game action (#20825) 
* Bare minimum for a game action

* Changelog entry

* Fixed formatting

* Consistent capitalization

* Committed wrong file

* Removing redundant toolbar invalidations

* Bump network version; remove redundant qualifier

* Fixed crash on starting server
 2023-10-04 16:13:40 +01:00
ζeh Matt cdb9f4cd18
Fix #20843: Remove 0 padding from file path in scenario index filename 2023-10-04 04:37:27 +03:00
Spacek531 752003fbe5 fix header maybe 2023-10-03 12:35:02 -07:00
Spacek531 e55eb27c13 play with headers 2023-10-02 22:06:32 -07:00
fidwell 95169f9632 Tile inspector invisibility shortcut does not use a game action 2023-10-02 22:26:55 -04:00
Spacek531 2b51653759 attempt to fix linux bionic 2023-10-02 00:29:52 -07:00
Spacek531 27a0980e2a remove todos from woodenrollercoaster.cpp 2023-10-01 23:42:25 -07:00
Spacek531 947c1f5677 add flying coaster 2023-10-01 22:52:47 -07:00
Spacek531 a1c6b95256 add giga coaster 2023-10-01 22:52:41 -07:00
X123M3-256 12f32df2a5 Add sprites for hybrid and single rail 2023-10-01 18:58:08 -07:00
Spacek531 1fbc328e27 bump parkfile version 2023-10-01 18:58:07 -07:00
Spacek531 408ee2c731 add missing brakes to RTDs 2023-10-01 18:58:07 -07:00
Spacek531 ed4e2a64ec make mine train things static 2023-10-01 18:58:07 -07:00
Spacek531 f2589ed972 add wooden paint code 2023-10-01 18:58:07 -07:00
Spacek531 ddb4d15e7d add wooden coaster sprites 2023-10-01 18:58:07 -07:00
Spacek531 2f6122786e bump network 2023-10-01 18:58:06 -07:00
Spacek531 b44e522262 rename SetBrakeClosed2 to SetBrakeClosedMultiTile 2023-10-01 18:58:06 -07:00
Spacek531 3676b47a20 fix formatting 2023-10-01 18:58:06 -07:00
Spacek531 37c1b5dd7a make SetBrakesClosed2 a standalone function 2023-10-01 18:58:06 -07:00
Spacek531 44d0d1546c fix issue with tracks being treated like block brakes 2023-10-01 18:58:06 -07:00
Spacek531 e43ba3729a reorder sprites.h 2023-10-01 18:58:05 -07:00
Spacek531 88ee7445d7 fix replay issue 2023-10-01 18:58:05 -07:00
X123M3-256 0435b31876 Fix formatting 2023-10-01 18:58:05 -07:00
X123M3-256 f0f64165f7 Add B&M sprites, remove LIM sprites 2023-10-01 18:58:05 -07:00
X123M3-256 f8f0cff0de Fix unavailable track pieces 2023-10-01 18:58:04 -07:00
X123M3-256 94cced27a1 Fix looping coaster brake sprites 2023-10-01 18:58:04 -07:00
X123M3-256 ee6b8e6605 Fix formatting 2023-10-01 18:58:04 -07:00
Spacek531 e65c42efae add to supported track pieces 2023-10-01 18:58:03 -07:00
spacek531 79730e50fd Diagonal Brakes and Block Brakes 2023-10-01 18:58:03 -07:00
Stephan Spengler 39ecab4bd2
add small scenery tertiary colour to plugin API (#20818) 
* add small scenery tertiary colour to plugin API

* bump API version
 2023-10-01 11:27:04 +01:00
Matt 09dca6bb79
Merge pull request #20700 from ZehMatt/string-refactor 
String refactor
 2023-09-28 20:36:45 +03:00
duncanspumpkin a6bed128b5 Bump scripting version 2023-09-26 19:05:02 +01:00
Michael Steenbeek e94dc57d32
Fix #20356: Cannot set tertiary colour on small scenery (#20803) 2023-09-23 05:30:47 +01:00
X123M3-256 a1af99cc0f Fix glitching on vertical twist 2023-09-21 19:46:06 +01:00
X123M3-256 f3be4bac0d Remove empty lines 2023-09-21 19:46:06 +01:00
X123M3-256 ea445f7e32 Fix zero G supports 2023-09-21 19:46:06 +01:00
X123M3-256 0131a10bf0 Fix more glitches 2023-09-21 19:46:06 +01:00
X123M3-256 f9e181d52d Fix glitches on medium loop and large sloped turns 2023-09-21 19:46:06 +01:00
X123M3-256 fd19415a6c Fix supports 2023-09-21 19:46:06 +01:00
X123M3-256 e97bc5b7b9 Fix large unbanked turns 2023-09-21 19:46:06 +01:00
X123M3-256 1f74043d75 Fix large half loops 2023-09-21 19:46:06 +01:00
X123M3-256 63f8e3ab56 Fix loop sprites 2023-09-21 19:46:06 +01:00
Karst 71934353e0 Add vertical slope to buildable track pieces 2023-09-21 19:46:06 +01:00
Karst 36335ac5e3 Move inversions to extra elements. 2023-09-21 19:46:06 +01:00
Karst 0844d5a308 Increase network version 2023-09-21 19:46:03 +01:00
Karst 5b641d4917 Add conversion code for backwards compatibility. 2023-09-21 19:44:15 +01:00
Karst cb715d23d4 Re-order sprites 2023-09-21 19:44:15 +01:00
Karst 8ac5568294 Fix Formatting 2023-09-21 19:44:15 +01:00
X123M3-256 f48cd29afe Add sprites 2023-09-21 19:44:15 +01:00
X123M3-256 51131aaa3e Start supports 2023-09-21 19:44:15 +01:00
X123M3-256 ba2a2a46de Start vertical loops 2023-09-21 19:44:15 +01:00
X123M3-256 06de29fe9d Add track sprites to giga coaster 2023-09-21 19:44:15 +01:00
X123M3-256 d8a4033569 Add giga coaster paint code 2023-09-21 19:44:15 +01:00
X123M3-256 34013c5bdf Enable giga pieces 2023-09-21 19:44:15 +01:00
AuraSpecs 1223b739e0
Create OpenMusic 1.4 release (#20795) 
nl-NL: Fix/amend some descriptions by @Gymnasiast in #42
    Update French translation by @rmnvgr in #43
    Normalize the ragtime tunes by @karst in #44
    Complete list of Fairground organ style 2 tunes by @karst in #45
    Update Hungarian translation by @anon569 in #47
    Add Mystic style by @SkyshardMelody in #46
    pt-BR: Translate Mystic Style by @tupaschoal in #48
    hu-HU: Translate Mystic Style by @anon569 in #49
 2023-09-21 19:36:37 +01:00
Ken Reese 3a3cd18321
Fix #19722: "Forbid tree removal" doesn't apply to large trees 2023-09-19 14:59:18 +02:00
Ken Reese 79b5d814ce
Set default ride price to free if park entrance fee has been set (#20790) 
* Set default ride price to 0 if park entrance fee is > 0

* Update changelog and network version

* Update distribution/changelog.txt

Co-authored-by: Matt <5415177+ZehMatt@users.noreply.github.com>

---------

Co-authored-by: Matt <5415177+ZehMatt@users.noreply.github.com>
 2023-09-18 08:18:51 +01:00
Basssiiie f2c6dcbbec
Fix incorrect target api when executing custom actions (#20778) 2023-09-11 08:05:35 +01:00
Hielke Morsink 37caebdde9
Fix #20737: Spent money underflows when getting refunds (#20765) 2023-09-07 08:19:27 +02:00
Matthias Moninger cb51d63dc8
Merge pull request #20741 from ZehMatt/object-madness 
Cleanup painting code, refactor some things regarding object indices
 2023-09-06 15:14:35 +03:00
Michał Janiszewski b40b5da5a5 Release v0.4.6 
- Feature: [#15660] Ability to show window buttons on the left.
- Feature: [#20680] New title sequences (https://github.com/OpenRCT2/title-sequences/releases/tag/v0.4.6).
- Feature: [OpenMusic#41] Official Title Theme by Allister Brimble.
- Improved: [#20119, #20243] Add new colour presets to several roller coasters (using the new colours).
- Improved: [#20393, #20410] Add Cyrillic characters Ґґ, Ѕѕ, Єє, Іі, Її, and Јј to the sprite font.
- Change: [#19785] OpenMusic is now selected by default when opening SC4/SC6 - or creating new - scenarios.
- Change: [#20110] Fix a few RCT1 build height parity discrepancies.
- Change: [#20550] Change SEK conversion rate from 1 GBP to 0.1 GBP.
- Fix: [#6152] Camera and UI are no longer locked at 40 Hz, providing a smoother experience.
- Fix: [#9534] Screams no longer cut-off on steep diagonal drops.
- Fix: [#17666] Using the mountain tool near the edge of the map with clearance checks disabled causes visual glitches.
- Fix: [#19450] The correct element is now auto-suggested when building a Medium Half Loop backwards.
- Fix: [#19735] Server unable to advertise to master server after a connection loss.
- Fix: [#19822] Tile inspector does not deep copy banners.
- Fix: [#19823] Parkobj: disallow overriding objects of different object types.
- Fix: [#19878] Unresearched scenery can be placed via prebuilt rides.
- Fix: [#20083] Cannot use terrain surfaces with ID > 32 and terrain edges with ID > 16.
- Fix: [#20089] Potential crash when a window is closed from another window.
- Fix: [#20103] [Plugin] Crash when custom plugin actions fail due to immutable state.
- Fix: [#20111] All coaster types can access the new diagonal slope pieces.
- Fix: [#20155] Fairground organ style 2 shows up as regular music, rather than for the merry-go-round.
- Fix: [#20260] Ride locks up when inspecting/fixing staff member is fired.
- Fix: [#20262] Title screen music missing when “random” title music is selected and RCT1 is no longer linked.
- Fix: [#20310] Map animations are not created on the title screen.
- Fix: [#20342] Large Half Loop (left) now only appears once in the special elements dropdown.
- Fix: [#20361] Crash when using random map generation.
- Fix: [#20364] Adding too much money with cheats causes an overflow.
- Fix: [#20365] Money cheat input does not support negative values.
- Fix: [#20389] Reversed vehicles are now correctly banked on diagonal slopes.
- Fix: [#20413] Crash when attempting to navigate an empty console history.
- Fix: [#20417] Plugin/custom windows are missing the left border in the title bar.
- Fix: [#20429] Error window tooltip not closing after 8 seconds.
- Fix: [#20456] Downward large half loops on flying coasters (fly-to-lie) are now correctly named.
- Fix: [#20484] Console caret not properly updated when using command history.
- Fix: [#20496] Ride rating requirements for compact inverted coasters is no longer relaxed.
- Fix: [#20543] Crash using show segments height from debug paint options.
- Fix: [#20607] Infinite loop when renaming rides with default names longer than 32 bytes.
- Fix: [#20642] Track list is sometimes empty due to uninitialized data for the filter string.
- Fix: [#20659] Phantom rides remain when closing construction window while paused.
- Fix: [#20672] Maze ghost elements incorrectly displayed.
- Fix: [#20684] Footpath additions getting removed by Miniature railway ghost elements.
- Fix: [#20693] Incorrect information shown when hovering over station when another station before it was removed.
- Fix: [#20739] Build version info on title screen leaving stray pixels when the camera is moved.
 2023-09-03 17:13:15 +02:00
Matthias Moninger b56d8a5f0d
Merge pull request #19785 from karst/openmusic-default 
Select OpenMusic by default when opening a new scenario
 2023-08-29 02:46:12 +03:00