Commit graph

16148 commits

Author SHA1 Message Date
Michał Janiszewski
379fd42dc4 Fix types passed to ride_type_has_flag 2019-02-10 00:04:52 +01:00
Michał Janiszewski
70ef8151fc Fix types passed to printf-like functions 2019-02-10 00:04:52 +01:00
ζeh Matt
be491d3c6f Bump network version 2019-02-09 23:27:26 +01:00
ζeh Matt
7861d64ca8
Merge pull request #8693 from ZehMatt/ga-ridesetprice
Refactor Ride Set Price to game actions.
2019-02-09 21:06:17 +01:00
Tom Lankhorst
405ebe3fb1 Added files to xcodeproj 2019-02-08 18:16:10 +01:00
Matt
02a14d3883 Move setting common price into RideSetCommonPrice 2019-02-08 18:03:06 +01:00
Matt
34260cb6ca Replace old game command reference. 2019-02-08 18:03:06 +01:00
Matt
9508044aa7 Add missing member to serialisation. 2019-02-08 18:03:06 +01:00
Matt
d87ca57e72 Replace game command references with new game action. 2019-02-08 18:03:06 +01:00
Matt
a5e48e759d Implement RideSetPriceAction. 2019-02-08 18:03:06 +01:00
Duncan
f32531c911
Merge pull request #8689 from duncanspumpkin/land_set_heigh_gc
Move Land Set Height into GameAction Framework
2019-02-08 15:53:47 +00:00
Tom Lankhorst
5a6e57a2ba Added files to xcodeproj (#16) 2019-02-08 15:19:50 +00:00
duncanspumpkin
640337159a Increment network version 2019-02-08 14:08:55 +00:00
duncanspumpkin
44cd8c3150 Refactor. Add CoordsXY to data serialiser 2019-02-08 14:08:26 +00:00
duncanspumpkin
ea585950f6 Refactor. Split out into multiple functions. 2019-02-08 14:08:26 +00:00
duncanspumpkin
fd7f9fefca Move Land Set Height over to GameAction Framework 2019-02-08 14:08:26 +00:00
Ted John
a3bf8da558
Update changelog.txt 2019-02-08 12:57:41 +00:00
Ted John
907e43acd8
Merge pull request #8670 from IntelOrca/feature/download-objects
Auto-download missing objects
2019-02-08 12:55:05 +00:00
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