2450 Commits

Author SHA1 Message Date
Ted John
84ca31a240 implement masked image shader 2016-06-10 20:17:00 +01:00
Ted John
808afe0a81 add drawimage shader and optimise 2016-06-10 17:54:29 +01:00
Ted John
a9d49838fa add cross pattern support for fillrect shader 2016-06-10 17:54:29 +01:00
Ted John
c48031581b get the fillrect shader working 2016-06-10 17:54:29 +01:00
Ted John
dc7b8b4d3b add initial shader code 2016-06-10 17:54:29 +01:00
OpenRCT2 git bot
af0f77e857 Merge Localisation/master into OpenRCT2/develop. 2016-06-10 04:00:20 +00:00
OpenRCT2 git bot
b511eb0a2e Merge Localisation/master into OpenRCT2/develop. 2016-06-09 04:00:18 +00:00
Ted John
504e5e0720 Merge pull request #3803 from IntelOrca/refactor/drawing
Refactor drawing and add initial infrastructure for OpenGL rendering.
2016-06-08 21:21:39 +01:00
OpenRCT2 git bot
426e106111 Merge Localisation/master into OpenRCT2/develop. 2016-06-08 04:00:22 +00:00
Ted John
3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
X123M3-256
706b3db99e Chain lift cheat (#3818)
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
2016-06-07 22:08:38 +01:00
Michael Steenbeek
0a4fa02a3e en-GB: drop full stop in option for consistency 2016-06-07 20:01:56 +02:00
OpenRCT2 git bot
84334c1485 Merge Localisation/master into OpenRCT2/develop. 2016-06-07 04:00:18 +00:00
OpenRCT2 git bot
3dc4b601b8 Merge Localisation/master into OpenRCT2/develop. 2016-06-06 04:00:21 +00:00
OpenRCT2 git bot
4f6929edf6 Merge Localisation/master into OpenRCT2/develop. 2016-06-04 04:00:21 +00:00
Ted John
82dd7601eb Merge pull request #3782 from janisozaur/desyncs
synchronise reset_0x69EBE4 over network
2016-06-03 10:47:01 +01:00
OpenRCT2 git bot
7e291c32bc Merge Localisation/master into OpenRCT2/develop. 2016-06-03 04:00:19 +00:00
Goddesen
c004b986ae Moved new strings to uphold string ID order 2016-06-03 00:33:15 +02:00
Goddesen
809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
OpenRCT2 git bot
99a7346c3f Merge Localisation/master into OpenRCT2/develop. 2016-06-02 04:00:26 +00:00
OpenRCT2 git bot
67f11318cd Merge Localisation/master into OpenRCT2/develop. 2016-06-01 04:00:20 +00:00
Ted John
7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
Ted John
b68da1189b Merge pull request #3776 from IntelOrca/feature/chatlogs
Save chat logs
2016-05-31 11:39:00 +01:00
OpenRCT2 git bot
649ea9c705 Merge Localisation/master into OpenRCT2/develop. 2016-05-31 04:00:17 +00:00
Ted John
feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00