mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,113 Commits 7 Branches 39 Tags 347 MiB
Commit Graph

21113 Commits

Author SHA1 Message Date
adam-bloom 50c4f1c030 address feedback: use openrct2-cli for all CI runs 2021-04-05 19:18:09 -06:00
adam-bloom e45d002562 Remove unnecessary verify_app function 
fixup_bundle performs bundle verification, so this was a duplicate
 2021-04-01 22:37:09 -06:00
adam-bloom 927b213782 Add backward compatibility for older cmake versions 
file(ARCHIVE_EXTRACT) added in cmake 3.18
 2021-04-01 22:00:49 -06:00
adam-bloom d5e368a8d1 consistently use download_openrct2_zip 2021-04-01 22:00:43 -06:00
adam-bloom d2ce68aed9 use openrct2-cli during macOS CI runs for run-tests 2021-04-01 22:00:04 -06:00
adam-bloom c9d1a2ed89 combine both macOS cmake CI jobs 2021-04-01 22:00:04 -06:00
adam-bloom 753ac907f8 Refactor macOS CMakeLists for .app bundle as default 2021-04-01 22:00:04 -06:00
adam-bloom 2b37f4586a separate ccache key for macOS CI runs 2021-04-01 22:00:04 -06:00
adam-bloom 9231c5f611 store symlinks in zip archive (for embedded libraries) 2021-04-01 22:00:04 -06:00
adam-bloom dc0d77a951 include shaders (required for OpenGL) 2021-04-01 22:00:04 -06:00
adam-bloom 77ea64a5ef function for downloading object/sequence/dependency zips 2021-04-01 22:00:04 -06:00
adam-bloom 911ec9f97b new CI run for macOS portable app bundle 2021-04-01 22:00:04 -06:00
adam-bloom 06e0e3db51 add MACOS_BUNDLE cmake option to build self-contained app bundle 2021-04-01 22:00:04 -06:00
Michael Steenbeek 7344b7fbfd
Use 16-bit ride_id_t thoughout and raise RIDE_ID_NULL (#14411) 
* Replace RIDE_ENTRY_INDEX_NULL with OBJECT_ENTRY_INDEX_NULL

Ride entries are objects like any other, so there is little point having separate constants.

* Use ride_id_t in many more places

* Change RIDE_ID_NULL to 0xFFFF

* Increment network version

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2021-04-01 16:02:57 +01:00
Michael Steenbeek cbefc4fe38
Fix #14412: NPE in vehicle_create_car() 2021-04-01 11:26:14 +02:00
OpenRCT2 git bot 7c33a31d3a Merge Localisation/master into OpenRCT2/develop 2021-04-01 04:02:31 +00:00
Michael Steenbeek 9ee3c81768
Merge pull request #14397 from Gymnasiast/refactor/hardcoded-terrain-constants 
Remove hardcoded terrain style constants from RCT1 and MapGen
 2021-03-31 20:18:12 +02:00
Gymnasiast d7809c26f5
Use string_view instead of const char* 2021-03-31 19:22:09 +02:00
Gymnasiast b627dbd3a4
Apply review requests 2021-03-31 19:15:33 +02:00
Gymnasiast 69f7ad35fc
en-GB: Use real multiplication sign instead of x 2021-03-31 14:37:35 +02:00
Gymnasiast d7d402747e
Add Vietnamese language 2021-03-31 14:26:31 +02:00
Tulio Leao 465bcf768c
Merge pull request #14394 from tupaschoal/coords1 
Use more ScreenCoordsXY on openrct2-ui
 2021-03-30 19:49:51 -03:00
Michael Steenbeek 4014fbe861
Add missing call to gfx_unload_csg() 2021-03-30 22:49:00 +02:00
OpenRCT2 git bot 6bff0fb1a1 Merge Localisation/master into OpenRCT2/develop 2021-03-30 04:02:43 +00:00
Tulio Leao 7e78061e16 Use ScreenCoordsXY on InGameConsole 2021-03-29 09:34:11 -03:00
Tulio Leao bb8c275df6 Remove raw coords gfx_fill_rect_inset overload 2021-03-29 09:34:11 -03:00
Tulio Leao 08e182fba2 Use ScreenCoordsXY on Graph methods 2021-03-29 09:34:11 -03:00
Tulio Leao eab297f9ff Use ScreenCoordsXY on Graph::Draw 2021-03-29 09:34:11 -03:00
Tulio Leao d34dc3c924 Increase usage of ScreenRect' gfx_fill_rect_inset on Finances 2021-03-29 09:34:09 -03:00
Tulio Leao 090aadb647 Use ScreenCoordsXY on window_guest_stats_bars_paint 2021-03-29 09:31:05 -03:00
Tulio Leao aa88c8d181 Increase usage of gfx_fill_rect_inset that uses ScreenRect 2021-03-29 09:31:05 -03:00
Tulio Leao d5b5c10e80 Use ScreenCoordsXY for window_game_bottom_toolbar_draw_park_rating 2021-03-29 09:31:04 -03:00
Tulio Leao 2f608c32ab Use ScreenCoordsXY for window_ride_maintenance_draw_bar 2021-03-29 09:31:04 -03:00
Michał Janiszewski ed40badcb1
Initialise variable to fix Launchpad ppc64el builds 
`src/openrct2-ui/windows/TopToolbar.cpp:2112:13: error: ‘side’ may be used uninitialized in this function [-Werror=maybe-uninitialized]`
 2021-03-29 09:52:52 +02:00
OpenRCT2 git bot dd7258eb33 Merge Localisation/master into OpenRCT2/develop 2021-03-29 04:04:12 +00:00
Duncan ee03ab71d7
Reorganise EntityImport for S4 to follow S6/park style (#14398) 2021-03-28 21:35:53 +01:00
OpenRCT2 git bot 7c78a2b8c3 Merge Localisation/master into OpenRCT2/develop 2021-03-28 04:03:42 +00:00
Gymnasiast b3bbdcbfd5
Remove hardcoded terrain style constants from RCT1 and MapGen 2021-03-27 17:34:10 +01:00
Michael Steenbeek 7a29350688
Merge pull request #14019 from kimjcalvin/good_first_issue 
Display where a track design is located inside the track selector
 2021-03-27 16:13:06 +01:00
Gymnasiast 22ba7a2bc1
Fix drawing; fix formatting 2021-03-27 15:56:01 +01:00
calvin 6342fd3d9a
Display track file path in track selector 2021-03-27 15:11:08 +01:00
Geoff B 6c8493cb69
Close #14253: Replace font size tokens with adjusted DrawText calls 2021-03-27 14:40:17 +01:00
Michael Steenbeek 713410ab6c
Apply changed strings from the new-save-format branch 2021-03-27 14:31:13 +01:00
Tulio Leao 2d1557e48e
Merge pull request #13444 from tupaschoal/extract-ifdefed-functions 
Extract ifdefed functions
 2021-03-27 10:00:01 -03:00
Duncan 619b2afc15
Compute checksum by entity type (#14383) 
* Compute checksum by entity type

* Copy only the entity size

* Update replays and network version
 2021-03-27 09:36:41 +00:00
OpenRCT2 git bot e8e30e9c6a Merge Localisation/master into OpenRCT2/develop 2021-03-27 04:02:43 +00:00
Tulio Leao e23eaa164b Extract RequireNewWindow to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao 62fc4c8034 Extract ResolveCasing to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao c7ae064a4c Extract ShouldIgnoreCase to Platform 2021-03-26 23:17:01 -03:00
Tulio Leao 9a071aef76 Extract GetAbsolutePath to Platform 2021-03-26 23:17:01 -03:00