mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
8,652 Commits 8 Branches 59 Tags
b666a8d52c89516879ea89cbc445bc7fb96c7161
Commit Graph

8652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Delebo
b666a8d52c Minor chat window fixes and cleanup (#2) 2016-08-17 21:57:00 -06: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
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
Ted John
223d377d09 Integrate ride rating calc data using struct 2016-08-14 14:47:53 +01:00
Ted John
78b788e660 Merge pull request #4282 from marijnvdwerf/clean/data-15-maze 
[Cleanup] Integrate peep maze data
 2016-08-14 14:27:19 +01:00
Marijn van der Werf
a57a674522 Fix peeps not walking 2016-08-14 14:04:09 +01:00
Marijn van der Werf
82d0d229ce Use word_981D6C 2016-08-14 13:12:07 +01:00
Ted John
0a329fd53f Merge pull request #4281 from marijnvdwerf/clean/data-13 
[Cleanup] Integrate more peep_update related data
 2016-08-14 13:11:44 +01:00
Marijn van der Werf
57ea87ed0b Integrate FlatTrackCoordinates 2016-08-14 13:10:44 +01:00
Marijn van der Werf
9ed4f86f38 Rename addresses to match actual location 2016-08-14 12:30:53 +02:00
Marijn van der Werf
d1fd11d5fd Integrate data at 0x00981FE1 2016-08-14 12:28:03 +02:00
Marijn van der Werf
718347eddc Integrate data at 0x00981FF1 2016-08-14 12:09:02 +02:00
Marijn van der Werf
37b426659e Integrate data at 0x00981FD1, 0x00981FD3 2016-08-14 11:53:32 +02:00
Marijn van der Werf
533696bb58 Integrate data at 0x00981F4C, 0x00981F4E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
92403cf4a6 Integrate data at 0x00981F2C, 0x00981F2E 2016-08-14 11:39:12 +02:00
Marijn van der Werf
9127a67229 Integrate data for peep_update_ride_sub_state_15 
0x00981F0C, 0x00981F0E, 0x00981F1C, 0x00981F1E
 2016-08-14 11:39:11 +02:00
Marijn van der Werf
ad29a7006b Integrate data at 0x00981D7C, 0x00981D7E 2016-08-14 11:39:11 +02:00
Marijn van der Werf
ac070103b1 Integrate duck frames 2016-08-14 11:37:59 +02:00