Michael Steenbeek
6ba6184602
Merge pull request #12362 from Gymnasiast/refactor/object-entry-index-null-to-0xFFFF
...
Change ObjectEntryIndex null value to 0xFFFF
2020-07-25 09:25:04 +02:00
Michał Janiszewski
13842198fa
Disable HTTP for targets that don't need it ( #12375 )
2020-07-25 09:09:15 +02:00
duncanspumpkin
9f4990e886
Update replays for change
2020-07-25 08:03:07 +01:00
chaitanyathengdi
33a88fbdbd
Fix #10946 : On-ride photo profit assumes every guest buys one ( #12285 )
...
* Use stored values of customers to adjust income from on-ride photos
Use stored values of photos sold and total customers to calculate ratio
and use that to predict income per hour for rides that include
on-ride-photo sections.
* Get rid of float
* Fix formatting
* Fix formatting - again
* Review changes
* Fix formatting
* Use new method of checking on-ride photo
* Use constants
* Add a changelog and contributors entry
2020-07-25 07:19:51 +01:00
frutiemax
f549698e96
Close #12338 : Remove goto from Tick128UpdateGuest ( #12367 )
2020-07-25 07:16:40 +01:00
Matt
6c40d9f3d5
Fix formatting
2020-07-24 23:11:28 +02:00
Matt
e31317e025
Rename function to be consistent
2020-07-24 23:11:28 +02:00
Matt
d230bc8914
Bump up network version
2020-07-24 23:11:28 +02:00
Matt
908090104a
Send client heartbeats to keep connection alive
2020-07-24 23:11:28 +02:00
Matt
1eedaf32dd
Refactor sending the object list including status reporting
2020-07-24 23:11:28 +02:00
Matt
0f31b82af0
Add missing network command
2020-07-24 23:11:28 +02:00
Matt
8ef5d0e838
Rename some things to clarify purpose, add constant for map requests
2020-07-24 23:11:12 +02:00
ζeh Matt
76b7c4e676
Merge pull request #12372 from ZehMatt/path-underflow-warnings
...
Fix GetAdditionEntry trying obtain the object when no additions exist
2020-07-24 19:20:30 +02:00
Aaron van Geffen
4d0d41dfbe
Restore spinner decrease button width ( #12370 )
2020-07-24 19:12:11 +02:00
Matt
4b17b2ea76
Fix GetAdditionEntry trying obtain the object when no additions exist
2020-07-24 15:58:17 +02:00
OpenRCT2 git bot
6b5f51b3c0
Merge Localisation/master into OpenRCT2/develop.
2020-07-24 04:03:30 +00:00
Gymnasiast
682add27dd
Change ObjectEntryIndex null value to 0xFFFF
2020-07-23 12:45:42 +02:00
Gymnasiast
3060c2d8cb
Add const to conversion functions
2020-07-23 12:05:00 +02:00
Aaron van Geffen
37a1a1c0a2
Fix #12356 : Opening SC4 or SV4 centres viewport on void ( #12361 )
2020-07-23 11:41:34 +02:00
Michael Steenbeek
f567da04eb
Fix #12353 : Research window shows wrong ride type
2020-07-22 23:21:08 +02:00
Duncan
4a235e3bb6
Refactor ResearchItem Type to an enum class ( #12346 )
...
* Change type of ResearchItem.type to enum class
This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.
* Specifiy a size for the type
Also remove the static cast where not required
* Apply review comments
2020-07-22 14:25:05 +01:00
0ro8lu
4416565e47
Close #12269 : remove goto from x8_drawing_engine ( #12274 )
...
Refactored the function into a separate get dirty rows function.
2020-07-22 11:51:41 +01:00
Duncan
2d1a6bd13b
Fix research import/export ( #12345 )
...
Old version incorrectly tried to convert the research type not the base ride type causing crashes when new saves were used on older versions of OpenRCT2 or vanilla.
2020-07-22 09:42:16 +01:00
Aaron van Geffen
205fc3332b
Refactor more widget definitions
...
* Increase height for changelog button in about window
* Tackle banner window
* Tackle changelog window
* Tackle custom currency window
* Tackle finance summary
* Tackle quit prompt widgets
* Tackle debug paint widgets
* Tackle demolish and refurbish prompt widgets
2020-07-21 17:38:57 +02:00
Aaron van Geffen
7b5087f057
Update copyright year to 2020
2020-07-21 15:04:34 +02:00
Aaron van Geffen
8f57c22bfe
Refactor options window widget definitions into new format ( #12316 )
2020-07-21 14:14:44 +02:00
Michael Steenbeek
b510729372
Merge pull request #12339 from Gymnasiast/fix/consistent-ride-naming
...
Fix/consistent ride naming
2020-07-21 14:12:48 +02:00
Gymnasiast
bc3ad044f8
Consistently use 'Circus'
2020-07-21 13:55:48 +02:00
Gymnasiast
c2153ae797
Consistenly use 'Swinging Ship'
2020-07-21 13:55:48 +02:00
Michael Steenbeek
09ece01096
Merge pull request #12303 from AaronVanGeffen/refactor/cheats
...
Refactor cheats window
2020-07-21 11:36:24 +02:00
Tulio Leao
d10b615eb3
Remove assert on ScreenLine ( #12333 )
...
Code is not always constructing a valid line
2020-07-20 18:49:15 -03:00
0ro8lu
6e077c42ea
Close #12270 : Remove goto track_remove_station_element ( #12323 )
...
Refactored the goto statement
2020-07-20 20:55:50 +01:00
Aaron van Geffen
3d7c0a567e
Introduce local constants per review suggestion
2020-07-20 00:12:04 +02:00
Aaron van Geffen
0a5b75e882
Refactor more windows into new-style widget format
...
* Ride Construction
* Ride List
* Save Prompt
* Scenery
* Scenery Scatter
* Server List
* Server Start
* Shortcut Keys
2020-07-19 19:36:54 +02:00
Michael Steenbeek
5b065912d8
Merge pull request #12318 from Gymnasiast/fix/12314
...
Fix #12314 : Swinging Ship colour tab shows Suspended Sw.c. track preview
2020-07-19 19:32:11 +02:00
Umdlye
84c0ee42bd
Fix #12314 : Swinging Ship colour tab shows Suspended Sw.c. track preview
2020-07-19 14:38:30 +02:00
ζeh Matt
2d81e9c51c
Fix #12229 , fix #12312 : No error message when loading a save fails
2020-07-19 14:33:32 +02:00
Aaron van Geffen
b966173550
Fix #12315 : Re-introduce titles in Finances and Research windows. ( #12317 )
2020-07-19 14:31:24 +02:00
Aaron van Geffen
d303f0b1ef
Add constants for common cheat widget sizes.
2020-07-19 11:54:41 +02:00
OpenRCT2 git bot
ee39bff1b4
Merge Localisation/master into OpenRCT2/develop.
2020-07-19 04:03:11 +00:00
Michael Steenbeek
5c411390bd
Fix #12226 : Crash in FindVehicleToEnter ( #12310 )
2020-07-18 23:54:55 +02:00
Michael Steenbeek
90129f669c
Fix #12305 : Can no longer build boosters on Hyper-Twister
2020-07-18 21:43:36 +02:00
Aaron van Geffen
15704d6d33
Refactor cheat window widget definitions into new format
2020-07-17 22:46:50 +02:00
Aaron van Geffen
6375d79c27
Cheats window: unfold existing window-specific macros
2020-07-17 22:46:48 +02:00
Michael Steenbeek
33898936b0
Merge pull request #12007 from Gymnasiast/refactor/remove-ride-groups
...
Close #11971 : Replace ride groups with new ride types
2020-07-17 12:35:30 +02:00
frutiemax
77d02c5e2b
Close #12290 : Refactor of object_manager_unload_objects ( #12291 )
2020-07-17 05:25:35 +01:00
rdbaris
8aa8d77ca1
Fix for smart pointer bug ( #12293 )
...
Don't allocate a ton of memory on load.
2020-07-17 05:23:05 +01:00
Gymnasiast
742ae947c7
Add null checks throughout
2020-07-17 00:32:47 +02:00
Gymnasiast
d703768d5d
Use old ride types in RideTypesBeenOn
2020-07-17 00:19:49 +02:00
Gymnasiast
470497d868
Limit S6 Importer object lookup to ride types that need conversion
2020-07-17 00:19:49 +02:00