mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 08:45:00 +01:00
Code Issues Releases Wiki Activity
22,619 Commits 8 Branches 59 Tags
ff909cc28654d27691794de6c3385f4e9cd1e3fe
Commit Graph

22619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
fff98a88d4 Merge branch 'develop' 2019-10-28 21:12:02 +01:00
Ted John
85bd3f6be6 Add GitHub action for building AppImage (#10155) 2019-10-28 20:53:45 +01:00
Krisztián Csordás
8f7c95e425 Fix SDL_Texture double free (#10156) 
Double freeing of SDL_Texture caused assertion failure when calling
HardwareDisplayDrawingEngine::SetVSync. According to SDL documentation,
SDL_DestroyRenderer frees the associated textures.
 2019-10-28 20:43:22 +01:00
Michał Janiszewski
2d443b591f Unconditionally deploy builds to transfer.sh (#10152) 
We seem to be having trouble publishing our builds and they can get
lost. To address this at least partially, upload all the builds to
transfer.sh
 2019-10-27 23:13:05 +01:00
ζeh Matt
040a0e58aa Fix desync in headless mode with rides that create smoke particles 2019-10-27 16:55:34 +01:00
OpenRCT2 git bot
673a43b560 Merge Localisation/master into OpenRCT2/develop. 2019-10-27 04:00:22 +00:00
Krisztián Csordás
7bbb5110b7 Refactor vehicle_visual_virginia_reel 2019-10-26 16:41:06 +02:00
OpenRCT2 git bot
e9bcad193a Merge Localisation/master into OpenRCT2/develop. 2019-10-24 04:00:22 +00:00
OpenRCT2 git bot
43cb570aeb Merge Localisation/master into OpenRCT2/develop. 2019-10-22 04:00:15 +00:00
Tom Lankhorst
6eea943083 Pass SDL_WINDOW_ALLOW_HIGHDPI to SDL_CreateWindow (#10125) 2019-10-21 22:36:05 +02:00
Duncan
28e7d90efb Merge pull request #10127 from tupaschoal/fix-10126 
Fix #10126: window movement inversed
 2019-10-21 07:46:02 +01:00
Tulio Leao
6c35a0234e Fix CoordsXY sum and subtract operators (#10128) 2019-10-21 07:23:01 +02:00
OpenRCT2 git bot
1d8f56ca80 Merge Localisation/master into OpenRCT2/develop. 2019-10-21 04:00:16 +00:00
Tulio Leao
08db611dd5 Fix #10126: window movement inversed 2019-10-20 23:44:26 -03:00
Tulio Leao
5f916b79ae Use ScreenCoordsXY for MouseInput (#10120) 2019-10-20 19:10:30 +02:00
Michael Steenbeek
f79667d842 Fix #9995: User strings with umlauts not imported correctly 2019-10-20 19:03:09 +02:00
duncanspumpkin
a91098de05 minor correction 2019-10-20 16:07:34 +01:00
duncanspumpkin
ee64892f4b Clang format 2019-10-20 15:47:45 +01:00
duncanspumpkin
5842b851c2 Remove old game command for MazePlaceTrack 2019-10-20 15:23:36 +01:00
duncanspumpkin
783ae13538 Add MazePlaceTrackAction 
This game action had been accidently assumed to be hard to do. Woops.
 2019-10-20 15:21:49 +01:00
Matt
6dd00787f6 Add missing static keywords 2019-10-20 14:13:59 +02:00
Matt
3d7c06f4b3 Change fopen_s to fopen and use EXPECT_EQ for COMPARE_FIELD 2019-10-20 14:13:59 +02:00
Matt
e6d520e371 Add missing include 2019-10-20 13:49:39 +02:00
Matt
8243c2b64e Update CMakeLists.txt 2019-10-20 13:49:39 +02:00
Matt
6177255991 Add S6 Import/Export test and remove old NetworkLoadSave test 2019-10-20 13:49:35 +02:00
Duncan
86474df361 Merge pull request #10097 from ZehMatt/duck-managment 
Duck improvements and fixes
 2019-10-20 07:35:07 +01:00
Matt
666158df1c Bump up network version 2019-10-20 00:22:11 +02:00
Matt
07f401baa2 Use unsigned type for scenario_rand results 2019-10-20 00:21:19 +02:00
Matt
0615ebc56a Revert accident 2019-10-20 00:21:19 +02:00
Matt
6dbbc86ee1 Allow rendering of ducks with zoom level 1 2019-10-20 00:21:19 +02:00
Matt
365c7c6f51 Use better variable name 2019-10-20 00:21:19 +02:00
Matt
b6cd566051 Update language/en-GB.txt 2019-10-20 00:21:19 +02:00
Matt
70d37fe8f9 Fix ducks asserting due to invalid position 2019-10-20 00:21:18 +02:00
Matt
ac30e35dfa Fix crash when ducks try to navigate out of bounds 2019-10-20 00:21:18 +02:00
Matt
01ea0ae366 Fix duck removal not invalidating screen 2019-10-20 00:21:18 +02:00
Matt
477347b6d4 Implement 'Remove Ducks' cheat 2019-10-20 00:21:18 +02:00
Matt
7fa41bb82d Implement 'Create Ducks' cheat 2019-10-20 00:21:18 +02:00
Hielke Morsink
2e090493f2 Use white colour for labels in Tile Inspector (#10076) 
The DARK_GREEN colour comes from the days of hardcoded numbers, where it was most likely copied from somewhere else.
 2019-10-19 18:12:00 +02:00
Duncan
0f659794d0 Fix #10108. Import/Export smoke particles correctly to stop desync (#10113) 
Mistake made whilst refactoring import/export caused steam particiles to have the wrong information for each of its fields. This manifestied on multiplayer games causing an immediate desync.
 2019-10-19 18:11:20 +02:00
Duncan
7546c846df Name functions and remove dead code 
The dead code removed has been removed already from the draw sprite. Should have removed it from interaction at the same time.
 2019-10-19 17:21:08 +02:00
Tulio Leao
dbb66dd028 Remove duplicate functions (#10067) 
* Reduce code duplication in src\openrct2\interface\Window.cpp

`window_resize_gui_scenario_editor` was a subset of `window_resize_gui`

* Reduce code duplication in src\openrct2\network\Twitch.cpp

Both `GetFollowers()` and `GetMessage()` were very similar

* Reduce code duplication in src/openrct2/world/SmallScenery.cpp

`map_place_non_scenery_clear_func` and `map_place_scenery_clear_func` did basically the same thing, with a single branch difference

* Reduce code duplication in src/openrct2-ui/windows/TopToolbar.cpp

Make `top_toolbar_tool_update_scenery_clear` call `top_toolbar_tool_update_land_paint` and then do the additional differing calculation it did.
 2019-10-19 15:38:26 +02:00
Duncan
9ad15e398b Merge pull request #10091 from tupaschoal/nullprt-deref-avoid-get_first_at 
Avoid dereferencing invalid map_get_first_element_at return
 2019-10-19 13:55:54 +02:00
Tulio Leao
ce1f38da25 Use ScreenCoordsXY for window functions (#10086) 
* Use ScreenCoordsXY for window_create function

* Use ScreenCoordsXY for window_find_from_point function

* Use ScreenCoordsXY for window_find_widget_from_point

* Use ScreenCoordsXY for ride_contruction_tool*

* Use ScreenCoordsXY for window_event_tool*

* Use ScreenCoordsXY for window_event_scroll_mouse*

* Use ScreenCoordsXY for remaining window_event*

* Use ScreenCoordsXY for window_(set|move)_position
 2019-10-19 13:07:03 +02:00
Tulio Leao
35577f5b19 Avoid dereferencing invalid map_get_first_element_at return 2019-10-19 07:54:31 -03:00
Duncan
c3e14328f1 Little Refactor (#10075) 
* Correct the label for track elem 255.

* Catch last little change
 2019-10-19 10:00:42 +02:00
Duncan
a491543e17 Merge pull request #10107 from tupaschoal/fix-powered-not-passing-station 
Fix #10106: Reset number of circuits if unsupported
 2019-10-19 09:54:27 +02:00
Duncan
b24a6fe2b6 Merge pull request #10090 from tupaschoal/coords-for-keyboard 
Use ScreenCoordsXY for Keyboard shortcuts
 2019-10-19 09:41:33 +02:00
Tulio Leao
88dfff5f5e Use ScreenCoordsXY for Keyboard shortcuts 2019-10-18 18:36:18 -03:00
Tulio Leao
9d468167e4 Fix #10106: Reset number of circuits if unsupported 
Closes #10106
 2019-10-18 18:06:51 -03:00
Tulio Leao
e1a9e6005d Use ScreenCoordsXY for Chat functions (#10084) 2019-10-18 17:57:31 +02:00