OpenRCT2 git bot
d61e81bded
Merge Localisation/master into OpenRCT2/develop
2020-11-09 04:05:34 +00:00
Michael Steenbeek
1785be9b09
STR_6399: Fix quotes
2020-11-08 18:06:56 +01:00
Michael Steenbeek
a3b7ae72dd
Merge pull request #13394 from Gymnasiast/improve/has-file-picker
...
Check if platform has a file picker
2020-11-08 15:12:52 +01:00
Gymnasiast
75de0790bc
Improve message when asking for a game_path with no filepicker available
2020-11-08 14:32:58 +01:00
Gymnasiast
d963438c4f
Check if platform has a file picker
2020-11-08 14:06:42 +01:00
OpenRCT2 git bot
135245d744
Merge Localisation/master into OpenRCT2/develop
2020-11-08 04:05:23 +00:00
Michael Steenbeek
d8a7219c86
Use new identifier for default objects
2020-11-07 20:28:01 +01:00
Michael Steenbeek
58f099a644
Merge pull request #13286 from tupaschoal/research-refactor
...
Small research releated refactor
2020-11-07 20:18:18 +01:00
Tulio Leao
b8f56fd980
Merge pull request #13312 from Gymnasiast/refactor/ride-id-it
...
Use ride_id_t in more places
2020-11-07 13:03:29 -03:00
Tulio Leao
6367af89c3
Merge pull request #13261 from duncanspumpkin/paint_2
...
Paint 2
2020-11-07 13:01:26 -03:00
Tulio Leao
6790bfe106
Use array for selecting research category strings
2020-11-07 11:40:15 -03:00
duncanspumpkin
2b1c53a512
Fix test paint
2020-11-07 14:20:08 +00:00
duncanspumpkin
b89e0240ca
Fix AddAsParent overload
2020-11-07 14:15:26 +00:00
duncanspumpkin
ae87d81fe8
Adjust names further
2020-11-07 14:15:26 +00:00
duncanspumpkin
6882ddaf12
Clang format the relevant files
2020-11-07 14:15:25 +00:00
duncanspumpkin
f6d2db48dc
Name 98196C
2020-11-07 14:15:25 +00:00
duncanspumpkin
a6a95bd28e
Add overload for function
2020-11-07 14:15:25 +00:00
duncanspumpkin
99d4e8a10b
Simplify functions further
2020-11-07 14:15:25 +00:00
duncanspumpkin
533a845b0f
Name further functions
2020-11-07 14:15:25 +00:00
duncanspumpkin
d6669be939
Rename main paint add image functions
2020-11-07 14:15:24 +00:00
duncanspumpkin
6abeeae4b7
Create helper function for calculating position hash
2020-11-07 14:15:24 +00:00
duncanspumpkin
4adcde42f6
Refactor to add allocators to paint session
2020-11-07 14:15:24 +00:00
Tulio Leao
8a35f27cfc
Add converter from RideCategory to ResearchCategory
2020-11-07 11:14:55 -03:00
Tulio Leao
7d96dc9958
Move category names and invention strings to ResearchItem class
2020-11-07 11:14:55 -03:00
Tulio Leao
19ab8f1211
Use ResearchCategory Enum for ResearchItem
2020-11-07 11:14:55 -03:00
duncanspumpkin
3729ebb542
Update replays for change
2020-11-07 14:14:16 +00:00
Gymnasiast
7ef8082185
Bump network version
2020-11-07 13:49:15 +01:00
Gymnasiast
802285fd92
Autoconvert ride id between RCT2 and OpenRCT2
2020-11-07 13:49:15 +01:00
Hielke Morsink
f0c1ea1d37
Split declarations and definitions to improve compile times when editing ( #13332 )
...
* Split FileStream declarations and definitions
* Split JobPool declarations and definitions
* Split StringBuilder declarations and definitions
* Split StringReader declarations and definitions
* Split ZoomLevel declarations and definitions
* Fix missing include in FileClassifier.cpp
* Remove pragma once from source files
* Fix missing include in StringBuilder.h
* Update Xcode project
* Fix compilation of tests
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-11-07 12:42:04 +00:00
Gymnasiast
2846663533
Use ride_id_t for remaining peep ride fields
2020-11-07 12:58:32 +01:00
Gymnasiast
a3aef90637
Replace loose usages of 0xFF
2020-11-07 12:58:32 +01:00
Gymnasiast
9e17081ee8
Use 16 bits for gTrackDesignSaveRideIndex throughout
2020-11-07 12:58:32 +01:00
Gymnasiast
d58a8d1184
Change tile_element_get_ride_index() to method
2020-11-07 12:58:32 +01:00
Michael Steenbeek
92a5f1aa24
Merge pull request #13310 from ju-pinheiro/sprite-identifier-strong-enum
...
Close #12450 : Refactor SPRITE_IDENTIFIER to use strong enum
2020-11-06 16:55:01 +01:00
Michael Steenbeek
3c1aaa97d7
Merge pull request #13379 from Gymnasiast/json-id-in-repo
...
Allow object lookup using new JSON id
2020-11-06 14:48:56 +01:00
Gymnasiast
880a267252
Implement @ZehMatt's suggestions
2020-11-06 14:33:16 +01:00
Gymnasiast
ce15e20c94
Use plain std::string_view instead of const &
2020-11-06 11:40:52 +01:00
Sadret
4ff412dfe1
Close #13359 : Make GameAction flags optional in plugin API. ( #13381 )
2020-11-06 09:40:15 +00:00
Gymnasiast
53aef4e549
Replace old edge style names in Tables.cpp
2020-11-05 21:36:28 +01:00
Gymnasiast
6df36127b4
Replace calls to LoadObjectLegacy() with new IDs
2020-11-05 21:33:13 +01:00
Gymnasiast
bafafa6805
Create functions to load objects by JSON id
2020-11-05 21:24:43 +01:00
Gymnasiast
656cdda399
Add JSON identifier to object repository
2020-11-05 20:56:58 +01:00
Manuel Vögele
4a6db953f7
Convert a register to a variable
2020-11-05 17:43:51 +01:00
Sadret
2f4b1b9e3f
Close #13376 : Open custom window at specified tab
2020-11-05 17:43:23 +01:00
Michael Steenbeek
eea57f2bfe
Create calls for min/max cars per train
2020-11-05 17:42:02 +01:00
Manuel Vögele
69b07904c1
Make TileElement conversion preserve the const qualifier
...
Additionally this commit fixes some constness issues revealed by this change
2020-11-04 19:15:44 +01:00
Sadret
0b99943a3f
Fix address comments in TileElement.h
2020-11-04 17:41:38 +01:00
Manuel Vögele
ef51cfb29c
Refactor loc_6DDF9C ( #13369 )
...
* Move ride_create_vehicles into Ride
* Refactor loc_6DDF9C
2020-11-04 15:58:24 +00:00
Duncan
88b73d8716
Refactor add 3d light follow on from #13281 ( #13333 )
...
Close #12406
Co-authored-by: rpstester <32249806+rpstester@users.noreply.github.com>
Co-authored-by: rpstester <32249806+rpstester@users.noreply.github.com>
2020-11-04 11:24:56 +00:00
Manuel Vögele
96ff1894ee
Remove unnecessary parameter from Ride::Open ( #13368 )
...
Ride::Open is only ever called with RIDE_STATUS_OPEN,
so the parameter is redundant.
2020-11-04 11:24:32 +00:00