mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 06:43:04 +01:00
Code Issues Releases Wiki Activity
17,318 Commits 8 Branches 58 Tags
2159fd282bcce723dd075c6e014974cde48c5dd2
Commit Graph

17318 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tulio Leao
2159fd282b Use ScreenCoordsXY for Window functions (#10083) 2019-10-18 17:44:26 +02:00
Denis Khabenkov
6632b979d7 Fix #9684 and #9690: Enter and keypad enter are treated as different keys 
* Remapped keypad Enter to return scancode

Fix #9684: Entering custom size for water/land tool allows confirmation
with main enter key, but not numpad enter key

Fix #9690: The keyboard shortcut for rotating the game view can be set
to Enter or KP Enter, but not both

* Add changelog entry
 2019-10-18 10:40:07 +02:00
OpenRCT2 git bot
1f3998909b Merge Localisation/master into OpenRCT2/develop. 2019-10-18 04:00:17 +00:00
Hielke Morsink
8c1ccfdaa9 Fix possible cause for desyncs on ride crashes (#10104) 
`scenario_rand` was used twice between two sequence points. The order of evaluation is unspecified in C++, meaning that these calls could be done in both forward and reverse order. Storing them in variables guarantees their order, making this cross-platform.
 2019-10-16 21:51:59 +02:00
ζeh Matt
acab73ae6a Merge pull request #10102 from ZehMatt/fix-9969 
Only temporarily set the cheat state
 2019-10-16 19:16:18 +02:00
Matt
59b71183a2 Only temporarily set the cheat state 2019-10-16 13:21:21 +02:00
Michał Janiszewski
bf18bb8161 Fixup MSVC CMake targets (#10100) 2019-10-15 23:14:00 +02:00
Michał Janiszewski
6c4f63ba58 Add define for ARM64 (#10096) 2019-10-15 06:47:49 +02:00
OpenRCT2 git bot
c8acb15189 Merge Localisation/master into OpenRCT2/develop. 2019-10-12 04:00:16 +00:00
Duncan
8539303602 Merge pull request #10078 from kodmord/ISSUE-10074 
Fix #10074: Refactor TrackDesignEntranceElement
 2019-10-11 07:17:24 +01:00
Hielke Morsink
4be85479af Fix #9985: Mistake from #9128 (#10077) 2019-10-11 07:12:49 +01:00
OpenRCT2 git bot
590b2286c1 Merge Localisation/master into OpenRCT2/develop. 2019-10-11 04:00:16 +00:00
Denis Khabenkov
4e111c66a3 Fix #10074: Refactor TrackDesignEntranceElement 2019-10-11 00:25:13 +03:00
duncanspumpkin
bb042213fd Fix #10069. Actually pass the track element flags to the new element. 
Mistake made whilst refactoring #10058. Flags were incorrectly been taken from the destination and not the source.

Refactored names to use the correct t number
 2019-10-10 18:48:05 +01:00
Denis Khabenkov
57a208d560 Fix #10064: Refactor TrackDesignEntranceElement (#10066) 
* Fix #10064: Refactor TrackDesignEntranceElement
 2019-10-10 18:23:29 +01:00
Precious, Ugo Abara
ff2a704b93 Update contributors.md (#10073) 
Contributed to the Italian translation file in OpenRCT2/Localisation
 2019-10-10 13:36:53 +01:00
Tulio Leao
b793d7e79a Avoid dereferencing map_get_first_element_at nullptr on libopenrct2 (#10013) 
* Avoid dereferencing map_get_first_element_at nullptr on Map.cpp

* Avoid dereferencing map_get_first_element_at nullptr on MapAnimation.cpp

Returning true or internal control variable, based on what was seen on `map_animation_invalidate_track_onridephoto`

* Avoid dereferencing map_get_first_element_at nullptr on Park.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Scenery.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Sprite.cpp

* Avoid dereferencing map_get_first_element_at nullptr on TileInspector.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Wall.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Fountain.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Footpath.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Entrance.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Banner.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Vehicle.cpp

* Avoid dereferencing map_get_first_element_at nullptr on TrackDesignSave.cpp

* Avoid dereferencing map_get_first_element_at nullptr on TrackDesign.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Track.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Station.cpp

* Avoid dereferencing map_get_first_element_at nullptr on RideRatings.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Ride.cpp

* Avoid dereferencing map_get_first_element_at nullptr on S4Importer.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Staff.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Peep.cpp

* Avoid dereferencing map_get_first_element_at nullptr on GuestPathfinding.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Guest.cpp

* Avoid dereferencing map_get_first_element_at nullptr on VirtualFloor.cpp

* Avoid dereferencing map_get_first_element_at nullptr on Paint.TileElement.cpp

* Fix issues raised on review

* Fix remaining review issues.

* Early exit on loops if tileElement is nullptr

* Fix clang-format issues
 2019-10-09 15:02:21 +01:00
Duncan
0a00f62e3a Merge pull request #10059 from tupaschoal/track-design-maze-element 
Create TrackDesignMazeElement struct
 2019-10-09 05:22:03 +01:00
Tulio Leao
3f21933d5b Fix clang-format issue. 2019-10-08 18:22:02 -03:00
Tulio Leao
121585578e Remove implicit conversion constructor 2019-10-08 18:22:02 -03:00
Tulio Leao
7193ba1bb7 Create TrackDesignMazElement struct 
Closes #10053
 2019-10-08 18:21:58 -03:00
Tulio Leao
6be7c42a3d Close #10051: Create TrackDesignSceneryElement 2019-10-08 17:13:34 +02:00
ζeh Matt
dd6d028c5b Merge pull request #10061 from tupaschoal/nullptr-deref-consistency 
Make check for map_get_nth_element_at consistent
 2019-10-08 17:08:52 +02:00
Michael Steenbeek
77ce09a706 Merge pull request #10058 from tupaschoal/track-design-track-element 
Create TrackDesignTrackElement struct
 2019-10-08 16:11:09 +02:00
Tulio Leao
4a817b88d9 Make check for map_get_nth_element_at consistent 
Most places compare to `nullptr` explicitly, thus changed the ones that didn't.

Also moved one call that might have been superfluous if `offset == 0`
 2019-10-08 08:06:46 -03:00
Tulio Leao
68ce43308e Remove implicit conversion constructor 2019-10-08 07:48:03 -03:00
Tulio Leao
ff57f43996 Create TrackDesignTrackElement struct 
Closes #10054
 2019-10-08 07:47:56 -03:00
Duncan
ee0025987a Merge pull request #10056 from duncanspumpkin/refactor 
Refactor
 2019-10-08 09:26:43 +01:00
Duncan
2afead2f60 Merge pull request #10057 from kodmord/ISSUE-10052 
Fix #10052: Create a TrackDesignEntranceElement struct to replace rct_td6_entrance_element
 2019-10-08 07:17:18 +01:00
Denis Khabenkov
c614532d04 Add yourself to the contributors.md 2019-10-07 23:44:12 +03:00
Denis Khabenkov
163221520b Delete assert and size information 2019-10-07 22:26:16 +03:00
Denis Khabenkov
de53ac84b8 Fix #10052: Create a TrackDesignEntranceElement struct to replace rct_td6_entrance_element 2019-10-07 21:59:07 +03:00
duncanspumpkin
2c5ff4a0d1 Rename variables 2019-10-07 18:56:31 +01:00
duncanspumpkin
213ba15ba5 Remove unused code and variables from function 2019-10-07 18:36:27 +01:00
duncanspumpkin
f10e4dc6b9 Remove unused variables from function call 2019-10-07 18:33:51 +01:00
OpenRCT2 git bot
7df9344d09 Merge Localisation/master into OpenRCT2/develop. 2019-10-07 04:00:16 +00:00
ζeh Matt
be038a893f Merge pull request #10045 from ZehMatt/fix-9994 
Fix #9994: Game action tick collision during server connect and map load
 2019-10-06 14:27:12 +02:00
Matt
e149b8c051 Update changelog.txt 2019-10-05 13:14:21 +02:00
Matt
884611c20b Bump up network version 2019-10-05 13:13:44 +02:00
Matt
0c11bbd4e7 Fix #9994: Game action tick collision during server connect and map load 2019-10-05 13:09:21 +02:00
ζeh Matt
e4a2b1f9c5 Fix #9953: Crash when hacked rides attempt to find the closest mechanic 2019-10-03 23:08:40 +02:00
Michael Steenbeek
5b41afa02b Merge pull request #9969 from crorvig/crorvig/fix-9955-allow-resize-in-pause-mode 
Allow sandbox mode map resize in pause mode #9955
 2019-10-03 22:53:19 +02:00
Gymnasiast
d5866e1d14 Update changelog [ci skip] 2019-10-03 22:27:19 +02:00
Gymnasiast
db5c018e22 Add requested check 2019-10-03 22:26:08 +02:00
crorvig
7f54ba0be7 Set BuildInPauseMode to true during map_remove_out_of_range_elements() 
Set BuildInPauseMode to true during map_remove_out_of_range_elements()
 2019-10-03 22:26:08 +02:00
crorvig
ed1dfa39c2 Fix #9955 Allow resizing of map in pause mode 
Prevents infinite loop by forcing BuildInPauseMode on for the duration
of the map_remove_out_of_range_elements() call.
 2019-10-03 22:26:08 +02:00
ζeh Matt
a39bd39268 Fix #10036: Do not allocate large chunks of memory for save file classification (#10040) 2019-10-03 17:36:58 +02:00
Krutonium
272fc929d1 Add a bit more explanation to build instructions 2019-10-03 17:36:30 +02:00
ζeh Matt
0b95dcd0d0 Fix #8584: Duck spawn search now uses entire map (#9743) 2019-10-02 22:14:56 +02:00
Ted John
15767c3be3 Fix output result of remove_unused_objects (#10029) 2019-10-01 22:30:11 +02:00