OpenRCT2 git bot
499631bf72
Merge Localisation/master into OpenRCT2/develop
2020-11-21 04:04:38 +00:00
maksimdrachov
1815a094bb
Fix #13426 : Typo in "repay loan"
2020-11-19 19:45:40 +01:00
Michael Steenbeek
f899a045fa
Merge pull request #13419 from Gymnasiast/refactor/ghost-scenery
...
Disentangle sub_6E1F34() and try_place_ghost_scenery()
2020-11-18 22:38:32 +01:00
OpenRCT2 git bot
10b7143d53
Merge Localisation/master into OpenRCT2/develop
2020-11-17 04:04:31 +00:00
Michael Steenbeek
23871de19f
Remove built-in explode guests cheat
2020-11-16 22:07:52 +01:00
rpstester
e2de490259
Refactor goto loc_6D7A97 ( #13298 )
...
* Refactor GoTo loc_6D7A97
2020-11-16 08:14:53 -03:00
Michael Steenbeek
8b27f7cdf8
Implement ToUpper for WinNT 5.1 ( #13422 )
2020-11-16 08:12:28 -03:00
Gymnasiast
64959b0048
Break up sub_6E1F34()
2020-11-15 14:58:36 +01:00
Gymnasiast
4746d025c3
Remove remaining direct calls to sub_6E1F34()
2020-11-15 14:24:14 +01:00
adam-bloom
d79308ef40
Fix #12895 : Prevent Mechanics from fixing just fixed rides ( #13389 )
...
* Fix #12895 : only update ride mechanic status when advancing state
* add changelog message
* Change changelog wording
* Bump network version
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2020-11-13 20:13:13 -03:00
Michael Steenbeek
1f55720bb5
Remove obsolete object fixes
...
These fixes have since been incorporated into JSON objects.
2020-11-13 10:44:28 +01:00
rpstester
dcc5e0b0f9
Close #12337 : Remove goto from DecideAndBuyItem ( #13063 )
2020-11-11 23:17:00 -03:00
Michael Steenbeek
987a5f488d
Merge pull request #13403 from Lukasz-Pe/ObjectType
...
Close #12427 : Refactor OBJECT_TYPE to use strong enum
2020-11-11 16:39:59 +01:00
Łukasz Pękalski
fc4ad82ac1
resolve: integrated changes from comments
2020-11-11 16:08:39 +01:00
Łukasz Pękalski
d287d71624
refactor: enum class ObjectType is casted to int for test to pass
2020-11-11 16:07:01 +01:00
Łukasz Pękalski
7648feeba2
Close #12427 : Refactor OBJECT_TYPE to use strong enum
2020-11-11 16:07:01 +01:00
Łukasz Pękalski
dc93cacbee
bugHunt: correcting code to compile
...
code does not compile yet
2020-11-11 16:07:01 +01:00
Łukasz Pękalski
832fd69822
refactor: changed ObjectType enum to strong enum
...
code does not compile yet
2020-11-11 16:07:01 +01:00
Łukasz Pękalski
6e5105ab3b
refactor: ObjectType to use strong enum
...
enum renaming complete
2020-11-11 16:07:01 +01:00
Michael Steenbeek
1ab3f4b250
Introduce constant for max sequences ( #13405 )
2020-11-10 21:24:02 -03:00
OpenRCT2 git bot
cf7ce2d921
Merge Localisation/master into OpenRCT2/develop
2020-11-10 04:04:08 +00:00
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