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
16062 commits 10 branches 46 tags 404 MiB
Commit graph

16062 commits

This branch
This branch
All branches
Author SHA1 Message Date
OpenRCT2 git bot
795dc8e217 Merge Localisation/master into OpenRCT2/develop. 2019-02-12 04:00:22 +00:00
Duncan
a95a5abab8
Merge pull request #8690 from duncanspumpkin/pause_toggle_gc 
Move Pause Toggle into the GameAction framework
 2019-02-11 11:31:58 +00:00
duncanspumpkin
af65bc33e7 Increment network version 2019-02-11 10:57:58 +00:00
duncanspumpkin
c87430e09d Turn off clang format 2019-02-11 10:57:31 +00:00
Tom Lankhorst
2405e9a6ba Added files to xcodeproj (#17) 2019-02-11 10:46:12 +00:00
duncanspumpkin
866d143930 Move Pause Toggle into the GameAction framework 2019-02-11 10:46:12 +00:00
OpenRCT2 git bot
14eb975803 Merge Localisation/master into OpenRCT2/develop. 2019-02-11 04:00:21 +00:00
Michael Steenbeek
76603ad1b3
Fix #8696: Setting land height costs money in no-money scenarios 2019-02-10 22:14:23 +01:00
Michał Janiszewski
5e74f7487d
Merge pull request #8700 from janisozaur/icc-fixes 
Icc fixes
 2019-02-10 12:21:33 +01:00
ζeh Matt
20989ae4d8
Merge pull request #8675 from tomlankhorst/compress-replays 
.sv6r version 2: introducing compression
 2019-02-10 11:01:26 +01:00
OpenRCT2 git bot
62503296a2 Merge Localisation/master into OpenRCT2/develop. 2019-02-10 04:00:22 +00:00
Michał Janiszewski
5faf2d393b Fix ride_type_has_flag signature for testpaint 2019-02-10 00:32:46 +01:00
Michał Janiszewski
9da931d5e7 Remove offsetof for non-POD data 2019-02-10 00:20:34 +01:00
Michał Janiszewski
838289abce Mark functions as static 2019-02-10 00:20:34 +01:00
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