mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity
20940 commits 10 branches 46 tags 396 MiB
Commit graph

20940 commits

This branch
This branch
All branches
Author SHA1 Message Date
adam-bloom
238a46fe5f fix finding of discord-rpc 2021-02-28 15:48:30 -07:00
adam-bloom
9efe184538 macOS cmake CI fixes 
Use ninja instead of make for faster builds
Proper library linking of dependencies
 2021-02-28 15:48:30 -07:00
adam-bloom
f51fea47df Point Xcode and cmake at new dependencies 
Update Xcode project to handle new library file names

Remove static discord-rpc library from Xcode build,
use dylib instead
 2021-02-28 15:48:30 -07:00
adam-bloom
9d64df3a89 install in local folder and archive in CI 2021-02-28 15:48:30 -07:00
adam-bloom
29c37b8ae4 enable discord-rpc from vcpkg dependencies 2021-02-28 15:48:30 -07:00
adam-bloom
0caea5460e clarify that macOS builds are x64 (not arm64 yet) 2021-02-28 15:48:30 -07:00
adam-bloom
b726177ea7 build macOS with make instead of ninja 2021-02-28 15:48:30 -07:00
adam-bloom
db99a90d15 add macOS cmake CI run 2021-02-28 15:48:30 -07:00
adam-bloom
c79809215c Add capability to use vcpkg packaged dependencies for macOS 
This is on by default. If disabled, CMake will look for dependencies
in the standard system paths as usual. If enabled, the dependency zip
file will be downloaded (if out of date) and the vcpkg packaged
dependencies from https://github.com/OpenRCT2/Dependencies will be used.
 2021-02-28 15:48:29 -07:00
adam-bloom
7bea24708e Fix GetBundlePath, add install paths to match cmake install 2021-02-28 15:48:29 -07:00
adam-bloom
fb316a746a macos support (use perl for readlink -f) 2021-02-28 15:48:29 -07:00
Adam
81fe5ad2cd
Remove unused const: MusicStyleNames 2021-02-28 22:57:23 +01:00
Michael Steenbeek
21777210bc
Merge pull request #14189 from Gymnasiast/refactor/draw-text 
Refactor text drawing
 2021-02-28 22:40:54 +01:00
Gymnasiast
a0523339d3
Apply review request 2021-02-28 21:24:17 +01:00
Gymnasiast
d6971fa79e
Fix rebase errors 2021-02-28 00:35:38 +01:00
Gymnasiast
7fd049c22e
Remove last remnants of gCurrentFontSpriteBase 2021-02-28 00:26:53 +01:00
Gymnasiast
c40701d997
Make gfx_draw_string() take a TextPaint argument 2021-02-28 00:26:20 +01:00
Gymnasiast
503273793a
Remove gCurrentFontSpriteBase from some functions 2021-02-28 00:26:20 +01:00
Gymnasiast
826f6c7442
Reduce usage of gCurrentFontSpriteBase 2021-02-28 00:25:30 +01:00
Gymnasiast
3e536e2711
Change gfx_draw_string_*_wrapped() to DrawTextWrapped() 2021-02-28 00:23:01 +01:00
Gymnasiast
e2ebc9d43b
Replace gfx_draw_string_left() with DrawTextBasic() 2021-02-28 00:23:00 +01:00
Gymnasiast
d5f79b7972
Replace gfx_draw_string_centred() with DrawTextBasic() 2021-02-28 00:23:00 +01:00
Gymnasiast
a4747b9c8c
Fix initial value of SpriteBase 2021-02-28 00:23:00 +01:00
Gymnasiast
4d9c278ebc
Unify calls to DrawTextBasic 2021-02-28 00:23:00 +01:00
Gymnasiast
13e7ec6e8e
Allow passing TextPaint to DrawTextBasic() 2021-02-28 00:23:00 +01:00
Gymnasiast
ac1e9abb56
Create constructors for TextPaint 2021-02-28 00:23:00 +01:00
Gymnasiast
c296c35f39
Use colour_t for colours enum 2021-02-28 00:23:00 +01:00
Gymnasiast
2477933c51
Turn font sprite base into a strong enum 2021-02-28 00:23:00 +01:00
Gymnasiast
582037bbf3
Create enum class for text underline 2021-02-28 00:23:00 +01:00
Ted John
314faa69ca Save user shortcuts after removing a binding 2021-02-27 15:51:26 +00:00
Ted John
1ee72ffd21 Fix #14184: Right and down arrow swapped 
Incorrect order of legacy shortcut IDs.
 2021-02-27 15:51:05 +00:00
Ted John
ce11d1eb2f Add missing property trackLocation to openrct2.d.ts 2021-02-27 02:44:00 +00:00
Ted John
31a30c0307 Fix lint errors in openrct2.d.ts 2021-02-27 02:20:47 +00:00
Ted John
49b677780f
Merge pull request #14171 from IntelOrca/plugin/custom-widget 
* Add API for getting network traffic statistics.
* Add API for creating custom widgets.
* Add API for drawing graphics for custom widgets.
* Add click event to spinners and allow them to be held down.
 2021-02-27 01:31:00 +00:00
Michael Steenbeek
08f07e6135
Reduce usage of gCurrentFontSpriteBase (#14178) 2021-02-26 15:39:20 +01:00
Michael Steenbeek
9397feaa44
Merge pull request #14134 from duncanspumpkin/reorg_entityexport 
Rework how entity export works to allow for easier changes in future
 2021-02-26 13:08:56 +01:00
Michael Steenbeek
28c680f97f
Merge pull request #14163 from Gymnasiast/refactor/get-rtd 
Use GetRideTypeDescriptor() in more places
 2021-02-26 10:46:38 +01:00
Gymnasiast
48f513f73f
Apply review request; fix Testpaint 2021-02-26 10:19:03 +01:00
Gymnasiast
44d0e77afb
Make all access to RTD table use the bounds checking function 2021-02-26 10:01:00 +01:00
Gymnasiast
62f8796677
Replace more flag checking 2021-02-26 09:51:17 +01:00
Gymnasiast
f118b2ede4
Replace ride_type_has_flag() with retrieving RTD 2021-02-26 09:49:09 +01:00
OpenRCT2 git bot
03d6771cce Merge Localisation/master into OpenRCT2/develop 2021-02-26 04:05:52 +00:00
Ted John
e000f06442 Remove holdable flag from spinner widget 2021-02-25 22:30:35 +00:00
Gymnasiast
b1ab20ec27
Replace loose flag checking with helper function 2021-02-25 23:04:40 +01:00
Ted John
f7650fdfbc Fix CI failure 2021-02-25 18:47:54 +00:00
Michał Janiszewski
6340b1248c
Merge pull request #14146 from janisozaur/reduce-includes 
Reduce inclusion of Vehicle.h
 2021-02-25 16:51:43 +01:00
Michał Janiszewski
ac6e4fc0d6 Move SPRITE_INDEX_NULL, MAX_SPRITES to their new homes 2021-02-25 10:56:27 +01:00
Michał Janiszewski
67b61478cf Reduce inclusion of EntityList.h 2021-02-25 10:56:27 +01:00
Michał Janiszewski
6baff43f52 Reduce inclusion of Sprite.h 2021-02-25 10:56:27 +01:00
Michał Janiszewski
24f0407740 Add missing include in Windows. cpp 2021-02-25 10:56:27 +01:00