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

23164 Commits

Author SHA1 Message Date
Hielke Morsink 0377b2c002
Merge pull request #17022 from Broxzier/bugfix/missing-version-info 2022-04-21 22:22:17 +02:00
EWouters 658efeb4a2
Remove enabledWidgets (#17023) 
This was old and unused code which broke the build on MacOS.
 2022-04-21 05:59:35 +01:00
OpenRCT2 git bot 9164905189 Merge Localisation/master into OpenRCT2/develop 2022-04-21 04:15:22 +00:00
Hielke Morsink 3c061944b0
Fix FILEVERSION having too many digits 2022-04-21 00:18:16 +02:00
Hielke Morsink e571ab6ba8
Use gh-describe to store `git describe` in environment 2022-04-20 23:21:32 +02:00
Hielke Morsink 779f0d995a
Merge pull request #17007 from Broxzier/bugfix/changelog-typo 2022-04-20 20:12:19 +02:00
Gymnasiast e1b41f0ba4
Add #16869 and #16995 to changelog [ci skip] 2022-04-20 18:23:49 +02:00
Hielke Morsink 7502837c02
Update copyright date in executable (#17018) 2022-04-20 13:12:38 +02:00
Michael Steenbeek adfd1b797c
Merge pull request #17012 from Gymnasiast/fix/17009 
Fix #17009: “No money” flag in SV6 saves not imported correctly
 2022-04-18 19:35:33 +02:00
Gymnasiast d71f7a7697
Remove now-redundant code for importing RCT1 saves with no money 2022-04-18 18:28:00 +02:00
Gymnasiast 060a9afaae
Fix #17009: “No money” flag in SV6 saves not imported correctly 2022-04-18 18:26:07 +02:00
Hielke Morsink 37bccd8ea6
Add missing changelog entry for #14920 2022-04-18 16:28:03 +02:00
Michael Steenbeek 2653a0c976
Merge pull request #16995 from Gymnasiast/fix/zenity-kdialog-escaping 
Fix Zenity/Kdialog calls
 2022-04-17 23:08:26 +02:00
Hielke Morsink 94f7198fd6
Add quotes around code and command line references 2022-04-17 21:49:43 +02:00
Hielke Morsink a4502d6e0b
Consistent usage of quotes 2022-04-17 21:49:42 +02:00
Hielke Morsink 017965c47b
Add missing full stops 2022-04-17 21:49:42 +02:00
Hielke Morsink 2fd0785de2
Fix typo in changelog 2022-04-17 21:49:37 +02:00
OpenRCT2 git bot ae67a3154b Merge Localisation/master into OpenRCT2/develop 2022-04-17 04:01:48 +00:00
Michael Steenbeek 031b4db03b
Update to objects release v1.2.7 2022-04-17 01:02:49 +02:00
Michael Steenbeek c8d00a4a62
Merge pull request #16958 from IntelOrca/fix/16478-park-no-money 
Fix  #16478: No money in .park scenarios
 2022-04-16 22:13:50 +02:00
Gymnasiast 3890aa50b7
Fix filters KDialog 
They were case sensitive and did not display correctly.
 2022-04-16 18:41:20 +02:00
Gymnasiast b27c48f035
Fix Zenity/Kdialog not opening in paths with single quotes 2022-04-16 18:41:20 +02:00
norisa118 483548120b
Fix #16879: TED::Price is price modifier, not price (#16962) 
* Fix #16879: TED::Price is price modifier, not price

Change unit type to uint32_t, change name to 'PriceModifer' &
add comment on how to use PriceModifier.
 2022-04-14 20:36:39 +01:00
Duncan a4700e152e
Fix #16950. Prevent accessing private members (#16976) 
* Fix #16950. Prevent accessing private members

* Move further private variable and rename

* Allow persistency of selection

* Move code to open event
 2022-04-14 20:36:04 +01:00
OpenRCT2 git bot ffb302a6cf Merge Localisation/master into OpenRCT2/develop 2022-04-14 04:01:48 +00:00
OpenRCT2 git bot 18882d1ba4 Merge Localisation/master into OpenRCT2/develop 2022-04-12 04:01:51 +00:00
Ivan 9c04024537
Close #16933: Rename car_visual to PaintStyle (#16969) 2022-04-11 23:18:18 -03:00
Duncan 4596105aed
Fix #16922: Unable to place helix ups on certain tracks 
Due to heavy reuse of widget index's and dual uses of items this was incorrectly grouped up in the SLOPE_STEEP_UP refactor. The correct way to split up this is to create a HELIX_UP HELIX_DOWN which will be left for a future refactor
 2022-04-11 19:25:55 +02:00
spacek531 5ecb7a6c6a
Cleanup vehicle drawing code part 2 (#16960) (#16960) 
* Rename assembly variable names

* Repurpose unused rct_ride_entry_vehicle field for NumRotationFrames
 2022-04-10 21:26:00 +01:00
Michael Steenbeek b35b1e2ec9
Grammar fix in STR_6488 
[ci skip]
 2022-04-10 00:49:40 +02:00
Michał Janiszewski 897a6c240c
Add changelog entry for #16070 2022-04-09 23:56:38 +02:00
spacek531 e699e96f38
Cleanup vehicle drawing code part 1 (#16956) 
* rename some constants based on pitch index

* rename functions based on pitch index
 2022-04-09 21:40:54 +01:00
Hielke Morsink 72844708ce
Merge pull request #16950 from Broxzier/bugfix/16829-scenery-window-crash 
Fix #16050: Scenery window positioning
 2022-04-09 18:36:16 +02:00
Ian-Polito 5f60dc4081
Take the nice additional changes from #16095 2022-04-09 17:50:17 +02:00
Hielke Morsink c995abc25e
Fix: Crash on opening scenery window after removing tabs 
The crash occurred because gWindowSceneryTabSelections did not get cleared when the window is not open, yet this is a global variable that needs clearing. The function that handles this (WindowSceneryResetSelectedSceneryItems) gets called with the `INTENT_ACTION_REFRESH_SCENERY` intent.
 2022-04-09 17:42:17 +02:00
Ted John 92fe3bf5e8 Fix drawing of scenario editor buttons 2022-04-09 12:36:47 +01:00
Ted John 11f4993c03 Remove no money scenerio flag 2022-04-09 12:36:31 +01:00
Ted John d2528c63a1 Reset scenario when saving a scenario 2022-04-09 11:54:23 +01:00
Ted John e1401acb47 Use start scenario logic when choosing new game 2022-04-09 11:40:25 +01:00
Michał Janiszewski fd4e6bd031
Fix crash after alt-tab (#16070) 2022-04-09 11:12:34 +01:00
Michael Steenbeek e9213e3ecf
Fix switched order of imageids on looping coasters (#16951) 2022-04-09 00:34:55 -03:00
Duncan 9c9b554813
Fix #16890. Incorrect rotation for splash boats (#16949) 2022-04-09 00:32:17 -03:00
Hielke Morsink 90ab449f78
Fix #16050: Scenery window positioning 
This supersedes #16095

The position and size arguments of WindowCreate are now optional - not a window doesn't have to know the size beforehand.
This removes the WF_NO_SCROLLING flag from the call to WindowCreate, but that seems to have no use for the scenery window anyway.

Co-authored-by: Ian-Polito <ipolito@mailfence.com>
 2022-04-09 00:49:44 +02:00
Michael Steenbeek 5e82e9048b
Add missing includes 2022-04-07 21:42:08 +02:00
Duncan 5760f11349
Simplify Track Cost calcs (#16940) 
* Multiply out 5 in track cost calcs and use _GBP

* Fix typo on Hypercoaster conversion

* Use two decimals for literals converted by _GBP

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2022-04-07 11:35:11 +01:00
spacek531 435c38b528
Fix vertical sprite count math 2022-04-06 15:36:39 +02:00
Michael Steenbeek 765bc59acd
Merge pull request #14207 from geoff-B/money32-UDL 
#14093 User defined literals for Money32
 2022-04-06 15:29:26 +02:00
X123M3-256 605112297d
Implement RIDE_ENTRY_FLAG_RIDER_CONTROLS_SPEED (#16837) 2022-04-06 08:38:24 -03:00
Rik Smeets 760c96224c
Prevent slow motion jumps in Maze 2022-04-06 10:42:00 +02:00
Hielke Morsink 62abb1a5e0
Merge pull request #16924 2022-04-06 09:40:26 +02:00