fix conflicts

This commit is contained in:
muddmaker
2015-03-21 18:15:41 -07:00
481 changed files with 58747 additions and 67796 deletions
+107 -4
View File
@@ -1,8 +1,86 @@
LOVE 0.10.0 []
--------------
Released: N/A
* Added a (work-in-progress) iOS port.
* Added love.touch module. Note that it has important differences from the touch implementation in the LÖVE 0.9 Android and iOS ports.
* Added love.touchpressed, love.touchreleased, and love.touchmoved.
* Added love.filesystem.setRequirePath and love.filesystem.getRequirePath.
* Added love.filedropped and love.directorydropped event callback functions.
* Added love.lowmemory event callback function, called when the app is running out of memory on mobile operating systems.
* Added love.wheelmoved event callback function (replaces "wu" and "wd" constants for love.mousepressed.)
* Added love.mouse.hasCursor.
* Added a boolean argument to love.mousepressed and love.mousereleased indicating whether the button event originated from a touch press.
* Added optional x/y/width/height arguments to love.keyboard.setTextInput. They tell the system where text will show up so on-screen keyboards can avoid that area.
* Added Source:getType (replaces Source:isStatic.)
* Added love.graphics.getSupported (replaces love.graphics.isSupported.)
* Added love.graphics.getSystemLimits (replaces love.graphics.getSystemLimit.)
* Added love.graphics.stencil and love.graphics.setStencilTest (replaces love.graphics.setStencil.)
* Added love.graphics.isActive.
* Added color arguments to love.graphics.clear. It no longer always uses the background color value.
* Added love.graphics.discard.
* Added optional x/y/width/height arguments to Image:refresh and Canvas:newImageData.
* Added one- and two-channel Canvas formats: r8, rg8, r16f, rg16f, r32f, and rg32f.
* Added support for different formats in each Canvas when using multi-canvas rendering. Added the "multicanvasformats" Graphics Feature constant.
* Added support for OpenGL ES 2 and 3.
* Added support for loading ETC1/2, EAC, and PVRTC1 compressed textures.
* Added Text objects and love.graphics.newText.
* Added BMFont bitmap font file support to love.graphics.newFont and love.font.
* Added love.window.maximize.
* Added BezierCurve:renderSegment and BezierCurve:removePoint.
* Removed love.filesystem.exists (use love.filesystem.isFile or love.filesystem.isDirectory instead.)
* Removed the "wu" and "wd" constants for love.mousepressed (replaced by love.wheelmoved.)
* Removed Source:isStatic (replaced by Source:getType.)
* Removed image loading support for all (non-compressed texture) file formats except for PNG, JPEG, TGA, and BMP.
* Removed love.graphics.setPointStyle and love.graphics.getPointStyle.
* Removed love.graphics.isSupported (replaced by love.graphics.getSupported.)
* Removed love.graphics.getSystemLimit (replaced by love.graphics.getSystemLimits.)
* Removed love.graphics.setStencil (replaced by love.graphics.stencil and love.graphics.setStencilTest.)
* Removed the "canvas", "shader", "npot", "subtractive", and "mipmap" Graphics Feature constant (the features always have guaranteed support now.)
* Removed Canvas:getPixel (use Canvas:newImageData instead.)
* Removed Canvas:clear (use love.graphics.clear instead.)
* Removed functions deprecated in LOVE 0.9.x:
* Removed Canvas:getType (replaced by Canvas:getFormat.)
* Removed love.graphics.getMaxTextureSize/getMaxImageSize (replaced by love.graphics.getSystemLimits.)
* Removed love.graphics.getMaxPointSize (replaced by love.graphics.getSystemLimits.)
* Removed Mesh:set/getImage, SpriteBatch:set/getImage, and ParticleSystem:set/getImage (replaced by set/getTexture.)
* Removed SpriteBatch:bind/unbind.
* Removed Canvas:getFSAA and the "fsaa" flag in love.conf and love.window.setMode (replaced by Canvas:getMSAA and "msaa".)
* Removed the "dxt" and "bc5" Graphics Feature constant (replaced by love.graphics.getCompressedImageFormats.)
* Removed the "hdrcanvas" Graphics Feature constant (replaced by love.graphics.getCanvasFormats.)
* Removed love.window.getWidth/getHeight (use love.graphics.getWidth/getHeight or love.window.getMode instead.)
* Renamed the fullscreen type "normal" to "exclusive".
* Renamed the Distance Model constants "inverse clamped", "linear clamped", and "exponent clamped" to "inverseclamped", "linearclamped", and "exponentclamped".
* Renamed blend modes "additive", "subtractive", and "multiplicative" to "add", "subtract", and "multiply".
* Renamed the key constant and scancode representing the spacebar from " " to "space".
* Renamed Canvas:getImageData to Canvas:newImageData.
* Fixed love.graphics.getKeyFromScancode crashing when an invalid scancode is given.
* Fixed the stencil buffer in Canvases when an unsupported MSAA value is used to create the Canvas.
* Updated the compatibility warning notice to use a message box.
* Updated love.keypressed to be love.keypressed(key, scancode, isrepeat).
* Updated love.keyreleased to be love.keyreleleased(key, scancode).
* Updated love.math.setRandomSeed and RandomGenerator:setSeed to produce better results for the first few random() calls.
* Updated Source methods that deal with spatial audio to error rather than failing silently if the Source isn't mono.
* Updated ImageFonts to no longer treat separator pixels as spacing.
* Updated the default font to use less memory.
* Updated the default fullscreen type to be "desktop" rather than "exclusive".
* Updated the minimum runtime system requirements of LOVE to require OpenGL 2.1 or OpenGL ES 2 support.
* Updated the pixel shader effect function so screen_coords.y is 0 at the top of the screen instead of the bottom.
* Updated love.graphics.newImage's optional second argument to be a table of flags (flags are "mipmaps" and "srgb".)
* Updated Images to require setting the mipmaps flag to true on creation in order to use mipmaps.
* Updated Images to allow mipmaps for non-power-of-two sizes.
LOVE 0.9.2 [Baby Inspector]
---------------------------
Released: N/A
Released: 2015-02-14
* Added Lua 5.3's UTF-8 module (via utf8 = require("utf8")).
* Added Shader:getExternVariable.
* Added several new canvas texture formats.
* Added love.graphics.getCanvasFormats.
@@ -11,11 +89,20 @@ LOVE 0.9.2 [Baby Inspector]
* Added ParticleSystem:setLinearDamping.
* Added SpriteBatch:flush.
* Added love.graphics.getStats.
* Added "mirroredrepeat" wrap mode.
* Added love.audio.setDopplerScale and love.audio.getDopplerScale.
* Added optional duration argument to Joystick:setVibration.
* Added love.joystick.loadGamepadMappings and love.joystick.saveGamepadMappings.
* Added Joint:setUserData and Joint:getUserData.
* Added Joint:getBodies.
* Added GearJoint:getJoints.
* Added Contact:getFixtures and Body:getContactList.
* Added Body:getWorld.
* Added Body:getJointList.
* Added Body/Contact/Fixture/Joint/World:isDestroyed.
* Added love.mousemoved event callback.
* Added love.mouse.setRelativeMode and love.mouse.getRelativeMode.
* Added Scancode enums, love.keyboard.getKeyFromScancode, and love.keyboard.getScancodeFromKey.
* Added love.window.getDisplayName.
* Added love.window.minimize.
* Added love.window.showMessageBox.
@@ -23,49 +110,65 @@ LOVE 0.9.2 [Baby Inspector]
* Added love.window.toPixels and love.window.fromPixels.
* Added love.window.setPosition and love.window.getPosition, and 'x' and 'y' fields to love.window.setMode and t.window in love.conf.
* Added love.filesystem.isSymlink, love.filesystem.setSymlinksEnabled, and love.filesystem.areSymlinksEnabled.
* Added BezierCurve:renderSegment and BexierCurve:removePoint.
* Added love.filesystem.getRealDirectory.
* Deprecated SpriteBatch:bind and SpriteBatch:unbind.
* Deprecated all uses of the name 'FSAA' in favor of 'MSAA'.
* Deprecated the 'hdrcanvas' graphics feature enum in favor of getCanvasFormats.
* Deprecated the 'dxt' and 'bc5' graphics feature enums in favor of getCompressedImageFormats.
* Fixed crashes when love objects are used in multiple threads.
* Fixed love.filesystem.setIdentity breaking in some situations when called multiple times.
* Fixed the default love.filesystem identity when in Fused mode in Windows.
* Fixed love.system.openURL sometimes blocking indefinitely on Linux.
* Fixed love.joystick.setGamepadMapping.
* Fixed the order of vertices in ChainShapes.
* Fixed love.mouse.getPosition returning outdated values if love.mouse.setPosition is used in the same frame.
* Fixed love.graphics.newFont to error when given an invalid size argument.
* Fixed the filename and backtrace given when love.graphics.print errors.
* Fixed a small memory leak if love.graphics.newCanvas errors.
* Fixed shader:getWarnings returning unnecessary information.
* Fixed some cases of noncompliant shader code not properly erroring on some nvidia drivers.
* Fixed a potential crash when Shader objects are garbage collected.
* Fixed a potential small memory leak triggered when love.graphics.newShader errors.
* Fixed love.graphics.newMesh(vertexcount, ...) causing the Mesh to do instanced rendering.
* Fixed Mesh:getVertexMap.
* Fixed Image:refresh generating mipmaps multiple times if mipmap filtering is enabled.
* Fixed Image:setMipmapFilter to not keep bad state around if it errors.
* Fixed Mesh:setDrawRange when the Mesh has a vertex map set.
* Fixed internal detection of the 'position' and 'effect' shader functions.
* Fixed Texture memory leak when Meshes are garbage collected.
* Fixed the default line join mode to be 'miter' instead of an undefined value.
* Fixed the default error handler text size when highdpi mode is enabled on a Retina monitor.
* Fixed the default error handler background color when sRGB mode is enabled for the window.
* Fixed love.window.setMode to fall back to the largest available mode if a width or height greater than the largest supported is specified and fullscreen=true.
* Fixed love.window.setMode to fall back to the largest available mode if a width or height greater than the largest supported is specified and fullscreen is used.
* Fixed the state of wireframe mode when love.window.setMode is called.
* Fixed Canvas:getPixel to error if the coordinates are not within the Canvas' size.
* Fixed detection of compressed textures to work regardless of the file's extension.
* Renamed all cases of FSAA to MSAA. The FSAA names still exist for backward-compatibility.
* Updated the Windows executable to automatically prefer the higher performance GPU on nvidia Optimus systems.
* Updated the --console command-line argument in Windows to open the console before conf.lua is loaded.
* Updated t.console and the --console command-line argument in Windows to use the existing Console window, if love was launched from one.
* Updated the love executable to verify that the love library's version matches.
* Updated the Lua wrapper code for modules to avoid crashes when the module's instance is created, deleted, and recreated.
* Updated internal code for handling garbage collection of love objects to be more efficient.
* Updated love's initialization code to trigger a Lua error if love.conf has an error in it.
* Updated the paths returned by love.filesystem.getSaveDirectory and friends to strip double-slashes from the string.
* Updated the error message when love.filesystem.write or File:open fails because the directory doesn't exist.
* Updated the error message when love.math.setRandomseed(0) is attempted.
* Updated the error message when invalid UTF-8 strings are used in love functions that expect UTF-8.
* Updated love.physics.newPolygonShape and love.physics.newChainShape to accept a table of vertices.
* Updated love.physics.newChainShape to error if the number of arguments is invalid.
* Updated love.thread.newThread to accept a literal string of code directly.
* Updated love-created threads to use names visible in external debuggers.
* Updated SpriteBatch:unbind to use less VRAM if the SpriteBatch has the static usage hint.
* Updated love.graphics.newImage, love.image.newImageData, etc. to leave less Lua-owned memory around.
* Updated love.graphics.push to accept different stack types to push. Current types are "transform" and "all".
* Updated love shaders to accept GLSL ES precision qualifiers on variables, although they do nothing.
* Updated the error message for love.graphics.newShader to be less cryptic if an invalid filename is given.
* Updated compressed texture loading code to allow BC6 and BC7 compressed textures (if the graphics driver supports them.)
LOVE 0.9.1 [Baby Inspector]
---------------------------
@@ -213,7 +316,7 @@ LOVE 0.9.0 [Baby Inspector]
* Added love.window.getIcon.
* Added t.window.icon to love.conf.
* Added love.mousefocus and love.window.hasMouseFocus.
* Added custom hardware cursors via love.mouse.newCursor.
* Added custom hardware cursors via love.mouse.newCursor.
* Added love.mouse.setX/setY.
* Added Joystick objects.
* Added love.joystick.getJoystick.