1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Commit Graph

16831 Commits

Author SHA1 Message Date
ζeh Matt
483fb173f5 Adjust S6 import/export for different thought item type 2021-08-30 21:13:34 +03:00
ζeh Matt
1555a4da9f Modify storage of PeepThought items to 16 bit for rides and shop items 2021-08-30 21:13:34 +03:00
ζeh Matt
b97ebc745f Rename rct_peep_thought to PeepThought 2021-08-30 21:13:33 +03:00
ζeh Matt
5d2c9d8be4 Merge pull request #15267 from spacek531/remove-var-CA
Remove var ca
2021-08-30 11:13:20 -07:00
ζeh Matt
c39bf42510 Merge pull request #15311 from ZehMatt/fix-15306
Fix #15306: Fix track paint using the wrong bounding box offsets
2021-08-30 07:13:57 -07:00
Michael Steenbeek
1730673ca3 Merge pull request #15285 from duncanspumpkin/rct2
Move RCT2 structs into RCT2 header
2021-08-30 13:45:23 +02:00
duncanspumpkin
2f9e9e853e Move further structs into correct headers 2021-08-30 12:27:23 +01:00
Duncan
8cc833f905 Strip RCT1 out of RCT1 struct names in namespace (#15284)
* Strip RCT1 out of struct names in namespace

* Remove RCT1:: where not required
2021-08-30 11:28:50 +01:00
spacek531
39b762aa78 fix sign error 2021-08-29 15:00:47 -07:00
spacek531
91099429c8 bump network 2021-08-29 14:52:43 -07:00
spacek531
0f5075f024 fix triggers 2021-08-29 14:52:43 -07:00
spacek531
315070faaa set value to 0 2021-08-29 14:52:43 -07:00
spacek531
199de52afe quick removing this 2021-08-29 14:52:43 -07:00
spacek531
6d7fd57f5b remove var_CA 2021-08-29 14:52:43 -07:00
ζeh Matt
51ad88c25d Fix #15306: Fix track paint using the wrong bounding box offsets 2021-08-29 23:43:59 +03:00
Michael Steenbeek
4bbee1c6ae Merge pull request #15261 from frutiemax/13874_refactor
Track Element Descriptor refactor (issue #13874)
2021-08-29 22:38:46 +02:00
ζeh Matt
b367f74496 Fix #15199: Construction window is not closed when a ride gets demolished 2021-08-29 22:20:30 +02:00
ζeh Matt
a75e07cde6 Merge pull request #15305 from ZehMatt/fix-15289
Fix #15289: Duplicated banner correction using the wrong index
2021-08-29 10:06:55 -07:00
frutiemax
450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
spacek531
cba52b240e Bird animation (#15294)
* initial implementation;

progress 1

progress 2

refactor to chain start

progress 3

begin walking

finish bird

remove walking

remove unused functions

refactor track element getting

fix formatting

refactor and add comments

remove brackets from simple if-else statements

invalidate vehicle

refactor again

fix format and refactor

please satisfy clang format

fix fallthrough

invalidate default case

remove redundant falltrhough

network bump

use std::max

refactor animation again

fix modulus

* move array declaration

* satisfy clang-format

* add changelog entry
2021-08-29 10:30:34 +01:00
ζeh Matt
4ada04c7ca Fix #15289: Duplicated banner correction using the wrong index 2021-08-29 12:20:17 +03:00
frutiemax
b3744f129f Part of #13874: Avoid copies of ted 2021-08-28 18:57:46 -04:00
Hielke Morsink
e0751d707f Fix #15298: Crash on map.getAllEntities from in-game console (#15301) 2021-08-28 17:43:11 +02:00
ζeh Matt
97ded2d7c4 Use reference and not copy (#15303) 2021-08-28 00:31:40 +02:00
frutiemax
5f438535ad Part of #13874: Gymnasiast review 2021-08-27 17:57:10 -04:00
frutiemax
9c53fe252d Part of #13874: ZehMatt review changes 2021-08-27 17:44:33 -04:00
ζeh Matt
85d3dc2a84 Merge pull request #15292 from ZehMatt/refactor/paint-constexpr
Apply constexpr where possible
2021-08-27 13:04:24 -07:00
ζeh Matt
0c05557b92 Change defines to constexpr and add SPR_ prefix 2021-08-27 22:40:51 +03:00
ζeh Matt
d7b911ffea Add sprite constants for LOOPING_RC_FLAT_CHAINED 2021-08-27 22:37:37 +03:00
ζeh Matt
70df58da15 Use constexpr where applicable in MiniatureRailway.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt
2a087a7eef Remove static initialization in looping_rc_track_station 2021-08-27 18:24:08 +03:00
ζeh Matt
3c106f7e0f Use constexpr where applicable in JuniorRollerCoaster.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt
5dd277fc0d Use constexpr where applicable in HybridCoaster.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt
5bf882587a Use constexpr where applicable in Viewport.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt
04ba3f92d7 Use constexpr where applicable in Monorail.cpp 2021-08-27 18:24:08 +03:00
ζeh Matt
78747d266f Use constexpr where applicable in MiniatureRailway.cpp 2021-08-27 18:24:08 +03:00
Michael Steenbeek
ef2477901e Merge pull request #15278 from Gymnasiast/fix/3868-opengl-ttf
Get basic TTF support working in OpenGL
2021-08-27 02:00:45 +02:00
Hielke Morsink
f9c4bb2757 Remove unused persistentChunks argument (#15290) 2021-08-26 23:00:12 +02:00
ζeh Matt
01c808c601 Remove unused argument of wooden_(a|b)_supports_paint_setup 2021-08-26 20:54:06 +03:00
Ted John
6e2b79a895 Get basic TTF support working in OpenGL
co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2021-08-26 19:46:18 +03:00
ZehMatt
de364aa15a Rename type SpriteBase to EntityBase 2021-08-26 15:37:16 +03:00
ZehMatt
20d3b50771 Correct includes for EntityBase.h 2021-08-26 15:33:53 +03:00
ZehMatt
eeb5c64119 Rename SpriteBase.h to EntityBase.h 2021-08-26 15:33:50 +03:00
duncanspumpkin
cdf1c3b1b8 Move s6 into rct2 header 2021-08-26 12:44:26 +01:00
Duncan
b97c46421e Move all RCT1 to RCT1 namespace (#15283) 2021-08-25 20:44:24 +01:00
ζeh Matt
4d261b389c Merge pull request #15280 from ZehMatt/refactor/gfx-draw-const
Cleanup DrawSpriteArgs
2021-08-25 07:15:00 -07:00
Duncan
c209021229 Remove unused serialiser trait (#15279) 2021-08-25 14:03:48 +01:00
ZehMatt
8fa4823055 Pass rct_drawpixelinfo as explicit argument, make DrawSpriteArgs const 2021-08-25 15:37:44 +03:00
Duncan
008f106242 Add constants for golf flags (#15072)
* Add constants for golf flags

* Reorg SubPositionData for minigolf

* Add enum for golf states

* Add golf animation enum

* Fix names of animations

* Correct spleing

* Revert stray change
2021-08-25 11:08:57 +01:00
ζeh Matt
eccbbdbe59 Use inline for direction functions in Location.hpp 2021-08-25 00:07:25 +02:00