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

17195 Commits

Author SHA1 Message Date
duncanspumpkin b77f15c4b7 Refactor map_get_highest_z to use CoordsXY 2019-08-19 20:04:59 +01:00
duncanspumpkin a3ad551d10 Refactor clear_elements_at to use CoordsXY 2019-08-19 20:04:58 +01:00
duncanspumpkin 9ef6c8d2b4 Remove coordinate_3d_to_2d. 2019-08-19 20:04:58 +01:00
duncanspumpkin 37de01a10d Replace coordiante_3d_to_2d with CoordsXYZ equivelent 2019-08-19 20:04:58 +01:00
duncanspumpkin 37ef48890f Move various to use CoordsXYZ funcs instead of LocationXYZ 2019-08-19 20:04:58 +01:00
duncanspumpkin 6da5eb9d30 Use coordsXYZ for audio_get_params_from_location 2019-08-19 20:04:58 +01:00
duncanspumpkin 5fe5f8e964 Refactor audio_play_sound_at_location to use CoordsXYZ 2019-08-19 20:04:58 +01:00
duncanspumpkin 927c8a4e85 Create ScreenCoords struct. Refactor 3d_to_2d again 2019-08-19 20:04:58 +01:00
duncanspumpkin 539ef5150a Refactor map_get_bounding_box to use maprange and remove duplicate code 2019-08-19 20:04:58 +01:00
duncanspumpkin 9472c6b1ed Remove duplicate code. Move translate_3d_to_2d to use CoordsXY 2019-08-19 20:04:58 +01:00
duncanspumpkin af39ff20af Refactor to use new inheritence and remove duplicate/redundant code 2019-08-19 20:04:58 +01:00
duncanspumpkin cd81c1b45b Make CoordsXYZ derive from CoordsXY 2019-08-19 20:04:58 +01:00
duncanspumpkin bc12618d46 Clang format 2019-08-19 20:04:57 +01:00
duncanspumpkin fb8c42f3c2 Fix #9557. Refactor map_is_location_at_edge and tile_element_insert 2019-08-19 20:04:57 +01:00
duncanspumpkin f3db7f877a Refactor tile_element_water_height to take CoordsXY 2019-08-19 20:04:57 +01:00
duncanspumpkin 5b92b64ec7 Refactor map_get_path_element_at to return PathElement and use CoordsXYZ 2019-08-19 20:04:57 +01:00
duncanspumpkin c6452095ca Refactor tile_element_height to use CoordsXY 2019-08-19 20:04:57 +01:00
duncanspumpkin 5ba9d55415 Refactor map_is_location_owned_or_has_rights to use CoordsXY 2019-08-19 20:04:57 +01:00
duncanspumpkin 0a1cb68328 Refactor map_can_build_at to use CoordsXYZ 2019-08-19 20:04:56 +01:00
duncanspumpkin 5333dc4295 Return a SurfaceElement from get_surface_element 2019-08-19 20:04:56 +01:00
duncanspumpkin 140f406714 Fix mistake 2019-08-19 20:04:56 +01:00
duncanspumpkin 9619fd384d Refactor map_is_location_owned to use CoordsXYZ 2019-08-19 20:04:56 +01:00
Gymnasiast 386e6a20a9
Bump network version 2019-08-19 20:39:24 +02:00
Gymnasiast 4c684031bf
Remove game command remnant in Tile Inspector 2019-08-19 20:38:48 +02:00
r0 54dc91511e Avoid redefining JobPool::AddTask 2019-08-19 19:03:27 +02:00
Gymnasiast 7d2a7deb28
Fix tile element size comment [ci skip] 2019-08-19 18:52:30 +02:00
Michael Steenbeek 90cc885642
Merge pull request #9903 from Gymnasiast/tile-element-16 
Extend tile element size to 16 bytes
 2019-08-18 22:57:48 +02:00
Gymnasiast aae2b24a7f
Fix 'unused private field' warnings 2019-08-18 19:53:01 +02:00
Gymnasiast bf1f14b441
Correct memcpy usage 2019-08-18 19:46:44 +02:00
Gymnasiast 26b2809175
Move extra padding to derived tile elements 2019-08-18 18:28:01 +02:00
Gymnasiast 169d2980ca
Properly export tile elements to S6 2019-08-18 18:20:56 +02:00
Gymnasiast 18844f9244
Fix formatting [ci skip] 2019-08-18 14:36:16 +02:00
Gymnasiast 255ce3f62b
Extend tile element size to 16 bytes 2019-08-18 14:03:36 +02:00
Ted John a094c5b0ce Create RCT2 version of ride rating calc data (#9751) 2019-08-18 12:53:56 +02:00
Michael Steenbeek cf38875bde
Merge pull request #9901 from duncanspumpkin/fix_9533 
Fix #9533: Door sounds not playing
 2019-08-18 12:32:47 +02:00
Gymnasiast 1f4d721a2b
Update changelog [ci skip] 2019-08-18 12:05:26 +02:00
Gymnasiast 7919e91716
Update objects to v1.0.12 2019-08-18 11:59:56 +02:00
Gymnasiast f1ad9c4ec8
Fix doorsound of legacy object 2019-08-18 11:59:56 +02:00
duncanspumpkin 1ee2063cef Partial fix of #9533. Door sounds not playing 
Will now look for correct field. But many json objects do not have this
field set correctly.
 2019-08-18 09:34:34 +01:00
Duncan 406ec7ff32
Merge pull request #9889 from duncanspumpkin/fix_9885 
Fix track design crashes
 2019-08-17 11:59:55 +01:00
duncanspumpkin 486f13440f Fix #9875. Check for valid tile element before dereferencing 2019-08-17 11:06:19 +01:00
duncanspumpkin 748a6338a9 Fix #9885. Catch exceptions in track design writing 2019-08-17 10:59:36 +01:00
OpenRCT2 git bot 1d67f86cc1 Merge Localisation/master into OpenRCT2/develop. 2019-08-17 04:00:28 +00:00
ζeh Matt 09f707ad8a Fix #9886: Object animations not working as multiplayer client (#9887) 2019-08-16 18:05:49 +01:00
Duncan f3c5c1b976
Merge pull request #9876 from duncanspumpkin/fix_track 
Fix #9859. Actually keep the loading of a track design with try.
 2019-08-15 21:45:52 +01:00
Duncan 6d99425f01
Merge pull request #9880 from duncanspumpkin/fix_9878 
Fix #9878. Prevent peeps from aimlessly wanderings/drowing
 2019-08-15 21:45:04 +01:00
duncanspumpkin 9721b8a1bb Fix #9878. Prevent peeps from aimlessly wanderings/drowing when exiting rides. 
Mistake made whilst refactoring
 2019-08-15 20:24:01 +01:00
duncanspumpkin 5a611f49d6 Fix #9859. Actually keep the loading of a track design with try. 
Mistake whilst implementing track desing importer and changing where code that could throw.
 2019-08-15 20:13:39 +01:00
Duncan 3da62e4697
Refactor of Peep Update Action (#9793) 
* Change the parameters of UpdateAction

* Use std::optional to make things a bit safer

* Use the core optional header to keep xcode happy
 2019-08-15 18:32:19 +01:00
kennycastro007 9708e3a043 Fixed issue #8376 (#9866) 
#8376: Added static function show_error in S6Importer.cpp
 2019-08-15 16:02:03 +02:00