mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,696 Commits 7 Branches 39 Tags 354 MiB
Commit Graph

8696 Commits

Author SHA1 Message Date
Marijn van der Werf 8d1d699710 Clean up music credits window 2016-08-21 16:31:06 +02:00
Marijn van der Werf cb794ab3df Deprecate string 886 2016-08-21 16:31:06 +02:00
Marijn van der Werf bc3ec1b871 Use table for ride names 2016-08-21 16:31:06 +02:00
Ted John 63eb3580c4 Fix peep invalidation out of range 
When a new peep thought was created, the peep window action widget is invalidated. This would only be valid if the first tab is active. Instead just invalidate the whole window.
 2016-08-21 15:21:48 +01:00
Michał Janiszewski 634fc12875 Add assert for widget index invalidation 2016-08-21 15:20:30 +01:00
Ted John 112b70c15b Merge pull request #4068 from gDanix/refactor-clear_elements_at 
Refactor clear_elements_at()
 2016-08-21 13:59:07 +01:00
Ted John 9b77bb35ae Fix #4113: Free rides: Income and profit calculated using old price 2016-08-21 13:49:37 +01:00
Ted John 3f1a95cbee Merge pull request #4317 from marijnvdwerf/clean/data-palette 
Clean/data palette
 2016-08-21 13:48:37 +01:00
Marijn van der Werf bdb04e3da3 Integrate data at 0x009DEDF4 2016-08-21 14:24:55 +02:00
Marijn van der Werf 5a03c6b129 Integrate palettes 2016-08-21 13:53:31 +02:00
OpenRCT2 git bot 676c734f4c Merge Localisation/master into OpenRCT2/develop. 2016-08-21 04:00:18 +00:00
Tom Delebo 50348e015e Changed the server greeting buffer from 256 to 1024 
* Changed the server greeting buffer size to accept longer strings
* Added comment explaining character limit for greeting buffer
* Moved chat constants to header file to allow access from includes
 2016-08-20 23:20:53 +01:00
Ted John ff12c2b326 Integrate animation objects 2016-08-20 22:38:50 +01:00
Ted John 1fb7458207 Remove drawing of expansion packs on title screen 
This never worked anyway as we no longer read the registry keys for it.
 2016-08-20 22:24:56 +01:00
Marijn van der Werf 9319bee91f Use already integrated data 2016-08-20 22:12:52 +01:00
Marijn van der Werf 853b1c79b2 Integrate stru_9A3AC4 2016-08-20 21:59:59 +01:00
Ted John 77adbc5145 Merge pull request #4314 from marijnvdwerf/clean/data-vehicle-misc-1 
Clean/data vehicle misc 1
 2016-08-20 21:33:43 +01:00
Marijn van der Werf d51a14e8ca Integrate word_9A3684 2016-08-20 22:20:18 +02:00
Marijn van der Werf f862bc8675 Integrate dword_9A2970 2016-08-20 22:01:42 +02:00
Marijn van der Werf db92fc474f Integrate dword_9A2930 2016-08-20 21:50:27 +02:00
Marijn van der Werf d0399dd7f7 Include motion simulator vehicle data 2016-08-20 16:56:55 +01:00
Yaroslav Tretyakov 88be245504 Fix another cause of #4204 2016-08-20 14:06:48 +01:00
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