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

18984 Commits

Author SHA1 Message Date
Gymnasiast ae194192d6
Clean up calls to MoveTo 2020-05-13 10:47:33 +02:00
Gymnasiast 11472f909d
Convert sprite_move to method 2020-05-13 10:47:32 +02:00
Duncan f04f62305d
Merge pull request #11718 from MegaMech/patch-1 
Added check to prevent overflow assertion error
 2020-05-13 07:58:02 +01:00
Ted John 0d0349fc09
Allow plugins to update dropdown items (#11735) 2020-05-12 21:10:07 -03:00
Michael Steenbeek 666d39cee5
Fix log_warning statement 2020-05-13 00:37:44 +02:00
MegaMech 1f2eec13dd
Added check to prevent overflow assertion error 2020-05-13 00:35:09 +02:00
Michael Steenbeek 1b242d825c
Fix Text Input window colours (#11736) 
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but https://github.com/OpenRCT2/OpenRCT2/pull/11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
 2020-05-13 00:31:24 +02:00
Michael Steenbeek 70f3b9cd8e
Merge pull request #11732 from IntelOrca/fix/11730-11731 
Fix #11730, 11731: invalid read / write in plugin code
 2020-05-12 22:56:13 +02:00
Ted John b3c4dd4844 Fix invalidation of list view widget 2020-05-12 21:03:21 +01:00
Ted John 86fa2f3714 Fix #11730: invalid write in CustomListView::SortItems 2020-05-12 20:57:26 +01:00
Ted John c4502df947 Fix #11731: invalid read in ScWindow::x_get 2020-05-12 18:53:37 +01:00
Duncan 53b627432d
Merge pull request #11596 from AaronVanGeffen/cmake/duktape 
Fix #11576: Add duktapeConfig.cmake
 2020-05-12 16:45:59 +01:00
Michael Steenbeek e9fc50d435
Remove NEW_BLOCK_BRAKES define (#11727) 
This define was never enabled, because this "new block brake" behaviour (i.e. not braking at all if the brake was open) was too different from the old behaviour to be useful.
Its intended purpose will be handled by adding actual speed settings on block brakes in the future.

This commit removes the define, and also removes the second parameter to apply_non_stop_block_brake(), which is now always true.
 2020-05-12 16:29:15 +02:00
Aaron van Geffen 6edf9b03e0 Add duktapeConfig.cmake to ease configuration. 
Used for reference:
https://github.com/microsoft/vcpkg/blob/master/ports/duktape/duktapeConfig.cmake.in
 2020-05-12 15:13:14 +02:00
stalefishies 9c26c9776b
Fix plugin dropdown widget items not appearing (#11729) 
Commit e182791 (mistakenly?) removed the code to populate the custom
dropdown widget's items from the list of strings passed in from the
plugin. This replaces that code.
 2020-05-12 08:21:43 -03:00
OpenRCT2 git bot 6e61d392aa Merge Localisation/master into OpenRCT2/develop. 2020-05-12 04:01:53 +00:00
Michael Steenbeek 451af76fb6
Remove nonfunctional "guest is lost" notification (#11722) 2020-05-11 21:31:02 +02:00
Duncan 79dda7260a
Fix #11695. Mechanics walking to 0,0 on entrance only (#11704) 
Mistake made when refactoring that meant that null locations were converted into tile 0, 0. I've fixed the general case but it is preferred to try avoid using null states for coordinates if at all possible.
 2020-05-11 20:28:40 +02:00
Michael Steenbeek 89011b105f
Merge pull request #11724 from Gymnasiast/refactor/shop-item 
Refactor shop items
 2020-05-11 20:10:34 +02:00
Gymnasiast b46437ccde
Make common price functions take const 2020-05-11 19:22:25 +02:00
Gymnasiast af1180a484
Make ShopItemDescriptor::HasFlag take const 2020-05-11 19:21:25 +02:00
Gymnasiast 15b5d97795
Refactor shop items 2020-05-11 19:16:23 +02:00
Michael Steenbeek d7637cd70f
Replace many C-style casts (#11720) 2020-05-11 14:32:56 +02:00
Michael Steenbeek a261b4ce33
Remove commented out code (#11721) 2020-05-11 13:54:15 +02:00
OpenRCT2 git bot 0f35fae148 Merge Localisation/master into OpenRCT2/develop. 2020-05-11 04:01:53 +00:00
relic-automaton 3e39e2d0db
[Plugin] Add a script hook for ride ratings calculation (#11698) 
The hook is called after ride rating calculation is complete and allows
scripts to override the ratings.
 2020-05-10 23:26:10 -03:00
Ted John 35e039c65d
Call tick and day plugin hook at the end of the update routine (#11713) 2020-05-10 23:24:15 -03:00
stalefishies 8aaf8d0156
Fix error on windows due to upkeep narrowing (#11711) 
Running msbuild openrct2.proj /t:build /p:platform=x64 gave warning
C4309, which is to do with narrowing on a type conversion. This replaces
static_cast<money16>(0xFFFF) with MONEY16_UNDEFINED (which is
static_cast<money16>(static_cast<uint16_t>(0xFFFF)) ).
 2020-05-10 19:58:01 -03:00
Ted John e182791a6b
Merge pull request #11685 from IntelOrca/plugin/listview-widget 
[Plugin] Implement the list view widget
 2020-05-10 22:36:44 +01:00
Hielke Morsink cb62e1a320
Add missing return type to typescript definitions (#11708) 2020-05-10 23:20:11 +02:00
hdpoliveira 46d856a723
Extract function news_item_first_open_queue_slot (#11594) 2020-05-10 23:19:56 +02:00
Michael Steenbeek 142b229bfa
en-GB: Fix another trailing whitespace 2020-05-10 23:16:30 +02:00
Michael Steenbeek ed47bb7414
en-GB: Fix trailing whitespace 2020-05-10 23:14:23 +02:00
Tulio Leao ed84c2dab0
Fix #11705: Drawing tooltips out of box (#11707) 2020-05-10 15:22:47 -03:00
Ted John b96fdee531
Add plugin API to remove entities (#11702) 2020-05-10 14:07:27 -03:00
Ted John ec06a9ca4b
Add plugin API for showing an error message (#11706) 2020-05-10 14:06:31 -03:00
Ted John 5288caec02
[Plugin] Add support for SetCheatAction and cheat retrieval (#11700) 
* Add cheats interface API

* Add plugin support for SetCheatAction

* Remove ctx from ScCheats
 2020-05-10 13:02:10 -03:00
Tom Lankhorst 2d0e7bdfd8
openrct2-ui Audio clean-up and style/usage fixes (#10115) 
* openrct2-ui Audio clean-up and style/usage fixes



Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-05-10 10:05:26 -03:00
TomasZilinek 9fde6a74c3
Close #11561: Use ScreenCoordsXY in gfx_draw_string() 
* Fix #11572 create gfx_draw_string() overload

created the overload and changed all calls of the old function to the new (using const ScreenCoordsXY&)

...
 2020-05-10 09:49:15 -03:00
Michael Steenbeek 783494df68
Use rotated calls in GhostTrain.cpp (#11691) 2020-05-10 12:49:02 +02:00
Michael Steenbeek d5f2168b22
Merge pull request #11653 from Gymnasiast/refactor/window-skeleton 
Introduce WINDOW_SHIM define
 2020-05-10 11:34:21 +02:00
frutiemax c447cde63c
Close #11561: Use ScreenCoordsXY in gfx_draw_string_centred_wrapped() 
* Add gfx_draw_string_centred_wrapped overload using ScreenCoordsXY

* Update calls to gfx_draw_string_centred_wrapped

* Remove old signature of gfx_draw_string_centred_wrapped

* Meaningful coordinate variable names and constructor calls
 2020-05-10 01:00:26 -03:00
Michael Steenbeek fa91b4091f
Name tunnel constants (#11694) 2020-05-09 23:54:47 +02:00
Michael Steenbeek 2770668752 Fix Xcode project 2020-05-09 20:24:48 +02:00
Gymnasiast b942d24bcf
Fix WW and WH for some windows 2020-05-09 19:08:00 +02:00
Ted John cc759e0bce Improve selected highlight on list view 2020-05-09 17:24:16 +01:00
Ted John f492827c8a Implement horizontal scrollbars and fix resizing 2020-05-09 17:24:16 +01:00
Ted John 41950d75f0 Implement scrollbars field on list view 2020-05-09 17:24:16 +01:00
Ted John 092fee076d Remove unimplemented APIs for list view 2020-05-09 17:24:15 +01:00
Ted John 5e7cf3bf96 Fix rebase 2020-05-09 17:24:15 +01:00