Merge for 2.5.1 Release, from develop #531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for SoundEffect on Windows
Fixed a bug that calling MediaPlayer.Play(song) twice would play 2 diffe...
Address issue #397
Any component added before base.Initialize is called in a Game implementation might never be initialized or drawn. This includes components that are added by other components in their Initialize method.
develop - Suspends update/draw when iOS apps go inactive.
develop - Fixes a problem initializing components under certain circumstances.
Bug fixed when SoundEffect was Disposed but not stopped.
…tors-fix Added == and != operator overloads based on implementation in develop3d branch.
Fix TextFieldAlertView for iOS5.
… as a Dictionary as TODO stated.
Fixed an issue where OpenTK D0 would return Xna D1.
…TextureFonts Made per-letter position increment use Cropping X value
The FromFile method currently calls UIImage.FromBundle which takes advantage of automatically loading @2x images for high resolution retina devices. However it can only load files from the Content folder. The UIImage.FromFile method allows you to load graphics from the document folder as well as the Content folder, however it does not automatically cope with loading @2x images like the FromBundle method does. Therefore this change will check the path we are trying to load - if it is from the Content folder then we continue to call UIImage.FromBundle, however if it is from anywhere else then we will call UIImage.FromFile.
Added the methods SaveAsPng and SaveAsJpeg. Both of these methods (and the CreateRGBImageFromBufferData method that they call) are taken from the MacOS MonoGame implementation with a very minor change to the CGImageAlphaInfo declaration to ensure correct Alpha channel is stored and to ensure the Red and Blue are in the correct order. One issue is that the XNA representation of this method takes a Stream whereas this version takes a filename. Is that OK? Also note I have not checked the return value of the err out parameter in the NSData Save method.
…ture2D-From-Documents-Path iOS - Texture2D - Change FromFile so you can load from Documents folder - Awesome Thanks!!
Added the methods SaveAsPng and SaveAsJpeg. Both of these methods (and the CreateRGBImageFromBufferData method that they call) are taken from the MacOS MonoGame implementation with a very minor change to the CGImageAlphaInfo declaration to ensure the correct Alpha channel is stored and to ensure the Red and Blue are in the correct order. This commit also ensures that the method signature matches the XNA API
…-SaveAsJpeg Texture2D - Support for SaveAsPng and SaveAsJpeg
Correct naming of AddCursorRectcursor to AddCursorRect as it has been renamed
…mitives still dont work but they dont crash now
a few fixes to the new gamepad code
map sticks and triggers to buttons
make sure textures get properly disposed
…aised under iOS, due to call to LoadAll.
More changes that I thought.
Texture2D: Initialize textureData array
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.
The template tries to place requirements on the closed-source gamepad bridge no longer shipped with MonoGame. Remove it to prevent build failures.
some fixes to allow the Video to work on android.
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.
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.
Project template and deployment fixes for Linux
…ather than RGBA Updated all uses of DateTime.Now to DateTime.UtcNow to reduce consing....
Fixed the installer to pick up the VS 2010 templates from the zip files
Fixed the namespaces for SongReader and SoundEffectReader for Android
dellis1972
added a commit
that referenced
this pull request
Jun 18, 2012
Merge for 2.5.1 Release, from develop
|
Grats on the 2.5.1 release. Looks like some great fixes. |
alxwest
pushed a commit
to alxwest/MonoGame
that referenced
this pull request
May 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
updated android to use enumerations rather than hardocded ids as part of the Mono for Android 4.2 update
changed the Android video player to make use of the ViewView.
corrected namespaces for SongReader and SoundEffectReader
Updated the Keyboard mapping for android
Added RectangleArrayReader
Remvoed links to the third party GamePadBridge.
Added some missing mouseState operators
Replaced all calls to DateTime.Now with DateTime.UtcNow
Fixed SpriteFont rendering (again)
Added code to correclty dispose of Textures on all platforms
Added some fixes for the sound on iOS
Adding missing MediaQueue class
fixed Rectangle Intersect code
Changed the way UserPrimitives work on windows
Made sure the @2x file support on iOS works
Updated project templates
added project templates for Mac
Fixed MonoDevelop.MonoGame AddIn so it works on Linux