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

21009 Commits

Author SHA1 Message Date
Michał Janiszewski d67dce0fe2 Use ccache on macos-cmake CI jobs 2021-03-01 22:15:00 +01:00
Michael Steenbeek c98746c910
Fix #14206: Text runs out of Ride window 
For some reason, the window used `gfx_draw_text_centred_wrapped()` before.
 2021-03-01 20:31:15 +01:00
Ted John d3e54bb579
Merge pull request #14191 from IntelOrca/fix/14190-shortcut-crash 
Fix #14190: Game crash likely related to plug-in hotkeys
Fix #14194: Pressing WASD in text box moves main viewport, too
Fix #14195: Binding (NumPad) Enter to send message closes the chat
 2021-03-01 14:13:45 +00:00
Michael Steenbeek e40c0af9fd
Merge pull request #13682 from adam-bloom/macos_cmake_dylib 
macOS CMake with vcpkg dependencies
 2021-03-01 14:53:37 +01:00
Michał Janiszewski ff3d31b7cf
Merge pull request #14203 from janisozaur/unused-const-variable 
Add unused-const-variable warning
 2021-03-01 12:55:54 +01:00
OpenRCT2 git bot 723aa9b654 Merge Localisation/master into OpenRCT2/develop 2021-03-01 04:06:01 +00:00
adam-bloom 42472b423e macOS CMake build instructions in readme 2021-02-28 15:48:30 -07:00
adam-bloom 174297b6fc OpenRCT2/Dependencies v28 2021-02-28 15:48:30 -07:00
adam-bloom d1057d66fc fix mingw builds 2021-02-28 15:48:30 -07:00
adam-bloom f6edf8d601 fix static library name for PkgConfig 2021-02-28 15:48:30 -07:00
adam-bloom 27726eac62 enable discord RPC, now that it can be found 2021-02-28 15:48:30 -07:00
adam-bloom d73004357e fix install rpath with DESTDIR 2021-02-28 15:48:30 -07:00
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
Michał Janiszewski f3ed018818 Add unused-const-variable warning 2021-02-28 23:10:25 +01:00
Michał Janiszewski 6249635fb8 Guard potentially unused const with proper defines 2021-02-28 23:10:25 +01: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
Ted John 083d22adf2 Fix #14195: Binding (NumPad) Enter to send message closes the chat 2021-02-28 14:08:16 +00:00
Ted John 789b04b4aa Fix #14194: Pressing WASD in text box moves main viewport, too 2021-02-28 14:07:56 +00:00
Ted John 17a29dfe87 Fix #14190: Game crash likely related to plug-in hotkeys 
Do not cache references to RegisteredShortcut as they can be invalidated when new shortcuts are registered / removed.
Use a map to improve query performance of shortcut by ID.
Store a separate list of strings for the map to use as a key.
 2021-02-28 01:13:43 +00: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