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

19331 Commits

Author SHA1 Message Date
Tulio Leao 6a8d9007e2
Close #11614: Require plugins to specify their license 2020-06-19 16:14:33 +02:00
Aaron van Geffen 0e9857899e Use widget height constants in object selection window 
Replaces hardcoded integers with LIST_ROW_HEIGHT and SCROLLABLE_ROW_HEIGHT.
 2020-06-19 08:42:14 +02:00
Aaron van Geffen 81dd7c1a7d Use available vertical text box space for text and cursor 2020-06-19 08:42:12 +02:00
Aaron van Geffen 5cb7bf6216 Increase widget heights in object selection window 
These changes accomodate CJK languages:
* Buttons from 11px to 13px.
* Text box from 11px to 13px.

Furthermore:
* Rename WIDX_FILTER_STRING_BUTTON constant to WIDX_FILTER_TEXT_BOX.
* Rename WINDOW_STAFF_LIST_WIDGET_IDX to WINDOW_EDITOR_OBJECT_SELECTION_WIDGET_IDX.
 2020-06-19 08:42:10 +02:00
Aaron van Geffen d66c61ca08
Change map generation button heights (#11986) 2020-06-18 23:33:08 +02:00
Olivier Wervers e280b413c0
Fix plugin get car entities returning null elements (#11988) 2020-06-18 21:50:06 +01:00
Michael Steenbeek ab9b8cd57e
Merge pull request #11983 from frutiemax/11964_RatingsCalculate 2020-06-18 18:22:11 +02:00
Gymnasiast 22166db30d
Fix compilation on TestPaint 2020-06-18 18:10:18 +02:00
frutiemax 642f4f83a8 Merge RideRatingsCalculateFuncTable in RideTypeDescriptor 2020-06-18 09:29:27 -04:00
Michael Steenbeek 5e8a3a709d
Merge pull request #11976 from Gymnasiast/refactor/vehicle-preference 
Move build menu preference to objects themselves
 2020-06-17 23:41:10 +02:00
Duncan bb34213b93
MapCanConstructAt refactor (#11977) 
* Start using MapCanConstructAt

* Fix #11675. Pass the full error message arguments on peep pickup

This was causing a crash as the error message arguments were being cleared which would mean eventually a nullptr dereference would happen.
 2020-06-17 22:35:13 +01:00
Michael Steenbeek 2013e1a36f
Merge pull request #11974 from Gymnasiast/refactor/ride-type-misc 
Refactor/ride type misc
 2020-06-17 23:15:30 +02:00
Michael Steenbeek 8a4724a691
Move covered track piece availability to RTD 2020-06-17 23:15:05 +02:00
frutiemax f6eb9f1cc5
Merge RideRatings in RideTypeDescriptor structure (#11975) 2020-06-17 22:22:52 +02:00
Duncan 33298d2bde
Fix peep pickup. Mistake made during refactor. (#11978) 
PeepPickupAction assumed that all locations that are passed into the function would be valid locations or null locations. This is not the case when picking up as a dummy value is passed into the function. The caller was fixed by passing a null location as expected by PeepPickupAction.
 2020-06-17 21:11:50 +01:00
Gymnasiast 2ee21e360c
Bump network version 2020-06-17 21:46:54 +02:00
Gymnasiast d28d4f4ffd
Update objects release to v1.0.15 2020-06-17 21:46:37 +02:00
Gymnasiast c77d500394
Move build menu preference to objects themselves 2020-06-17 21:46:37 +02:00
Michael Steenbeek e2b187c24a
Merge pull request #11921 from duncanspumpkin/CreateSprite6 
Entity List Iterator
 2020-06-17 21:28:36 +02:00
Gymnasiast 2a9c2be7d0
Remove unused function 2020-06-17 19:11:02 +02:00
Gymnasiast 682b15343b
Create RCT2_RIDE_TYPE_COUNT 2020-06-17 19:10:39 +02:00
frutiemax de1c172c74
Move RideProperties and rideBonusValue to RideTypeDescriptors 
Part of #11964.
 2020-06-17 18:59:04 +02:00
Michael Steenbeek 723e8347ec
Merge pull request #11973 from Gymnasiast/refactor/toilet 
Replace some Americanisms
 2020-06-17 18:53:57 +02:00
Gymnasiast f0872ab7b8
Replace 'bumper cars' with 'dodgems' 2020-06-17 18:13:00 +02:00
Gymnasiast 9e702d9e01
Replace 'Bathroom' with 'Toilet' 2020-06-17 18:12:13 +02:00
Olivier Wervers 66c3d8d828
Expose park name to plugins (#11970) 2020-06-17 17:33:38 +02:00
Michael Steenbeek 5e3a99a9ac
Move RideTypeTrackPaintFunctionsOld declaration to TestPaint (#11969) 2020-06-17 13:52:10 +02:00
Michael Steenbeek 97b99122de
Merge pull request #11962 from Gymnasiast/refactor/rtd-rtd-rtd 
Move RideNaming, RideHeights and max mass to RTDs
 2020-06-17 13:06:26 +02:00
Michael Steenbeek ba5e730c06
Rename UpdateFlag to HasUpdateFlag; refactor to bool (#11966) 2020-06-17 00:05:37 -03:00
Gymnasiast f16a80a481
Fix typo in VEHICLE_UPDATE_FLAG_ON_BREAK_FOR_DROP 2020-06-16 23:31:34 +02:00
Gymnasiast 96678a14eb
Move ride naming to RTD 
This also means that all unused ride types will now have the same name. I have made an exception for the 'arbitrary ride type change' dropdown only.
 2020-06-16 22:52:48 +02:00
Duncan 50d22ededd
Create a hookable location checking function for actions (#11860) 
* Create a hookable location checking function for actions

* Add location valid to a number of game actions

Actually pass the coordinates to the script

Use LocationValid on further game actions

Add further actions to the LocationValid. Update api

Update remaining actions to use LocationValid

* Fix bug with peep pickup

Adjust api
 2020-06-16 20:57:11 +01:00
duncanspumpkin 8eb7356320 Simplify iterator class 2020-06-16 20:27:44 +01:00
duncanspumpkin 9c2f545225 Fix building of testpaint 2020-06-16 20:27:44 +01:00
duncanspumpkin 6ed17b4ff9 Remove FOR_ALL_PEEPS/GUESTS/STAFF macros 
Replaced with an EntityList iterator

Fix formatting

Fix nullptr issues
 2020-06-16 20:27:44 +01:00
duncanspumpkin c45a0536eb Use new class 2020-06-16 20:27:40 +01:00
duncanspumpkin 225ae3a0a9 Add EntityList iterator 2020-06-16 20:26:56 +01:00
duncanspumpkin a30374d200 Use new iterator 
Fix mac builds

Fix minor mistake

Fix vehicle loops
 2020-06-16 20:25:47 +01:00
duncanspumpkin 133d8c4a0a Implement GetSprite and use it in a number of places 
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
 2020-06-16 20:25:03 +01:00
duncanspumpkin 904e6c6987 Implement GetSprite and use it in a number of places 
This will eventually replace all of the get_sprite and try_get_sprite calls

Further use of GetSprite

Use GetSprite in all remaining easy to use functions

Correct formatting

Rename GetSprite to GetEntity

Make suggested changes

Remove const to allow for building

Fix crashes due to next sprite
 2020-06-16 20:21:56 +01:00
Gymnasiast 9cf12e763d
Move RideHeights and max mass to RTDs 2020-06-16 20:57:55 +02:00
Gymnasiast 140f2d6922
Rename rct_ride_data_5 and its fields to RideHeights 2020-06-16 20:17:07 +02:00
Gymnasiast 2eccef5979
Split max_mass from rct_ride_data_5 2020-06-16 20:00:25 +02:00
Michael Steenbeek 0f12382895
Merge pull request #11959 from irrelevantirreverent/extra-go-karts-subpositions 
Add info for go-kart lanes on some track pieces
 2020-06-16 15:57:39 +02:00
Irrelevant Irreverent db85f0c78b Bump network version 2020-06-16 09:08:04 -04:00
Irrelevant Irreverent efd5b869d1 Update changelog with new feature 2020-06-16 08:57:56 -04:00
Irrelevant Irreverent 416fb64e74 Use proper prefix for track piece comments 2020-06-16 08:51:00 -04:00
Irrelevant Irreverent 6c911f203d Fix spacing in track info and adjust comments 2020-06-16 08:24:20 -04:00
Irrelevant Irreverent fc25fb68de Add info for go-kart lanes on some track pieces 2020-06-16 08:19:31 -04:00
Michael Steenbeek 8c67eede5b
Name track vehicle info lists (#11960) 2020-06-16 12:35:13 +01:00