Alli 3e3276682c fix conflicts

2010-02-18 13:49:30 +13:00

..

Effects

converted to GPLv3

2010-02-16 21:20:41 +13:00

GameRules

converted to GPLv3

2010-02-16 21:20:41 +13:00

Graphics

allow feedback on window size; ask glfw how big a window we *actually* got.

2010-02-18 08:18:46 +13:00

Network

converted to GPLv3

2010-02-16 21:20:41 +13:00

Orders

converted to GPLv3

2010-02-16 21:20:41 +13:00

Properties

converted to GPLv3

2010-02-16 21:20:41 +13:00

Support

some of a glfw window

2010-02-17 23:23:07 +13:00

Traits

converted to GPLv3

2010-02-16 21:20:41 +13:00

Actor.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Chat.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Chrome.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Combat.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Controller.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Cursor.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Exts.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Game.cs

allow feedback on window size; ask glfw how big a window we *actually* got.

2010-02-18 08:18:46 +13:00

MainWindow.cs

fix conflicts

2010-02-18 13:49:30 +13:00

OpenRa.Game.csproj

hack around crash in glfw with events before we're done with setup

2010-02-17 23:56:08 +13:00

OpenRa.ico

added makefile support for our mods

2010-02-17 23:18:09 +13:00

Ore.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

PackageDownloader.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

PathFinder.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

PathSearch.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Player.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Selection.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Shroud.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Smudge.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

Sound.cs

killed homebrew AL interop; using Tao.OpenAL now instead

2010-02-16 23:41:31 +13:00

Sync.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

TerrainCosts.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

UiOverlay.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

World.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00

WorldUtils.cs

converted to GPLv3

2010-02-16 21:20:41 +13:00