1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-07 07:04:36 +01:00
Commit Graph

887 Commits

Author SHA1 Message Date
OpenRCT2 git bot
0aa0bec804 Merge Localisation/master into OpenRCT2/develop. 2016-10-03 04:00:19 +00:00
jensj12
44a53dd031 Allow 31 trains per ride (cheat and tooltip)
Changes the disable train lenght limit cheat to also disable the limit on the number of trains and renames it to 'disable vehicle limits'. Now any tracked ride can have up to 31 trains with 255 cars each. To reduce confusion, I also added a tooltip to the spinners on the vehicle tab.
2016-10-01 20:58:46 +02:00
OpenRCT2 git bot
a80db73a2a Merge Localisation/master into OpenRCT2/develop. 2016-09-26 04:00:22 +00:00
Michael Steenbeek
a170eeb367 Merge pull request #4302 from wolfreak99/render_rain_toggle
Add option to disable weather gloom and rain effects
2016-09-24 13:17:49 +02:00
Ted John
4a0a93d003 Merge pull request #4449 from duncanspumpkin/gl2
OpenGL Palettes
2016-09-23 21:41:09 +01:00
wolfreak99
98eb272c71 Break long lines for readability 2016-09-21 10:36:23 -04:00
wolfreak99
c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
OpenRCT2 git bot
6496895e40 Merge Localisation/master into OpenRCT2/develop. 2016-09-20 04:00:21 +00:00
OpenRCT2 git bot
4b5e6f01cb Merge Localisation/master into OpenRCT2/develop. 2016-09-19 04:00:22 +00:00
duncanspumpkin
5f7a6fb369 Fixed OpenGL palette drawing
Added palettes to the texture atlas and now correctly use them to generate
images. Transparency semi supported but the colours are not quite
correct.
2016-09-18 20:28:46 +01:00
OpenRCT2 git bot
b3ef319dc9 Merge Localisation/master into OpenRCT2/develop. 2016-09-18 04:00:21 +00:00
OpenRCT2 git bot
d24680ad2a Merge Localisation/master into OpenRCT2/develop. 2016-09-16 04:00:21 +00:00
OpenRCT2 git bot
d8f2da4ec4 Merge Localisation/master into OpenRCT2/develop. 2016-09-15 04:00:23 +00:00
OpenRCT2 git bot
2a184aae23 Merge Localisation/master into OpenRCT2/develop. 2016-09-14 04:00:21 +00:00
OpenRCT2 git bot
6dfcfb4098 Merge Localisation/master into OpenRCT2/develop. 2016-09-02 04:00:27 +00:00
OpenRCT2 git bot
f2687eebb2 Merge Localisation/master into OpenRCT2/develop. 2016-08-30 04:00:22 +00:00
Ted John
17b69d257b Merge pull request #4097 from marijnvdwerf/clean/string-ids-2
Continue string ID cleanup
2016-08-28 14:05:13 +01:00
OpenRCT2 git bot
65beeeece5 Merge Localisation/master into OpenRCT2/develop. 2016-08-25 04:00:20 +00:00
Marijn van der Werf
9275cd1cbb Add descriptions for stalls 2016-08-21 16:33:37 +02:00
Marijn van der Werf
fbbc871aea Clean up double-used strings 2016-08-21 16:32:13 +02:00
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
OpenRCT2 git bot
676c734f4c Merge Localisation/master into OpenRCT2/develop. 2016-08-21 04:00:18 +00:00
OpenRCT2 git bot
394eb94be3 Merge Localisation/master into OpenRCT2/develop. 2016-08-20 04:00:22 +00: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
OpenRCT2 git bot
a874756fcc Merge Localisation/master into OpenRCT2/develop. 2016-08-18 04:00:19 +00:00
Wirlie
9ec3fbc39b Chat: Add colour scheme (themes) + 3d edge style. 2016-08-16 23:26:03 -06:00
OpenRCT2 git bot
ae05e0f847 Merge Localisation/master into OpenRCT2/develop. 2016-08-17 04:00:22 +00:00
wolfreak99
791733a571 See-through paths, Convert gCurrentViewportFlags to uint32 2016-08-15 00:58:15 -04:00
OpenRCT2 git bot
85210322ae Merge Localisation/master into OpenRCT2/develop. 2016-08-12 04:00:24 +00:00
OpenRCT2 git bot
bb07785e96 Merge Localisation/master into OpenRCT2/develop. 2016-08-10 04:00:26 +00:00
OpenRCT2 git bot
a7454d6d88 Merge Localisation/master into OpenRCT2/develop. 2016-08-09 04:00:19 +00:00
OpenRCT2 git bot
42501c66fe Merge Localisation/master into OpenRCT2/develop. 2016-08-05 04:00:24 +00:00
OpenRCT2 git bot
0be54fbac3 Merge Localisation/master into OpenRCT2/develop. 2016-08-04 04:00:20 +00:00
OpenRCT2 git bot
3f07e5929d Merge Localisation/master into OpenRCT2/develop. 2016-08-03 04:00:19 +00:00
OpenRCT2 git bot
63c74b40de Merge Localisation/master into OpenRCT2/develop. 2016-08-02 04:00:18 +00:00
Michał Janiszewski
155bc054df Fix #4172: Expose ride-type changing capability in UI
This also allows changing ride type in multiplayer games. Very crashy.
2016-08-01 20:30:08 +02:00
OpenRCT2 git bot
9cf341940a Merge Localisation/master into OpenRCT2/develop. 2016-08-01 04:00:20 +00:00
Ted John
349684b7ce Merge pull request #4146 from AaronVanGeffen/reposition-mouse
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
2016-07-31 12:38:06 +01:00
OpenRCT2 git bot
e4b8e13ee4 Merge Localisation/master into OpenRCT2/develop. 2016-07-31 04:00:36 +00:00
Aaron van Geffen
a1b8bdfa11 Make zooming to cursor optional.
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
2016-07-30 21:18:59 +02:00
Michael Steenbeek
19220cbbce Add a button to the map generator window in the Map window (#4098)
Includes many fixes by @Wirlie
2016-07-30 21:10:04 +02:00
OpenRCT2 git bot
b8a3e18271 Merge Localisation/master into OpenRCT2/develop. 2016-07-30 04:00:17 +00:00
wolfreak99
8f254702a2 Add cheat to reset date (#4188) 2016-07-29 20:49:38 +02:00
OpenRCT2 git bot
9136fa2a97 Merge Localisation/master into OpenRCT2/develop. 2016-07-29 04:00:22 +00:00
OpenRCT2 git bot
b115de861d Merge Localisation/master into OpenRCT2/develop. 2016-07-28 04:00:21 +00:00
Alexander Overvoorde
6acbbcfb6b Fix assumption that colour texture and mask texture originate from same atlas 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
bb3fe8b804 Implement multiple texture atlas system to handle small and large images 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
d8ce023170 Change TextureCache to use atlas instead of array 2016-07-27 04:01:25 +02:00