Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[Branch Migration] Develop3d #1365

Merged
merged 39 commits into from

7 participants

@tomspilman
Owner

This is the first of 3 pull requests applying our branch migration strategy:

https://github.com/mono/MonoGame/wiki/Branch-Migration-Strategy

This first step fixes all conflicts with the develop branch making it easier for downstream users to eventually migrate their work to the new develop branch.

While there are commits here there are no actual files changed because we are accepting the develop3d versions of all files.

dellis1972 and others added some commits
@dellis1972 dellis1972 some fixes to allow the Video to work on android. a41472a
@directhex directhex Create a pkg-config file for MonoGame.
This assumes, that, for example, if the pkg-config prefix used is
/usr/lib/pkgconfig then the MonoGame assemblies are installed to
/usr/lib/monogame.

This pkg-config file places a requirement on OpenTK and Tao.SDL packages
to be provided by the distribution.

The net result is that "mcs -pkg:monogame mygame.cs" will build against
MonoGame.
7d80899
@directhex directhex Remove obsolete calls to closed-source gamepad bridge in template.
The template tries to place requirements on the closed-source
gamepad bridge no longer shipped with MonoGame. Remove it to prevent
build failures.
f94e668
@tomspilman tomspilman Merge pull request #519 from dellis1972/develop
some fixes to allow the Video to work on android.
0a873a9
@directhex directhex Work around "Copy Local" bug in MonoDevelop
As detailed in MonoDevelop bug 4030, assembly references which resolve via
pkg-config packages and are non-GAC are never copied locally to the assembly
output folder, which means the app will not run if it relies upon one of
these unstable libraries (MonoMac also suffers from this)

Copy-paste a workaround from the MonoMac source code where any libraries
resolved from monogame.pc should be forcefully copied to the output folder
of the build, for all MonoGame project types.
e5d6d41
@directhex directhex Fix assembly reference in template to drop unneeded ".dll" extension
MonoDevelop's assembly reference resolver doesn't work if you have "Gac"
references with file extensions. Drop the .dll, and MonoDevelop will find
Tao from a suitable location such as the GAC or a pkg-config package.
e23c977
@dellis1972 dellis1972 Merge pull request #523 from directhex/develop
Project template and deployment fixes for Linux
a7c987f
@dellis1972 dellis1972 Fixed http://monogame.codeplex.com/workitem/6680 3d09540
@dellis1972 dellis1972 Merge remote-tracking branch 'upstream/develop' into develop 6cc181c
@dellis1972 dellis1972 Fixed texture order of the GetData in uint format to match xna ABGR r…
…ather than RGBA

Updated all uses of DateTime.Now to DateTime.UtcNow to reduce consing....
1c94cf4
@dellis1972 dellis1972 Updated version to 2.5.1.0 529458f
@dellis1972 dellis1972 Fixes to the Project Templates for the 2.5.1 release
Fixed the installer to pick up the VS 2010 templates from the zip files
829213b
@dellis1972 dellis1972 Reverted the RGBA -> ABGR change adf2a4d
@CartBlanche CartBlanche Merge pull request #526 from dellis1972/develop
Fixed the namespaces for SongReader and SoundEffectReader for Android
641cd37
@dellis1972 dellis1972 Update develop 6db52ec
@directhex directhex Force build to use UTF-8 locale, otherwise build fails when it encoun…
…ters UTF-8 characters when it hits UTF-8 characters in source.
165269a
@dellis1972 dellis1972 Merge pull request #532 from directhex/develop
Force build to use UTF-8 locale
6529eae
@dellis1972 dellis1972 Updated the Android/AndroidGamePlatform.cs to take into account the e…
…mulator and use GL.Flush rather than swap buffers.
5365508
@dellis1972 dellis1972 Merge remote-tracking branch 'upstream/develop' into develop 2394f57
@CartBlanche CartBlanche Merge pull request #544 from dellis1972/develop
Fix to stop the flickering on the emulator when using gles 1.1
4952f59
@CartBlanche CartBlanche back ported changes from develop3d's VertextBuffer changes to allow P…
…articleSample to build.
f8255dc
@CartBlanche CartBlanche Merge remote-tracking branch 'upstream/develop' into develop 47b6621
@dellis1972 dellis1972 Merge pull request #559 from CartBlanche/develop
Develop : back ported changes to DynamicVertexBuffer and VertexBuffer...
a1ab849
@Aranda Aranda Much improved screen rotation support for Android. Works like Xna now.
- OrientationListener improved and moved out of AndroidGameActivity.cs to it's own file to aid debugging.
- Removed incorrect touch coordinate flipping for LandscapeRight
- Support for rotating to reverse orientations when OS >= 2.3
- Correct handling of DisplayOrientation.Default (ie equivalent of LandscapeLeft | LandscapeRight)
31cfc1a
@Aranda Aranda Merge branch 'develop' of http://github.com/mono/MonoGame into develo…
…p_android_orientation

Conflicts:
	MonoGame.Framework/Android/AndroidGameActivity.cs
	MonoGame.Framework/Android/AndroidGameWindow.cs
b8f2feb
@Aranda Aranda Remove unnecessary projection flip in SpriteBatch.cs and link SetSupp…
…ortedOrientations
bbd6a4e
@Aranda Aranda Remove unnecessary projection flip in SpriteBatch.cs and link SetSupp…
…ortedOrientations
3ac5120
@Aranda Aranda Merge branch 'develop' of http://github.com/Aranda/MonoGame into develop
Conflicts:
	MonoGame.Framework/Graphics/SpriteBatch.cs
e4b049b
@dellis1972 dellis1972 Merge pull request #561 from Aranda/develop
develop branch: Android orientation handling
477f620
@Aranda Aranda Lock default orientation based on PreferredBackBuffer(Width/Height)
GraphicsDeviceManager:
- Set default preferred size to a landscape aspect ratio to cause it to default to landscape if the user does not set the preferred sizes
- Removed calls to ResetClientBounds in setters for PreferredBackBuffer(Width/Height). Setting preferred buffer sizes should not have immediate effect. They are just stored for next device reset.

AndroidGameWindow:
- Use PreferredBackBuffer(Width/Height) to determine landscape vs portrait when handling SupportedOrientations == DisplayOrientation.Default.
d217389
@Aranda Aranda Merge branch 'develop' of http://github.com/mono/MonoGame into develop f71082a
@Aranda Aranda Fix interaction between screen orientation and manually specifying pr…
…eferred back buffer size.

- Fixed GraphicsDeviceManager.ResetClientBounds() to handle preferred back buffer size of different orientation to current display orientation
- removed bool _preferredBackBufferSetByUser as GraphicsDeviceManager.ResetClientBounds() now correctly handles the case where it is not set by user
ac05109
@dellis1972 dellis1972 Merge pull request #567 from Aranda/develop
develop branch: Android - lock default orientation based on PreferredBackBuffer(Width/Height)
d54b5ec
@dellis1972 dellis1972 Added a DoExiting method to allow the Android Platform to raise the E…
…xiting event

Added ScreenReciever implementation
d858070
@CartBlanche CartBlanche Merge pull request #569 from dellis1972/develop
Fixes to Android platfrom not calling Exiting and handle screen locked
e1ccc22
@timothyparez timothyparez Added Texture2D.FromStream() as available in XNA4 5567f22
@timothyparez timothyparez .FromStream now calls the .FromFile method
I did not notice there was an overload with a stream already present.
So now FromStream just calls that, for XNA 4 compatibility
3c3f8ba
@dellis1972 dellis1972 Merge pull request #635 from timothyparez/develop
Added Texture2D.FromStream() as available in XNA4
794358b
@tomspilman tomspilman Merge branch 'develop' into develop3d 02fef9d
@tomspilman
Owner

Note for extra safety I tested this by downloading ZIPs of develop3d and my develop3d and using a compare tool to ensure they are 100% identical.

@KonajuGames
Owner

This and the next two PRs appeared to merge fine in my local test. No problems found. I'm happy with these PRs as they are.

@tomspilman
Owner

Cool.

@dellis1972 I think it is up to you now. :)

@dellis1972 dellis1972 merged commit 1ea236c into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 13, 2012
  1. @dellis1972
  2. @directhex

    Create a pkg-config file for MonoGame.

    directhex authored
    This assumes, that, for example, if the pkg-config prefix used is
    /usr/lib/pkgconfig then the MonoGame assemblies are installed to
    /usr/lib/monogame.
    
    This pkg-config file places a requirement on OpenTK and Tao.SDL packages
    to be provided by the distribution.
    
    The net result is that "mcs -pkg:monogame mygame.cs" will build against
    MonoGame.
  3. @directhex

    Remove obsolete calls to closed-source gamepad bridge in template.

    directhex authored
    The template tries to place requirements on the closed-source
    gamepad bridge no longer shipped with MonoGame. Remove it to prevent
    build failures.
Commits on Jun 14, 2012
  1. @tomspilman

    Merge pull request #519 from dellis1972/develop

    tomspilman authored
    some fixes to allow the Video to work on android.
Commits on Jun 15, 2012
  1. @directhex

    Work around "Copy Local" bug in MonoDevelop

    directhex authored
    As detailed in MonoDevelop bug 4030, assembly references which resolve via
    pkg-config packages and are non-GAC are never copied locally to the assembly
    output folder, which means the app will not run if it relies upon one of
    these unstable libraries (MonoMac also suffers from this)
    
    Copy-paste a workaround from the MonoMac source code where any libraries
    resolved from monogame.pc should be forcefully copied to the output folder
    of the build, for all MonoGame project types.
  2. @directhex

    Fix assembly reference in template to drop unneeded ".dll" extension

    directhex authored
    MonoDevelop's assembly reference resolver doesn't work if you have "Gac"
    references with file extensions. Drop the .dll, and MonoDevelop will find
    Tao from a suitable location such as the GAC or a pkg-config package.
  3. @dellis1972

    Merge pull request #523 from directhex/develop

    dellis1972 authored
    Project template and deployment fixes for Linux
Commits on Jun 17, 2012
  1. @dellis1972
  2. @dellis1972
  3. @dellis1972

    Fixed texture order of the GetData in uint format to match xna ABGR r…

    dellis1972 authored
    …ather than RGBA
    
    Updated all uses of DateTime.Now to DateTime.UtcNow to reduce consing....
  4. @dellis1972

    Updated version to 2.5.1.0

    dellis1972 authored
  5. @dellis1972

    Fixes to the Project Templates for the 2.5.1 release

    dellis1972 authored
    Fixed the installer to pick up the VS 2010 templates from the zip files
Commits on Jun 18, 2012
  1. @dellis1972
  2. @CartBlanche

    Merge pull request #526 from dellis1972/develop

    CartBlanche authored
    Fixed the namespaces for SongReader and SoundEffectReader for Android
  3. @dellis1972

    Update develop

    dellis1972 authored
  4. @directhex

    Force build to use UTF-8 locale, otherwise build fails when it encoun…

    directhex authored
    …ters UTF-8 characters when it hits UTF-8 characters in source.
  5. @dellis1972

    Merge pull request #532 from directhex/develop

    dellis1972 authored
    Force build to use UTF-8 locale
Commits on Jun 20, 2012
  1. @dellis1972

    Updated the Android/AndroidGamePlatform.cs to take into account the e…

    dellis1972 authored
    …mulator and use GL.Flush rather than swap buffers.
  2. @dellis1972
  3. @CartBlanche

    Merge pull request #544 from dellis1972/develop

    CartBlanche authored
    Fix to stop the flickering on the emulator when using gles 1.1
Commits on Jun 23, 2012
  1. @CartBlanche
Commits on Jun 24, 2012
  1. @CartBlanche
Commits on Jun 28, 2012
  1. @dellis1972

    Merge pull request #559 from CartBlanche/develop

    dellis1972 authored
    Develop : back ported changes to DynamicVertexBuffer and VertexBuffer...
Commits on Jul 3, 2012
  1. @Aranda

    Much improved screen rotation support for Android. Works like Xna now.

    Aranda authored
    - OrientationListener improved and moved out of AndroidGameActivity.cs to it's own file to aid debugging.
    - Removed incorrect touch coordinate flipping for LandscapeRight
    - Support for rotating to reverse orientations when OS >= 2.3
    - Correct handling of DisplayOrientation.Default (ie equivalent of LandscapeLeft | LandscapeRight)
  2. @Aranda

    Merge branch 'develop' of http://github.com/mono/MonoGame into develo…

    Aranda authored
    …p_android_orientation
    
    Conflicts:
    	MonoGame.Framework/Android/AndroidGameActivity.cs
    	MonoGame.Framework/Android/AndroidGameWindow.cs
  3. @Aranda
  4. @Aranda
  5. @Aranda

    Merge branch 'develop' of http://github.com/Aranda/MonoGame into develop

    Aranda authored
    Conflicts:
    	MonoGame.Framework/Graphics/SpriteBatch.cs
  6. @dellis1972

    Merge pull request #561 from Aranda/develop

    dellis1972 authored
    develop branch: Android orientation handling
Commits on Jul 6, 2012
  1. @Aranda

    Lock default orientation based on PreferredBackBuffer(Width/Height)

    Aranda authored
    GraphicsDeviceManager:
    - Set default preferred size to a landscape aspect ratio to cause it to default to landscape if the user does not set the preferred sizes
    - Removed calls to ResetClientBounds in setters for PreferredBackBuffer(Width/Height). Setting preferred buffer sizes should not have immediate effect. They are just stored for next device reset.
    
    AndroidGameWindow:
    - Use PreferredBackBuffer(Width/Height) to determine landscape vs portrait when handling SupportedOrientations == DisplayOrientation.Default.
  2. @Aranda
Commits on Jul 7, 2012
  1. @Aranda

    Fix interaction between screen orientation and manually specifying pr…

    Aranda authored
    …eferred back buffer size.
    
    - Fixed GraphicsDeviceManager.ResetClientBounds() to handle preferred back buffer size of different orientation to current display orientation
    - removed bool _preferredBackBufferSetByUser as GraphicsDeviceManager.ResetClientBounds() now correctly handles the case where it is not set by user
Commits on Jul 9, 2012
  1. @dellis1972

    Merge pull request #567 from Aranda/develop

    dellis1972 authored
    develop branch: Android - lock default orientation based on PreferredBackBuffer(Width/Height)
  2. @dellis1972

    Added a DoExiting method to allow the Android Platform to raise the E…

    dellis1972 authored
    …xiting event
    
    Added ScreenReciever implementation
Commits on Jul 10, 2012
  1. @CartBlanche

    Merge pull request #569 from dellis1972/develop

    CartBlanche authored
    Fixes to Android platfrom not calling Exiting and handle screen locked
Commits on Jul 29, 2012
  1. @timothyparez
Commits on Jul 30, 2012
  1. @timothyparez

    .FromStream now calls the .FromFile method

    timothyparez authored
    I did not notice there was an overload with a stream already present.
    So now FromStream just calls that, for XNA 4 compatibility
Commits on Jul 31, 2012
  1. @dellis1972

    Merge pull request #635 from timothyparez/develop

    dellis1972 authored
    Added Texture2D.FromStream() as available in XNA4
Commits on Feb 14, 2013
  1. @tomspilman
This page is out of date. Refresh to see the latest.
Showing with 0 additions and 0 deletions.
Something went wrong with that request. Please try again.