mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-24 11:22:02 -05:00
Code Issues Projects Releases Packages Wiki Activity
16230 commits 10 branches 46 tags 404 MiB
Commit graph

16230 commits

This branch
This branch
All branches
Author SHA1 Message Date
OpenRCT2 git bot
1d51fe27d6 Merge Localisation/master into OpenRCT2/develop. 2019-02-08 04:00:26 +00:00
Michał Janiszewski
2f16ad164d
Merge pull request #8671 from tomlankhorst/cmake-link-with-platform 
Link targets with platform specific libs
 2019-02-07 23:40:46 +01:00
ζeh Matt
436f15f22e
Merge pull request #8692 from ZehMatt/gameaction-things 
Handle unregistered game actions with error logging.
 2019-02-07 23:39:11 +01:00
Ted John
535b075310 Reduce button text further and add tooltips 2019-02-07 22:00:30 +00:00
Ted John
459ce12650 Reduce length of copy item string 2019-02-07 21:59:15 +00:00
Ted John
b74a21bf54 Fix no network builds 2019-02-07 21:59:15 +00:00
Ted John
0d138c96cf Fix signed / unsigned comparison 2019-02-07 21:59:15 +00:00
Ted John
3aa55ff875 Refactor and improve download of objects 2019-02-07 21:59:15 +00:00
Ted John
5fb3c10c3a Make download objects async with progress 2019-02-07 21:59:15 +00:00
Ted John
27f70e3656 Get basic object downloading working 2019-02-07 21:58:34 +00:00
ζeh Matt
f5e24bd973
Merge pull request #8652 from ZehMatt/network-window 
Network window
 2019-02-07 21:10:03 +01:00
Duncan
d03bd95598
Register the ride set appearance action to prevent server crash (#8691) 
* Register the ride set appearance action to prevent server crash

* Bump network version

* Copy the type back when deserialising

This should really be fixed by adding RideSetAppearanceType to the dataserialiser

* Switch the types to prevent possible serialiser issues
 2019-02-07 19:53:09 +00:00
Matt
937c7162b7 Use IEC 60027-2 symbols for size localisation. 2019-02-07 18:50:59 +01:00
Matt
6b48503dd3 [ci skip] Update changelog.txt 2019-02-07 18:50:59 +01:00
Tom Lankhorst
fae96de572 Added files to xcodeproj 2019-02-07 18:50:59 +01:00
Matt
598ea08529 Update copyright. 2019-02-07 18:50:58 +01:00
Matt
0d1c8b8d31 Fix CircularBuffer push_back method. 2019-02-07 18:50:58 +01:00
Matt
49a6ae7894 Add CircularBuffer test. 2019-02-07 18:50:58 +01:00
Matt
57eccef347 Move format_readable_size and format_readable_speed into Localisation 2019-02-07 18:50:58 +01:00
Matt
f310fd2e07 Start graph with emptied window. 2019-02-07 18:50:58 +01:00
Matt
16bf190f7a Use localisation for speed and size information. 2019-02-07 18:50:58 +01:00
Matt
a26e9231cf Simplify CircularBuffer 2019-02-07 18:50:58 +01:00
Matt
ecd4f61115 Add Network window 2019-02-07 18:50:58 +01:00
Matt
2931ac6e31 Track bytes sent and received in Network. 2019-02-07 18:50:58 +01:00
Matt
e4f1b12fa4 Add CircularBuffer. 2019-02-07 18:50:58 +01:00
Matt
1553cf8c58 Bump up network version. 2019-02-07 18:36:44 +01:00
Matt
b071be49bd Add checks for unregistered game actions and report errors. 2019-02-07 18:35:03 +01:00
Matt
ee00143f3a Throw assert only in debug builds for missing game actions. 2019-02-07 18:23:58 +01:00
Aaron van Geffen
3be6137fde
Rename event_07 to periodic_update. (#8684) 2019-02-07 17:46:52 +01:00
Duncan
b249b0e0b6
Merge pull request #8676 from duncanspumpkin/ride_set_appearance_gc 
Move Ride Set Appearance into Game Action framework
 2019-02-07 12:12:31 +00:00
duncanspumpkin
bca79da193 Check for null id 2019-02-07 11:41:54 +00:00
duncanspumpkin
5e319a4a37 Increment network version 2019-02-07 10:16:20 +00:00
duncanspumpkin
892d6dc5f7 Be explicit about nullptr checks. 
Keep travis happy
 2019-02-07 10:16:01 +00:00
Tom Lankhorst
8f9c8f38ff
Clean-up CMakeLists openrct2-cli 2019-02-07 11:04:36 +01:00
duncanspumpkin
11c16955c5 Small refactor to use enum class 2019-02-07 08:14:45 +00:00
Tom Lankhorst
ec8c0754c0 Add 'RideSetAppearanceAction.hpp' to xcodeproj (#15) 2019-02-07 08:14:45 +00:00
duncanspumpkin
201db19d0a Move Ride Set Appearance into action framework 2019-02-07 08:14:45 +00:00
Aaron van Geffen
2a416dce81
Set more maze error messages in MazeSetTrackAction. (#8683) 2019-02-07 00:29:50 +01:00
Hielke Morsink
27a64f71c8 Fix #8682: Autosave settings don't react to user input 
Regression from #8648.
 2019-02-06 23:18:45 +01:00
Duncan
b27923093c Fix #7987: Broken track designs increase money by MONEY32_UNDEFINED 2019-02-06 22:20:42 +01:00
Michał Janiszewski
c42ded66b2 Fix #8674: Negative values not displaying correctly 2019-02-06 22:18:58 +01:00
Michał Janiszewski
ad888fbf9d
Require at least 1.4 version of benchmark (#8681) 2019-02-06 21:30:33 +01:00
Tom Lankhorst
ddfbaac13f
Fix MSVC type conversion warning 2019-02-06 12:13:59 +01:00
Tom Lankhorst
72519d8bb8
do not use designated initializer 2019-02-06 11:28:39 +01:00
Tom Lankhorst
e24314bb5a
Fix syntax error and add <memory> 2019-02-06 11:06:16 +01:00
Tom Lankhorst
706d1be865
Avoid illegal ptr conversions 2019-02-06 10:38:25 +01:00
Tom Lankhorst
756b52186e
Normalised and upgraded all replays 2019-02-06 10:24:10 +01:00
Tom Lankhorst
f48f347798
Internally compress (zlib lvl.9) replay files 
This effort reduces the size of replays by a factor 2 to 10 depending on
the park complexity. ZLIB is used as the compression backend.

- The replay file version is bumped to 2.
- An `sv6r` file still starts with a magic number and a version.
- If version = 1, the file stream is consumed by the ReplayRecordData
serializer.
- If version > 1, the file stream is decompressed and the resulting
stream is consumed by the ReplayRecordData serializer.
- Introduced `Compatible` that indicates whether a file with a version
mismatch is compatible. E.g.: v1 is compatible with this `ReplayManager`
 2019-02-06 10:12:21 +01:00
Duncan
57471edc47
Merge pull request #8672 from Xkeeper0/i/8662 
Fix for #8662 paint_haunted_house_structure crash
 2019-02-06 07:46:57 +00:00
Duncan
2cf4a9afb5
Merge pull request #8668 from duncanspumpkin/staff_order_action 
Implement Game Action Staff Set Order
 2019-02-06 03:50:11 +00:00