mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity
16,690 Commits 8 Branches 59 Tags
5da95e963d554db256ffab9ac26ea795232f7bb8
Commit Graph

16690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Duncan
5da95e963d Fix GameAction use during pause (#9242) 
* Use correct flag to allow action while paused.

Mistake made during implementing on GameActions

* Increment network version
 2019-05-12 09:54:21 +01:00
OpenRCT2 git bot
d3b5ac3f07 Merge Localisation/master into OpenRCT2/develop. 2019-05-12 04:00:22 +00:00
ζeh Matt
2f4f4fbf8e Merge pull request #9233 from ZehMatt/fix-invalidobjectselection 
Fix #2294: Clients crashing the server with invalid object selection
 2019-05-11 23:16:39 +02:00
Matt
9561567b6c Bump up network version 2019-05-11 21:39:01 +02:00
Matt
46c9b89259 Update changelog.txt 2019-05-11 21:39:01 +02:00
Matt
7c7909fb45 Fix #2294: Clients crashing the server with invalid object selection 2019-05-11 21:39:01 +02:00
ζeh Matt
c8f822ea70 Gamestate snapshots (#8819) 
* Add initial interface.

* Implement move operator in MemoryStream

* Add pod array serialisation traits.

* Add push_back with move semantics to CircularBuffer

* Initial implementation of GameStateSnapshots

* Add GameStateSnapshots to Context.

* Add mp_desync console command.

* Compare sprite data and fill change list.

* Minor changes.

* Proof of concept.

* Calculate offset instead of using offsetof

* Implement game state difference detection

* Update mp_desync console command.

* Fix identification of sprite remove/add.

* Fix crash when only one peep in park when using mp_desync

* Output state differences into user directory desync folder.

* Add desync debugging as an option.

* Add information to network status when a desync report was created.

* Cast to proper type for %llu.

* Update xcode project

* Add more information to the diffed data.

* Remove client-only relevant fields.

* Cleanup.

* Add better name output for misc sprites

* Add srand0 and tick information to the output

* Bump up network version

* Cleanup

* Set desync_debugging to false as default

* Apply suggestions
 2019-05-11 21:31:34 +02:00
ζeh Matt
1f6c7c9942 Fix false positive desync when changing map during network play 2019-05-11 18:27:09 +02:00
Ted John
cedbd8ce7f Merge pull request #8611 from tomlankhorst/check-screenshot-path 
Check and sanitise screenshot filenames.
 2019-05-11 15:29:54 +01:00
Ted John
7074d6f3ae Apply review suggestions 2019-05-11 13:57:18 +01:00
Tom Lankhorst
ed353faccf Implement replace_if condition lambda 
Fix include typo and CS
 2019-05-11 13:54:16 +01:00
Tom Lankhorst
744f2225ed Write platform tests 2019-05-11 13:54:16 +01:00
Tom Lankhorst
bbd69496b4 Sanitize screenshot path 2019-05-11 13:54:16 +01:00
nexgenration
ebefe5721b Fix #9198: Move vehicle invalidate to member function 
To further improve the readability of the codebase the vehicle_invalidate function is now a member function of rct_vehicle.
 2019-05-11 13:20:34 +01:00
Hielke Morsink
b51f6a4d90 Use case-insensitive compare for soring ride and vehicle types (#9229) 2019-05-11 12:06:29 +01:00
Michael Steenbeek
0eccb3495b Add #8558 to changelog [ci skip] 2019-05-10 22:45:39 +02:00
Filip Gawin
6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
OpenRCT2 git bot
9af568d97c Merge Localisation/master into OpenRCT2/develop. 2019-05-10 04:00:24 +00:00
OpenRCT2 git bot
8f64bef9c2 Merge Localisation/master into OpenRCT2/develop. 2019-05-09 04:00:22 +00:00
Michał Janiszewski
7b71fe8acd Fix error value checked from ride_get_smallest_station_length (#8719) 
ride_get_smallest_station_length returns the int32_t::max instead of -1
on error.
 2019-05-08 22:34:41 +01:00
Michael Steenbeek
da6794ad9e Refactor second argument to move_sprite_to_list() 2019-05-08 22:11:51 +02:00
Gymnasiast
7f5c9622c0 Fix guests eating popcorn being drawn eating pizza 2019-05-08 20:57:20 +02:00
OpenRCT2 git bot
27a119069a Merge Localisation/master into OpenRCT2/develop. 2019-05-08 04:00:26 +00:00
Michael Steenbeek
e98a51c4ef Merge pull request #9196 from nexgenration/peep_gen 
Refactor Peep Generate
 2019-05-07 20:24:41 +02:00
Gymnasiast
17ddd451db Fix tests, fix formatting 2019-05-07 20:04:07 +02:00
Gymnasiast
916b8c2705 Use more constants 2019-05-07 19:46:58 +02:00
Gymnasiast
212f425ff0 Rename variables, change signature 2019-05-07 19:34:50 +02:00
NexGenration
846011e21b another message here 2019-05-07 19:34:50 +02:00
NexGenration
e6c88a05db Make peep generate a static member function 2019-05-07 19:34:50 +02:00
Ted John
0d0479f9b1 Merge pull request #8558 from richard-fine/feature/peep-inspector 
Peep debug tab
 2019-05-06 20:29:29 +01:00
Gymnasiast
2368fea91e Bump network version 2019-05-06 19:15:32 +02:00
Ted John
66e49a1a44 Update OPENRCT2_ORG_TOKEN for AppVeyor 2019-05-06 14:29:23 +01:00
OpenRCT2 git bot
107a93b2e7 Merge Localisation/master into OpenRCT2/develop. 2019-05-05 04:00:24 +00:00
Ted John
a22f0a53fb Use localised strings for guest debug tab 2019-05-04 21:48:02 +00:00
Ted John
f50695fc9b Refactor guest window resize 2019-05-04 16:23:29 +00:00
Ted John
a90a86562d Refactor guest widget lists 2019-05-04 15:01:51 +00:00
Ted John
7c2708746e Re-draw debug tab every tick 2019-05-04 14:53:25 +00:00
Ted John
c13bd04954 Refactor invalidate methods 2019-05-04 14:40:45 +00:00
Ted John
1d296242b4 Improve text colour 2019-05-04 14:09:15 +00:00
Ted John
b4a2a94520 Fix build 2019-05-04 14:08:37 +00:00
Richard Fine
480f19c0c6 Add parens to fix operator precedence issue 
I missed one... thankfully the CI did not.
 2019-05-04 14:08:37 +00:00
Richard Fine
9bb68a7151 Pull window width into temporary variable 
As suggested in review, it's a little easier to read this way.
 2019-05-04 14:08:37 +00:00
Richard Fine
b714f7b0e2 Use constexpr instead of const 
For a static constant integer value, it's stylistically clearer to use constexpr instead of const. The resulting variable is implicitly const, but is also guaranteed to have a compile-time-computable value.
 2019-05-04 14:08:37 +00:00
Richard Fine
97bcc53637 Eliminate itoa and use correct format specifiers 
Use snprintf instead of _itoa as it's not available on all platforms. Also change the format specifies for unsigned variables to %u instead of %i, to be more correct...
 2019-05-04 14:08:37 +00:00
Richard Fine
397b044588 Use safe_strcat instead of strcat_s 
strcat_s is not available on all platforms, and we have a utility in the codebase that does basically the same thing already.
 2019-05-04 14:08:37 +00:00
Richard Fine
cfda3fb8f7 Use sizeof(buffer) instead of hardcoded size 
Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
 2019-05-04 14:08:37 +00:00
Richard Fine
8bf72ceadb More peep pathing info 
Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
 2019-05-04 14:08:37 +00:00
Richard Fine
7300a38ce6 Show peep coordinates in debug tab 
As a first debug stat to show, display a peep's current coordinates in the debug tab
 2019-05-04 14:08:37 +00:00
Richard Fine
70c61d5ac6 Fix guest window width for debugging tab 
Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
 2019-05-04 14:08:37 +00:00
Richard Fine
5ef07ab936 Formatting 2019-05-04 14:08:37 +00:00