Skip to content

Commit

Permalink
Merge pull request #16 from hozuki/monogame
Browse files Browse the repository at this point in the history
Migrate to Monogame
  • Loading branch information
hozuki authored Feb 5, 2018
2 parents 3ce5b92 + 17a64ae commit 58b2253
Show file tree
Hide file tree
Showing 621 changed files with 8,893 additions and 13,917 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "thirdparty/UnityStudioLib"]
path = thirdparty/UnityStudioLib
url = https://github.com/OpenMLTD/UnityStudioLib.git
[submodule "thirdparty/MonoGame.Extended2"]
path = thirdparty/MonoGame.Extended2
url = https://github.com/hozuki/MonoGame.Extended2.git
[submodule "thirdparty/SharpAL"]
path = thirdparty/SharpAL
url = https://github.com/OpenCGSS/SharpAL.git
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ env:
- MAIN_VER=0.3.0 SOLUTION_NAME=MilliSim.sln CONFIGURATION=Release RELEASE_SUFFIX=-alpha

before_install:
- sudo chmod 777 scripts/travis_no_monogame.sh
- ./scripts/travis_no_monogame.sh
- sudo apt-get install -y gtk-sharp2 p7zip-full nodejs npm
- sudo npm install -g n
- sudo n lts
Expand All @@ -22,8 +24,10 @@ before_script:
- node scripts/patch_asminfo.js

script:
- sudo chmod 777 scripts/travis_empty_build.sh
- ./scripts/travis_empty_build.sh
# Disables "No doc for public member"
- msbuild MilliSim.sln /p:Configuration=Release /verbosity:minimal /p:nowarn=1591
#- msbuild MilliSim.sln /p:Configuration=Release /verbosity:minimal /p:nowarn=1591

before_deploy:
- marked ./README.md -o README.html
Expand Down
244 changes: 145 additions & 99 deletions MilliSim.sln

Large diffs are not rendered by default.

86 changes: 0 additions & 86 deletions OpenMLTD.MilliSim.Audio/AudioBuffer.cs

This file was deleted.

44 changes: 0 additions & 44 deletions OpenMLTD.MilliSim.Audio/AudioContext.cs

This file was deleted.

62 changes: 0 additions & 62 deletions OpenMLTD.MilliSim.Audio/AudioDevice.cs

This file was deleted.

68 changes: 0 additions & 68 deletions OpenMLTD.MilliSim.Audio/AudioListener.cs

This file was deleted.

21 changes: 0 additions & 21 deletions OpenMLTD.MilliSim.Audio/AudioObject.cs

This file was deleted.

Loading

0 comments on commit 58b2253

Please sign in to comment.