OpenRCT2 git bot
394eb94be3
Merge Localisation/master into OpenRCT2/develop.
2016-08-20 04:00:22 +00:00
Marijn van der Werf
d99fa770fd
Include vehicle rotation data
2016-08-20 00:53:54 +01:00
LRFLEW
248a933ab1
Fix Invalid Save Default Path ( #4308 )
2016-08-19 22:33:49 +01:00
Marijn van der Werf
72cb30c7c4
Include topspin vehicle data
2016-08-19 18:59:23 +01:00
Ted John
5f2c947182
Define correct architecture
2016-08-19 00:18:09 +01:00
Ted John
4a234a0f86
Merge pull request #3946 from pizza2004/chat_background
...
Improve chat and background, fixes #3849
2016-08-18 22:10:19 +01:00
Ted John
c645eee046
Enable DPI awareness for Windows x64
2016-08-18 18:37:51 +01:00
OpenRCT2 git bot
a874756fcc
Merge Localisation/master into OpenRCT2/develop.
2016-08-18 04:00:19 +00:00
Tom Delebo
b666a8d52c
Minor chat window fixes and cleanup ( #2 )
2016-08-17 21:57:00 -06:00
Ted John
b3a06106a8
Merge pull request #4279 from delebota/mp_greeting
...
Add a server greeting which is displayed to connecting user
2016-08-17 23:18:08 +01:00
Ted John
5a046ece60
Merge pull request #4291 from zaxcav/stationSync
...
Fix problems with syncing adjacent stations
2016-08-17 23:04:02 +01:00
Michael Steenbeek
fb943642cf
Add Dutch Gitter
2016-08-17 22:47:04 +02:00
Wirlie
86b5103445
Chat: draw multiple lines if the text exceeds the width of the chat.
...
+ Cleanup
+ Support for multiples lines at the text input.
2016-08-16 23:26:12 -06:00
Wirlie
c52747bc93
Chat: Improve 3d edge style + initial test for clipping the text.
2016-08-16 23:26:12 -06:00
Wirlie
9ec3fbc39b
Chat: Add colour scheme (themes) + 3d edge style.
2016-08-16 23:26:03 -06:00
Wirlie
94ca2364cf
Chat: Basic auto-resizable background + borders.
2016-08-16 23:23:47 -06:00
OpenRCT2 git bot
ae05e0f847
Merge Localisation/master into OpenRCT2/develop.
2016-08-17 04:00:22 +00:00
Marijn van der Werf
103be20db9
Fix #4297 : Rides floating above ground level
2016-08-16 22:42:37 +01:00
Ted John
560957824a
Fix #4295 : Game crash if the syntax of users.json file is wong
...
JsonException was not being caught in NetworkUser::Load().
2016-08-16 21:25:00 +01:00
Ted John
3f9c5456d4
Merge pull request #4212 from marijnvdwerf/clean/data-trackflags
...
Include track flags
2016-08-16 17:55:29 +01:00
Ted John
ed01480222
Merge pull request #4285 from marijnvdwerf/clean/data-17-supports
...
[Cleanup] Integrate variables for metal supports
2016-08-16 17:54:52 +01:00
Ted John
8aaf7e313f
Merge pull request #4278 from marijnvdwerf/clean/data-12
...
Integrate misc data
2016-08-16 17:54:18 +01:00
Ted John
b97cd7b9b1
Merge pull request #4290 from wolfreak99/see_through_paths
...
See-Through Paths (and implement gCurrentViewportFlags)
2016-08-16 17:53:02 +01:00
Marijn van der Werf
b9a4ef86df
Integrate litter data
...
0x0097EF6C
0x0097EFCC
0x0097EFE8
2016-08-16 10:55:38 +01:00
wolfreak99
706b622464
Suggested Improvements
2016-08-16 02:28:50 -04:00
Thomas Delebo
51eac62636
#4279 Truncate greeting so we don't overflow buffer
2016-08-15 12:08:23 -05:00
zaxcav
6e4290eed7
Remove incorrect details from comment.
2016-08-15 13:21:06 +02:00
zaxcav
a562fc4e0b
Remove commented out code.
2016-08-15 12:44:20 +02:00
zaxcav
de00f27195
Fix issues with sync adjacent stations
...
Change try_add_synchronised_station() so that adjacent stations are always in the _synchronisedVehicles list; those without a vehicle to sync have vehicle_id == SPRITE_INDEX_NULL.
Change vehicle_can_depart_synchronised() so that adjacent stations are searched for on both sides of the tile; reverse the logic of the return values to make sense with respect to the function name (all except for the case when there are no adjacent stations, which already made sense and was consequently flipped in relation to all other returns; numerous minor fixes to the checks on the departure conditions/exceptions.
In vehicle_update_waiting_to_depart() flip the logic on the call to vehicle_can_depart_synchronised() according with the above change to its return values.
Fixes issues: #4178 and #4182
2016-08-15 12:13:46 +02:00
wolfreak99
791733a571
See-through paths, Convert gCurrentViewportFlags to uint32
2016-08-15 00:58:15 -04:00
wolfreak99
92e875e007
(Partially) implement gCurrentViewportFlags
2016-08-15 00:28:22 -04:00
Matte A
07989e325f
Update contributors.md ( #4288 )
2016-08-14 22:29:55 +02:00
Marijn van der Werf
98fc9c29b9
Name struct fields
2016-08-14 22:08:20 +02:00
Ted John
6a3853c09f
Merge pull request #4287 from marijnvdwerf/clean/data-19
...
[Clean] Integrate more peep data
2016-08-14 20:43:15 +01:00
Marijn van der Werf
30fa5851e5
Return false if there was no space for supports
2016-08-14 21:39:12 +02:00
Marijn van der Werf
3ff3db13f4
Integrate data at 0x0097AF32
2016-08-14 21:39:12 +02:00
Marijn van der Werf
d67afb263b
Integrate variables for metal supports
2016-08-14 21:39:12 +02:00
Marijn van der Werf
1d883eea2f
Integrate data at 0x00992A5C
2016-08-14 21:14:33 +02:00
Marijn van der Werf
5acc9f813b
Integrate 0x00992A4C
2016-08-14 21:10:21 +02:00
Marijn van der Werf
a56dae2953
Integrate data at 0x00992A3C
2016-08-14 20:27:12 +02:00
Marijn van der Werf
de1c69d5d9
Integrate 0x009929C8 and 0x009929CA
2016-08-14 18:05:15 +02:00
Ted John
612de0e567
Integrate 3 more park globals
2016-08-14 16:22:30 +01:00
Ted John
4e7bce99e6
Integrate research globals
2016-08-14 16:16:54 +01:00
Ted John
13ef119c0f
Fix gExpenditureTable size
2016-08-14 16:07:03 +01:00
Ted John
15cde6b004
Integrate finance globals
2016-08-14 16:01:43 +01:00
Ted John
154bb0d475
Integrate guest and park globals
...
Note: this also fixes loading of landscapes in the editor which did not use the new SC loading code.
2016-08-14 15:50:52 +01:00
Ted John
81fb5f9545
Integrate climate globals
2016-08-14 15:07:32 +01:00
Ted John
cb3a023755
Use integrated variables for ride ratings brakes and reversers
2016-08-14 15:01:16 +01:00
Marijn van der Werf
18edae3edf
Integrate TerrainPricing
2016-08-14 14:49:32 +01:00
Ted John
9830ca3561
Format code for #ifdefs in ride_ratings.c
2016-08-14 14:48:47 +01:00
