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

17120 Commits

Author SHA1 Message Date
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
Ted John 495a756e66
Merge pull request #9872 from IntelOrca/object-download-source 
Show the object download source when downloading object files
 2019-08-14 16:20:45 +01:00
Ted John 634b254447 Print the URL of the object that it is downloading 2019-08-13 22:38:21 +01:00
Michał Janiszewski 209c6d0513
Make replays only downloadable when configured with tests (#9868) 2019-08-13 21:04:08 +02:00
Ted John 401ec9e19f Update backtrace token 2019-08-13 18:35:37 +01:00
Ted John 8f917a2590 Show the object download source when downloading object files 2019-08-13 18:32:32 +01:00
Ted John 42e1f35874 Fix #9864: Diagonal track cannot be built 2019-08-12 23:09:17 +01:00
ζeh Matt 0a5777f11a
Merge pull request #9791 from ZehMatt/replays-v0.0.3 
Update replays to v0.0.4
 2019-08-12 19:24:49 +02:00
Ted John ec55eb6374 Fix #9863: Excitement/Intensity factors of cars overflow 2019-08-12 17:54:12 +01:00
Matt 45452ad2c8
Run replay tests with network disabled 2019-08-12 18:04:08 +02:00
Matt 51eb86aed9
Update replays to v0.0.4 2019-08-12 01:40:12 +02:00
Ted John 056ebc23d6
Update title sequences to v0.1.2c (#9854) 2019-08-11 19:03:29 +01:00
ζeh Matt 3bb6f746d2
Merge pull request #9426 from ZehMatt/refactor/windows 
Refactor windows code
 2019-08-11 20:00:12 +02:00
Andrew Rimpici e0f2e43c36
Added file to Xcode project. 2019-08-11 17:22:00 +02:00
Matt cc6321048f
Refactor window_invalidate to use rct_window::Invalidate 2019-08-11 17:22:00 +02:00
Matt 2053ecb688
Refactor window_scroll_to_viewport to use rct_window::ScrollToViewport 2019-08-11 17:22:00 +02:00
Matt b046d45c01
Refactor window_set_location to use rct_window::SetLocation 2019-08-11 17:21:56 +02:00
Duncan c677a9681a
Merge pull request #9840 from duncanspumpkin/fountian_refactor 
Refactor fountain to use CoordsXY(Z)
 2019-08-11 12:47:01 +01:00
duncanspumpkin d7a725f1d5 Refactor fountain to use CoordsXY(Z) 2019-08-11 07:21:07 +01:00
Ted John 68dc4d0fb8 Bump network version to deprecate recent bugged versions 2019-08-10 15:24:59 +01:00
Ted John d730a76809 Fix #9844: Guests can't enter park 2019-08-10 15:22:03 +01:00
Ted John 132a1916d6
Fix #9832: Access violation in ride_measurement_update (#9842) 
We can not store a ride pointer in ride measurement as rides are now stored in a vector which means their addresses can change when rides are constructed / removed.
 2019-08-10 15:14:22 +01:00
Ted John 60db202ea7 Return nullptr in get_sprite if out of range 2019-08-10 12:18:51 +01:00
Duncan 77d813f0f1
Merge pull request #9103 from duncanspumpkin/trackImporter 
Track importer/exporter
 2019-08-10 07:19:17 +01:00
Andrew 04159a92b6 Update contributors.md 2019-08-09 20:43:03 +01:00
Andrew Rimpici bc36ee973c Xcode fixes for macOS support 
Added in Duncan's files to the xcode project so the project builds correctly on Mac.
 2019-08-09 20:43:03 +01:00