~janisozaur/openrct2/+git/master:windows/game-bar-demo

Last commit made on 2016-10-28
Get this branch:
git clone -b windows/game-bar-demo https://git.launchpad.net/~janisozaur/openrct2/+git/master

Branch merges

Branch information

Name:
windows/game-bar-demo
Repository:
lp:~janisozaur/openrct2/+git/master

Recent commits

7ac0fa1... by Ted John <email address hidden>

Demonstrate using Windows 10 WRL API and GameBar API

a29bf99... by Max Sandholm

Install desktop entry and icons

b32e2ea... by Ted John <email address hidden>

Merge pull request #4712 from zsilencer/multiplayer

Fix more sources of desyncs

3d712dd... by zsilencer <email address hidden>

Give names to _currentTrackSelectionFlags flags

1b47bdd... by zsilencer <email address hidden>

Fix desync caused by provisional track piece peep interaction

24bd56a... by zsilencer <email address hidden>

Fix desync caused by provisional ride entrance/exit peep interaction

5699b9e... by Ted John <email address hidden>

Merge pull request #4685 from marijnvdwerf/fix/paint-5

Combine Junior RC and Water RC drawing

aef32c0... by Ted John <email address hidden>

Merge pull request #4696 from IntelOrca/render/night-lights

The light effects mod branch #3798 by @JeroenDStout has become quite out of date. I plan to properly implement it, but first I want to merge in what we have already, so that I can branch off develop again and rebase (currently rebasing this branch is too difficult, far too many commits).

Most code that this is merging is protected by the __ENABLE_LIGHTFX__ directive, so it should not make any difference until its time to enable it via a new pull request.

I have isolated it as much as possible to lightfx.c.

07f5682... by Ted John <email address hidden>

Remove lightfx debug stuff

ebe4ca4... by Ted John <email address hidden>

Rename lightfx guard