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.

Sign up for GitHub

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

Jump to bottom

[Branch Migration] Develop3d #1365

Merged
merged 39 commits into from Feb 14, 2013
Merged

[Branch Migration] Develop3d #1365

Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a41472a
some fixes to allow the Video to work on android.
dellis1972 Jun 13, 2012
7d80899
Create a pkg-config file for MonoGame.
directhex Jun 13, 2012
f94e668
Remove obsolete calls to closed-source gamepad bridge in template.
directhex Jun 13, 2012
0a873a9
Merge pull request #519 from dellis1972/develop
tomspilman Jun 14, 2012
e5d6d41
Work around "Copy Local" bug in MonoDevelop
directhex Jun 15, 2012
e23c977
Fix assembly reference in template to drop unneeded ".dll" extension
directhex Jun 15, 2012
a7c987f
Merge pull request #523 from directhex/develop
dellis1972 Jun 15, 2012
3d09540
Fixed http://monogame.codeplex.com/workitem/6680
dellis1972 Jun 17, 2012
6cc181c
Merge remote-tracking branch 'upstream/develop' into develop
dellis1972 Jun 17, 2012
1c94cf4
Fixed texture order of the GetData in uint format to match xna ABGR r…
dellis1972 Jun 17, 2012
529458f
Updated version to 2.5.1.0
dellis1972 Jun 17, 2012
829213b
Fixes to the Project Templates for the 2.5.1 release
dellis1972 Jun 17, 2012
adf2a4d
Reverted the RGBA -> ABGR change
dellis1972 Jun 18, 2012
641cd37
Merge pull request #526 from dellis1972/develop
CartBlanche Jun 18, 2012
6db52ec
Update develop
dellis1972 Jun 18, 2012
165269a
Force build to use UTF-8 locale, otherwise build fails when it encoun…
directhex Jun 18, 2012
6529eae
Merge pull request #532 from directhex/develop
dellis1972 Jun 18, 2012
5365508
Updated the Android/AndroidGamePlatform.cs to take into account the e…
dellis1972 Jun 20, 2012
2394f57
Merge remote-tracking branch 'upstream/develop' into develop
dellis1972 Jun 20, 2012
4952f59
Merge pull request #544 from dellis1972/develop
CartBlanche Jun 20, 2012
f8255dc
back ported changes from develop3d's VertextBuffer changes to allow P…
CartBlanche Jun 23, 2012
47b6621
Merge remote-tracking branch 'upstream/develop' into develop
CartBlanche Jun 24, 2012
a1ab849
Merge pull request #559 from CartBlanche/develop
dellis1972 Jun 28, 2012
31cfc1a
Much improved screen rotation support for Android. Works like Xna now.
Aranda Jul 2, 2012
b8f2feb
Merge branch 'develop' of http://github.com/mono/MonoGame into develo…
Aranda Jul 3, 2012
bbd6a4e
Remove unnecessary projection flip in SpriteBatch.cs and link SetSupp…
Aranda Jul 3, 2012
3ac5120
Remove unnecessary projection flip in SpriteBatch.cs and link SetSupp…
Aranda Jul 3, 2012
e4b049b
Merge branch 'develop' of http://github.com/Aranda/MonoGame into develop
Aranda Jul 3, 2012
477f620
Merge pull request #561 from Aranda/develop
dellis1972 Jul 3, 2012
d217389
Lock default orientation based on PreferredBackBuffer(Width/Height)
Aranda Jul 6, 2012
f71082a
Merge branch 'develop' of http://github.com/mono/MonoGame into develop
Aranda Jul 6, 2012
ac05109
Fix interaction between screen orientation and manually specifying pr…
Aranda Jul 7, 2012
d54b5ec
Merge pull request #567 from Aranda/develop
dellis1972 Jul 9, 2012
d858070
Added a DoExiting method to allow the Android Platform to raise the E…
dellis1972 Jul 9, 2012
e1ccc22
Merge pull request #569 from dellis1972/develop
CartBlanche Jul 10, 2012
5567f22
Added Texture2D.FromStream() as available in XNA4
timothyparez Jul 29, 2012
3c3f8ba
.FromStream now calls the .FromFile method
timothyparez Jul 30, 2012
794358b
Merge pull request #635 from timothyparez/develop
dellis1972 Jul 31, 2012
02fef9d
Merge branch 'develop' into develop3d
tomspilman Feb 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.