Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Monogame #16

Merged
merged 31 commits into from
Feb 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a068563
Basic components working on MonoGame.
hozuki Jan 31, 2018
ff17066
CI fix
hozuki Jan 31, 2018
ee271f6
CI fix
hozuki Jan 31, 2018
90e1c22
CI fix and package update
hozuki Jan 31, 2018
0619ebf
CI fix: NuGet restore
hozuki Jan 31, 2018
204397d
CI fix
hozuki Jan 31, 2018
39f4a00
Better prompt
hozuki Jan 31, 2018
e34fe1c
Update dependency records.
hozuki Jan 31, 2018
5b09838
Fixed deployment judgement
hozuki Jan 31, 2018
586d4ac
'Not false' -> 'Is true'
hozuki Jan 31, 2018
8ed73f1
Fixed build paths
hozuki Jan 31, 2018
f108d76
Small fixes.
hozuki Jan 31, 2018
3ec3e45
Almost there!
hozuki Feb 4, 2018
ab9a50e
AppVeyor build script.
hozuki Feb 4, 2018
70d8070
Build script
hozuki Feb 4, 2018
059b2f9
Moved FFmpeg initialization closer to BackgroundVideo's actual creation.
hozuki Feb 4, 2018
7bd743f
Build script
hozuki Feb 4, 2018
4d09d34
Build script
hozuki Feb 4, 2018
41c2569
AvatarDisplay complete.
hozuki Feb 5, 2018
8f56373
Moved score-related sources to a contributed assembly.
hozuki Feb 5, 2018
825e39e
Assemblies are CLS-compliant.
hozuki Feb 5, 2018
ecfeb9b
Change internal converters into plugins.
hozuki Feb 5, 2018
626c773
Startup config.
hozuki Feb 5, 2018
5f3a369
Easter egg, of course; and SpriteSheet2D fix.
hozuki Feb 5, 2018
a807186
NuGet specs.
hozuki Feb 5, 2018
d71fbb2
Translation manager fix.
hozuki Feb 5, 2018
c785349
Fonts change.
hozuki Feb 5, 2018
2e60f1b
Release preparations.
hozuki Feb 5, 2018
f76fb2c
Travis update
hozuki Feb 5, 2018
a96512f
Travis permission fix
hozuki Feb 5, 2018
17a64ae
Travis color fix
hozuki Feb 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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