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

21295 Commits

Author SHA1 Message Date
Margen67 55d7df32fd localisation.yml: Use --depth 1 to speed up cloning 2021-04-23 11:29:09 -10:00
Margen67 c2f16a54aa localisation.yml: Use working-directory 2021-04-23 11:29:09 -10:00
Basssiiie 594b08c911
Rename 'Object' to 'LoadedObject' 2021-04-21 15:32:55 +02:00
Michael Steenbeek c9943ee11d
Merge pull request #14458 from Gymnasiast/backport-nsf 
Backport ride limit refactors from new-save-format
 2021-04-20 23:25:53 +02:00
Michał Janiszewski 10bc3da9b9
Improve shader compatibility with GLES (#14489) 2021-04-20 08:10:23 +02:00
Hielke Morsink 7525f5d5da
Fix #14493: isHidden broken for elements with baseheight > 32 (#14499) 2021-04-19 19:44:11 +02:00
Duncan 8eabdf8c8f
Split guest and staff peep variables (#14462) 
* Split guest and staff peep variables

* Move variable location

* Increment network version

* Update replays
 2021-04-18 17:48:21 +01:00
ceeac a8702dc2c8
Fix compile error when DEBUG_LEVEL=1 2021-04-18 12:57:46 +02:00
Michael Steenbeek 929433680d
Replace TestPaint CI with regular i686 build 2021-04-18 12:55:20 +02:00
Gymnasiast 1c5af028e1
Fix placing entrance/exit for ride ID >= 256 2021-04-16 18:56:16 +02:00
Gymnasiast d857dca36d
Replace hardcoded max number of trains per ride 2021-04-16 18:56:16 +02:00
Michael Steenbeek bbf33b6577
Fix serialisation of PlaceParkEntranceAction 2021-04-15 21:32:26 +02:00
Margen67 3a51145567
setenv: fix typo (#14477) 2021-04-14 19:34:52 -03:00
Michael Steenbeek b24cdff0fb
Merge pull request #14472 from Gymnasiast/refactor/integrate-footpath-globals 
Clean up some footpath globals
 2021-04-14 18:30:48 +02:00
Gymnasiast 084bfe0d48
Remove global from PlaceParkEntranceAction 2021-04-14 15:03:09 +02:00
Gymnasiast 5e28586a1c
Create ProvisionalFootpath struct 2021-04-14 14:56:28 +02:00
Gymnasiast 85157d8604
Move some globals to Footpath window 2021-04-14 14:31:10 +02:00
Margen67 3188865313
Script improvements (#14452) 
shebang:
 Move parameters from set.
 Add newline after for consistency.
curl:
 Add -f;
  Prevents output on error.
 Use -O where applicable;
  -o with the same filename as the URL is pointless.
 Add -S after -s:
  Makes curl still error despite being silent.
build-symbols:
 Add zip fallback.
get-discord-rpc:
 Move git clone parameters before repository for readability.
 Use --depth 1 to speed up cloning.
install-nsis:
 Use ProgramData environment variable.
build-appimage-docker.sh:
 Add -e to docker run.
 Run script directly.
build-appimage.sh:
 Make if more consistent.
Remove unused Travis scripts.
setenv:
 unset instead of blanking variables.
vstool.cmd:
 Use ProgramFiles(x86) environment variable.
 2021-04-12 19:01:15 -03:00
Hampus 1b64fc871b
Close #13805: Refactor Sign window to class (#14417) 
* Refactor window to class: Sign

Fix: Refactor window to class: Sign #13805
 2021-04-12 08:53:58 -03:00
Jacob Caudill 86e9fe6f19
Close #13788: Refactor News to new Window framework (#14404) 
* Refactor News for new Window framework
 2021-04-12 08:53:06 -03:00
Duncan a9e1f2e89c
Remove SpriteBase::flags (#14460) 
* Remove SpriteBase::flags

* Increment network version

* update replays
 2021-04-11 18:02:19 +01:00
Michał Janiszewski 7d2823d1f0
Merge pull request #14313 from adam-bloom/cmake_macos_app_bundle 
cmake macOS .app bundle
 2021-04-06 20:43:30 +02:00
adam-bloom 50c4f1c030 address feedback: use openrct2-cli for all CI runs 2021-04-05 19:18:09 -06:00
Michael Steenbeek 9b2c946484
Merge pull request #14436 from Gymnasiast/fix/14409 
Fix #14409: NPE when demolishing banner
 2021-04-03 23:39:38 +02:00
Gymnasiast 79302e88a5
Rename _tileElement to _bannerElement 2021-04-03 22:43:57 +02:00
Michael Steenbeek 7c73e271ad
Name num_sheltered_sections flags 2021-04-03 22:17:57 +02:00
Gymnasiast f5ec127eaf
Fix #14409: NPE when demolishing banner 2021-04-03 22:09:24 +02:00
Gymnasiast 943e89d5a6
Use BannerElement instead of TileElement 2021-04-03 22:07:11 +02:00
Ted John ea961aed93
Fix #14428: No text visible in in-game console window (#14429) 2021-04-03 00:12:30 +01:00
Michael Steenbeek 0e327c86e4
Fix ratings calculation taking 30 minutes 2021-04-02 22:57:36 +02:00
A.N 4d3328c7bb
Add preprocessor directives to stop unused variable/function warnings. (#14422) 2021-04-02 14:41:11 +02:00
Duncan b65f12f1cf
Use correct null value (#14421) 
* Use correct null value

* Increment network version
 2021-04-02 13:13:33 +01: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
OpenRCT2 git bot 0bb5d453a4 Merge Localisation/master into OpenRCT2/develop 2021-04-02 04:05:31 +00: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