mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,518 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

22518 Commits

Author SHA1 Message Date
Gymnasiast 633a977397
Use objects v1.2.4 2021-12-08 16:33:27 +01:00
Gymnasiast fcd704ed47
Create fallback system for csg1 images 2021-12-08 16:18:33 +01:00
OpenRCT2 git bot bb35adc5b8 Merge Localisation/master into OpenRCT2/develop 2021-12-08 04:09:19 +00:00
Ted John a324bfab63
Add image manager plugin API (#16144) 2021-12-07 20:55:27 +00:00
Ted John d427098e39 Refactor terrain and path to use ImageId 2021-12-07 20:46:15 +00:00
Ted John 9fb490aec0 Refactor ride window to use ImageId 2021-12-07 20:17:22 +00:00
Ted John 5fcc0f4499 Refactor scenery window to use ImageId 2021-12-07 20:17:22 +00:00
Ted John 2108322806 Use ImageId for picked up peep 2021-12-07 20:17:22 +00:00
Ted John 8c65e39ce9
Merge pull request #16137 from OpenRCT2/refactor/imageid-rides 
Refactor ride painting to use ImageId
 2021-12-07 20:11:13 +00:00
Michael Steenbeek ea099c0d2d
Merge pull request #16129 from Gymnasiast/refactor/normalised-tile-element-type 
Part of #15485: Use normalised tile element type enum for setting type
 2021-12-07 11:50:54 +01:00
Tulio Leao 2556efd7c7
Merge pull request #16118 from GalBr/refactor-customcurrency-window-to-class 2021-12-06 23:37:15 -03:00
Duncan fdfd9b4760
Make track designs NSF map size safe (#16116) 
* Make track designs NSF map size safe

* Increment network version
 2021-12-06 16:58:50 +00:00
Ted John 9a7ff47690 Refactor paint enterprise to use ImageId 2021-12-05 23:05:14 +00:00
Ted John 17350d5766 Refactor paint magic carpet to use ImageId 2021-12-05 23:05:14 +00:00
Ted John 8a4929a240 Refactor paint swinging inverter to use ImageId 2021-12-05 23:05:13 +00:00
Ted John f628f53e3f Refactor paint ferris wheel to use ImageId 2021-12-05 23:05:13 +00:00
Ted John 9d7471da1e Refactor paint swinging ship to use ImageId 2021-12-05 23:05:13 +00:00
Ted John b759f9ab39 Refactor paint motion simulator to use ImageId 2021-12-05 23:05:13 +00:00
Ted John 7eb44b580f Refactor paint 3D cinema to use ImageId 2021-12-05 23:05:13 +00:00
Ted John 8b71136056 Refactor paint merry go round to use ImageId 2021-12-05 23:05:13 +00:00
Ted John a4e0a5ab07 Refactor simple rides / shops to use ImageId 2021-12-05 23:05:13 +00:00
Ted John 70506d2216 Refactor paint top spin to use ImageId 2021-12-05 23:05:13 +00:00
Ted John bd9f7d56c5
Fix #16130: Crash when using see-through rides or scenery 2021-12-05 23:33:09 +01:00
Ted John a8505dc689 Refactor paint twist to use ImageId 2021-12-05 22:18:52 +00:00
Duncan c01049a500
Only add RCT1 land objects to imported SV6 if they are used 2021-12-05 17:08:33 +01:00
Gymnasiast 03749d186c
Amend changelog [ci skip] 2021-12-05 17:00:33 +01:00
Gymnasiast 91635a5047
Replace SetType and old strong enum with normalised 2021-12-05 13:54:01 +01:00
Gymnasiast 897ab76c71
Create normalised tile element type 2021-12-05 13:54:01 +01:00
Karst 32b4fc0ca3
Make Looping Coaster draw missing sprites from LIM Launched Coaster 2021-12-05 13:27:42 +01:00
Michael Steenbeek ac0ee4316c
Merge pull request #16103 from Gymnasiast/refactor/imageid-to-struct 
Use new ImageId in most object previews
 2021-12-05 01:15:43 +01:00
Gal B 1a6fffb64a Replace strtol with Parse in CustomCurrency window 2021-12-04 19:20:39 +02:00
Gal B 8e1750b775 Refactor Custom Currency window to class 2021-12-04 18:53:11 +02:00
Olivier Wervers 459c0d67dd
Merge pull request #16104 from oli414/icons 
Icons for new object selection tabs
 2021-12-04 11:31:21 +00:00
Michael Steenbeek c48219e5bd
Merge pull request #16101 from ZehMatt/refactor/staff-ui-logic 
Refactor some code into UI for Staff
 2021-12-04 12:08:26 +01:00
ζeh Matt 7cfb5832c4
Fix #16075: Track designs save scenery in wrong location 2021-12-04 12:07:10 +01:00
Ted John 58f30f78d7
Fix plugin buttons not drawing text 2021-12-04 11:57:23 +01:00
Gymnasiast a7f8a79313
Fix crash when drawing small scenery glass preview 2021-12-04 11:55:34 +01:00
Ted John d2b8544654
Fix glass drawing 2021-12-04 11:55:33 +01:00
Gymnasiast cbdb2c03cd
Use new ImageId in most object previews 2021-12-04 11:55:33 +01:00
Michael Steenbeek 66bf0aa1a6
Remove now-unused RCT12 setters (#16109) 2021-12-04 10:56:49 +01:00
Ted John c455fe84e6 Update vscode C++ properties 2021-12-04 04:09:44 +00:00
oli414 f29464992e Rename railing icon file 2021-12-03 21:50:15 +00:00
oli414 93399c42a9 Remove replace icon 2021-12-03 20:56:18 +00:00
oli414 2be6cb1408 Add object selector icons for new tabs 2021-12-03 20:36:46 +00:00
Ted John 5f9d03e9df
Refactor ImageId and use in more functions 2021-12-03 19:59:33 +01:00
ζeh Matt e9ccad157e
Remove unused return value 2021-12-03 20:47:48 +02:00
Hielke Morsink 98db974b49
Merge pull request #16085 2021-12-03 19:10:03 +01:00
Michael Steenbeek 9bb2547dfb
Use templated function for the Twister and Vertical Drop 2021-12-03 18:00:42 +01:00
ζeh Matt a79e2a375a
Move staff_set_name to Staff 2021-12-03 17:40:27 +02:00
ζeh Matt a6870a97d4
Move staff hiring logic into StaffList 2021-12-03 17:37:39 +02:00