axmol/CHANGELOG

1989 lines
131 KiB
Plaintext
Raw Normal View History

2014-10-16 15:40:34 +08:00
cocos2d-x-3.3-rc0 Oct.21 2014
2014-09-30 11:17:03 +08:00
[NEW] 3d: added light support: direction light, point light, spot light and ambient light
2014-10-16 12:00:42 +08:00
[NEW] Added ClippingRectangleNode
[NEW] Added AssetsManagerEx, which is more powerful than AssetsManager
2014-09-30 15:11:51 +08:00
[NEW] Audio: new audio supports Mac OS X and Windows
2014-09-25 13:46:12 +08:00
[NEW] Application: added openUrl()
2014-09-28 17:25:04 +08:00
[NEW] Armature: added getOffsetPoints()
2014-09-29 18:00:29 +08:00
[NEW] Lua-binding: added Camera3DTest ,BillBoradTest
[NEW] Node: schedule/unschedule lambda functions
2014-09-23 11:18:56 +08:00
[NEW] Rect: added merge()
2014-10-13 13:52:20 +08:00
[NEW] TileMap: added staggered tile map support
2014-09-23 11:18:56 +08:00
[NEW] Utils: added getCascadeBoundingBox()
2014-09-22 09:33:09 +08:00
[NEW] UI: `WebView` support on windows
2014-09-29 18:04:10 +08:00
[NEW] WP8: enabled screen orientation change handling
2014-09-25 09:43:11 +08:00
[FIX] Accelerometer: using Accelerometer will freeze app and then crash on WP8
2014-10-11 16:27:45 +08:00
[FIX] Application: getCurrentLanguageCode() always return empty string
[FIX] Action: kRepeatForever macro superseded by CC_REPEAT_FOREVER macro
2014-09-26 11:01:18 +08:00
[FIX] C++: remove armv7s in VALID_ARCHS for Xcode projects
[FIX] Cocos Studio reader: UI animation playing crash if GUI JSON file is loaded again
[FIX] Cocos Studio reader: improvement ImageViewReader don't necessary loadTexture when imageFilePath is empty
2014-09-25 13:52:20 +08:00
[FIX] EditBox: view rendereed in wrong position if click EditBox on iOS 8
2014-10-10 16:30:26 +08:00
[FIX] FileUtils: can not remove files/directory on iOS devices
2014-10-10 15:30:30 +08:00
[FIX] GLProgram: crashed on some Android devices that do not support more than 8 attributes
2014-09-25 14:47:03 +08:00
[FIX] Label: getStringNumLines() may returns wrong result if label is dirty
2014-10-09 15:53:04 +08:00
[FIX] Label: can not change opacity if using FNT font
2014-10-09 16:08:56 +08:00
[FIX] Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-10 15:56:15 +08:00
[FIX] LabelAtlas: opacity do not change when setting parent's opacity
[FIX] Lua-bindings: may crash if passing two-dimensional table from lua to c++
2014-09-30 15:21:54 +08:00
[FIX] New audio: can not play audio after playing some times on Android
[FIX] Node: macro scheduler_selector() superseded by CC_SCHEDULER_SELECTOR(). The same is true for the other schedule_ macros
[FIX] Node: unscheduleAllSelectors() deprecated in favor of unscheudleAllCallbacks()
2014-10-08 13:50:22 +08:00
[FIX] Node: crashed if remove/add child too quickly when using integrated physics
2014-09-25 10:55:18 +08:00
[FIX] TextFieldTTF: will get wrong characters if using Chinese input method on WP8
2014-10-10 10:19:07 +08:00
[FIX] UI: Button: button remains gray when releasing it, this issue only happened if enable scale9 and only has one texture
2014-10-10 15:27:12 +08:00
[FIX] UI: Button: when creating a button with a title only, button content size is not immediately updated
2014-10-10 16:30:26 +08:00
[FIX] UI: EditBox: setMaxLength is invalid on mac
2014-09-22 09:33:09 +08:00
cocos2d-x-3.3-beta0 Sep.20 2014
2014-09-15 14:39:19 +08:00
[NEW] 3d: added `BillBoard`
2014-08-28 14:30:01 +08:00
[NEW] ActionManager: added removeAllActionsByTag()
2014-09-11 15:24:22 +08:00
[NEW] Audio: added new audio system for iOS and Android
2014-09-19 17:04:41 +08:00
[FIX] DrawNode: has as many functions as `DrawPrimitive`
2014-09-04 22:38:26 +08:00
[NEW] GLViewProtocol: added getAllTouches()
2014-08-28 14:30:01 +08:00
[NEW] Node: added stopAllActionsByTag()
2014-09-09 10:29:59 +08:00
[NEW] PhysicsWorld: add setSubsteps() and getSubsteps()
2014-09-04 14:02:20 +08:00
[NEW] Renderer: added TriangleCommand
2014-08-29 13:43:42 +08:00
[NEW] UI: added `WebView` on iOS and Android
2014-08-28 14:33:31 +08:00
2014-09-10 09:25:47 +08:00
[FIX] C++: CMake works for Mac builds
[FIX] C++: Reorganized cocos2d/platform folder. Easier to add new platforms
2014-09-03 11:27:45 +08:00
[FIX] EditBox: moved to ui:EditBox
2014-09-17 10:26:03 +08:00
[FIX] External: ScrollView: scroll view hidden picks up the touch events
2014-09-19 17:02:09 +08:00
[FIX] FastTileMap: change indices to short because not all devices support int indices which will prevent drawing tilemap
[FIX] FileUtils: can not create and delete directory on wp8
2014-09-04 13:39:17 +08:00
[FIX] HttpClient: condition variable sleep on unrelated mutex
2014-09-17 10:26:03 +08:00
[FIX] Image: optimize decompress jpg data
2014-09-12 18:06:33 +08:00
[FIX] Label: outline effect may be wrong if outline width is big and font size is big too
2014-09-15 09:55:38 +08:00
[FIX] MenuItem: memory leak if using menu_selector
2014-09-12 17:17:28 +08:00
[FIX] MeshCommand: generate wrong meterial id which will cause problem that only first mesh is drawn
2014-08-28 14:35:50 +08:00
[FIX] Node: create unneeded temple `Vec2` object in `setPosition(int, int)`, `setPositionX()` and `setPositionY()`
2014-08-29 16:51:40 +08:00
[FIX] Node: skew effect is wrong
2014-09-04 10:10:26 +08:00
[FIX] Node: setNormalizedPosition can not take effect if parent position is not changed
2014-08-29 16:51:40 +08:00
[FIX] TextureAtlas: may crash if only drawing part of it
2014-09-12 15:09:50 +08:00
[FIX] UI: Button: a button can not be touched if it only contains title
[FIX] UI: Button: title can not be scaled if a button is scaled
2014-08-28 14:29:06 +08:00
2014-08-28 10:21:43 +08:00
cocos2d-x-3.3alpha0 Aug.28 2014
[NEW] 3D: Added Camera, AABB, OBB and Ray
[NEW] 3D: Added better reskin model support
[NEW] Core: c++11 random support
2014-08-28 10:21:43 +08:00
[NEW] Core: Using `(std::notrow)` for all the `new` statements
[NEW] Desktop: Added support for applicationDidEnterBackground / applicationWillEnterForeground on desktop
2014-08-20 09:48:39 +08:00
[NEW] Device: added setKeepScreenOn() for iOS and Android
2014-08-08 11:48:06 +08:00
[NEW] EventMouse: support getDelta, getDeltaX, getDeltaY functions
[NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile(), getFileSize()
2014-07-24 23:06:42 +08:00
[NEW] FileUtilsApple: allow setting bundle to use in file utils on iOS and Mac OS X
2014-07-24 22:09:13 +08:00
[NEW] Image: support of software PVRTC v1 decompression
2014-08-14 09:36:29 +08:00
[NEW] Lua-binding: added release_print that can print log even in release mode
2014-08-12 13:39:10 +08:00
[NEW] Physics Integration: can invoke update in demand
[NEW] Renderer: Added primitive and render primitive command, support passing point, line and triangle data
[NEW] Renderer: Added method for custom precompiled shader program loading on WP8
[NEW] Renderer: Added consistent way to set GL context attributes
2014-08-13 10:06:14 +08:00
[NEW] RenderTexture: add a call back function for saveToFile()
2014-08-05 13:34:41 +08:00
[NEW] RotateTo: added 3D rotation support
2014-08-05 11:55:06 +08:00
[NEW] ScrollView: added `setMinScale()` and `setMaxScale()`
2014-08-14 09:33:32 +08:00
[NEW] Sprite3D: added setCullFace() and setCullFaceEnabled()
2014-08-15 16:05:12 +08:00
[NEW] Sprite3D: added getBoundingBox() and getAABB()
2014-08-07 10:25:16 +08:00
[NEW] SpriteFrameCache: load from plist file content data
2014-08-04 16:33:44 +08:00
[NEW] utils: added gettime()
[NEW] UI: Added Added UIScale9Sprite
[NEW] UI: ui::Button: support customize how much zoom scale is when pressing a button
[NEW] UI: ui::PageView: added `customScrollThreshold`, could determine the swipe distance to trigger a PageView scroll event
[NEW] UI: ui::TextField: support utf8
2014-09-16 00:33:07 +08:00
[NEW] UI: ui::TextField: support set color and placeholder color
[NEW] UI: ui::Widget: support swallowing touch events
2014-08-11 09:50:46 +08:00
[NEW] Text: added getter and setter for TextColor
2014-07-22 21:25:20 +08:00
2014-09-16 00:33:07 +08:00
[FIX] EditBox: font size is not scaled when GLview is scaled on Mac OS X
2014-08-04 15:37:17 +08:00
[FIX] EditBox: began/end events not work
2014-07-23 11:33:12 +08:00
[FIX] Label: can not set charmap after it is created
2014-07-25 11:21:52 +08:00
[FIX] Label: setTextColor does not have any effect on Mac OS X
2014-08-06 14:36:37 +08:00
[FIX] Label: result of LabelTTF::getBoundingBox() is wrong
2014-08-07 10:54:34 +08:00
[FIX] Label: can not set outline color correctly if using system font on iOS
2014-09-16 00:33:07 +08:00
[FIX] Label: character edge will be cut a little if character size is small
2014-08-06 14:36:37 +08:00
[FIX] LabelBMFont: result of LabelBMFont::getBoundingBox() is wrong
2014-08-11 09:50:46 +08:00
[FIX] ListView: can not insert an item in specific position, it is added at bottom
2014-08-08 11:59:39 +08:00
[FIX] LoadingBar: position is changed if changing direction
2014-07-28 11:37:59 +08:00
[FIX] ParticleSystem: effect is wrong if scene scaled
2014-07-29 14:04:36 +08:00
[FIX] ParticleSystemQuad: setTotalParticles() can't set a value larger than initialized value
2014-08-11 10:37:23 +08:00
[FIX] PhysicsBody: return wrong bitmask
2014-07-22 21:33:24 +08:00
[FIX] Scale9Sprite: new added sprite will be hidden
2014-08-11 09:50:46 +08:00
[FIX] Slider: if the UISlider is faded, the slide ball won't fade together
2014-08-08 11:55:26 +08:00
[FIX] Sprite: will turn black if opacity is set other than 255 and be added into SpriteBatchNode
2014-09-16 00:33:07 +08:00
[FIX] TableView: can handle touch event though its parents are invisible
2014-07-18 18:38:16 +08:00
[FIX] TextField: can not use backspace to delete a character
2014-08-11 09:50:46 +08:00
[FIX] Widget: may crash if remove itself in touch call back function
[FIX] Widget: not support cascaded opacity and cascaded color by default
2014-08-05 09:35:13 +08:00
[FIX] VideoPlayer: memory leak on iOS
2014-08-11 09:50:46 +08:00
[FIX] VideoPlayer: video frame size is not calculated correctly on iOS
2014-08-08 14:07:49 +08:00
[FIX] VideoPlayer: video player not showing on iOS if it's not in FullScreen mode
2014-07-22 21:33:24 +08:00
2014-07-21 14:57:06 +08:00
[FIX] Others: can not import java library shift by engine correctly when using Eclispe on Android
2014-09-16 00:33:07 +08:00
[FIX] Others: optimize FPS control algorithm on Android
2014-07-25 23:16:27 +08:00
[FIX] Lua-binding: replace dynamic_cast to std::is_base_of in object_to_luaval
2014-08-22 23:34:46 +08:00
2014-08-28 14:54:27 +08:00
[3rd] fbx-conv: complex FBX model support which is useful for reskin, multiple meshes and multiple materials support
2014-07-18 18:09:20 +08:00
2014-07-17 21:35:22 +08:00
cocos2d-x-3.2 Jul.17 2014
2014-07-17 11:50:09 +08:00
[NEW] Node: added getChildByName method for get a node that can be cast to Type T
2014-09-16 00:33:07 +08:00
[NEW] FileUtils: could add search path and resolution order path in front
2014-07-17 11:50:09 +08:00
2014-07-10 09:57:16 +08:00
[FIX] Animation3D: getOrCreate is deprecated and replaced with Animation3D::create
2014-09-16 00:33:07 +08:00
[FIX] Animate3D: setSpeed() accept negative value, which means play reverse, getPlayback and setPlayBack are deprecated
2014-07-15 15:02:23 +08:00
[FIX] EditBox: can not set/get text in password mode on Mac OS X
2014-07-17 21:31:58 +08:00
[FIX] Game Controller: joystick y value inversed on iOS
2014-07-08 21:21:26 +08:00
[FIX] GLView: cursor position is not correct if design resolution is different from device resolution
2014-07-17 22:16:46 +08:00
[FIX] Label: color can not be set correctly if using system font on iOS
2014-07-17 22:06:24 +08:00
[FIX] LabelTTF: may lost chinese characters on linux
2014-07-10 22:06:29 +08:00
[FIX] Lua-binding: support UIVideoPlayer
2014-07-08 22:08:28 +08:00
[FIX] Node: setRotation3D not work based on anchor point
2014-07-10 15:49:29 +08:00
[FIX] Node: modify regular of enumerateChildren, now it just searchs its children
2014-07-17 17:31:32 +08:00
[FIX] Physics integration: body shape will be wrong when using negative value to scale
2014-07-17 12:03:59 +08:00
[FIX] ScrollViewDelegate: make the scrollView delegate methods optional
2014-07-17 22:13:41 +08:00
[FIX] Setup.py: will crash on windows because of checking `zsh`
2014-07-08 22:19:54 +08:00
[FIX] SpriteBatchNode: opacity can not work
[FIX] Sprite3D: may crash on Android if playing animation and replace Scene after come from background
2014-07-17 22:13:41 +08:00
[FIX] UIwidget: opacity is wrong when replace texture
2014-07-17 18:06:48 +08:00
[FIX] UIRichText: will crash when using utf8 string and the length exceed specified length
2014-07-15 11:48:55 +08:00
[FIX] UIText: can not wrap words automatically
2014-07-08 20:38:58 +08:00
[FIX] UITextField: keyboard can not hide if touching space outside of keyboard
2014-07-17 16:41:32 +08:00
[FIX] UITextField: can not wrap words automatically
2014-07-17 21:25:31 +08:00
[FIX] UIVideoPlayer: can not exit full screen mode on Android
2014-07-08 21:21:26 +08:00
[FIX] Others: don't release singleton objects correctly that are needed in the whole game, which will be treated
as memory leak when using VLD.
2014-07-15 17:00:16 +08:00
[FIX] Others: compiling error when building for iOS 64-bit devices with Xcode6 beta3
2014-07-08 21:21:26 +08:00
2014-07-08 10:53:07 +08:00
cocos2d-x-3.2rc0 Jul.7 2014
2014-06-30 09:39:38 +08:00
[NEW] FastTMXTiledMap: added fast tmx, which is much more faster for static tiled map
2014-06-27 16:38:41 +08:00
[NEW] GLProgramState: can use uniform location to get/set uniform values
2014-06-26 16:08:25 +08:00
[NEW] HttpClient: added sendImmediate()
2014-06-19 09:47:01 +08:00
[NEW] Label: support setting line height and additional kerning of label that not using system font
2014-06-24 10:30:36 +08:00
[NEW] Lua-binding: Animation3D supported
2014-06-25 14:33:42 +08:00
[NEW] Lua-binding: UIEditor test cases added
2014-06-25 17:14:57 +08:00
[NEW] Lua-binding: UI focus test cases added
2014-06-25 14:13:50 +08:00
[NEW] Node: added getName(), setName(), getChildByName(), enumerateChildren()
and addChild(Node* node, int localZOrder, const std::string &name)
2014-06-24 10:47:50 +08:00
[NEW] Node: physical body supports rotation
2014-06-30 11:08:13 +08:00
[NEW] Sprite3D: support c3b binary format
2014-06-26 15:21:10 +08:00
[NEW] utils: added findChildren() to find all children by name
2014-06-26 22:59:20 +08:00
[NEW] Value: added operator == !=
2014-06-24 10:30:36 +08:00
2014-06-18 11:31:16 +08:00
2014-06-30 11:35:03 +08:00
[FIX] Armature: blend func has no effect
[FIX] Armature: crashed when remove armature in frame event
2014-06-30 11:08:13 +08:00
[FIX] Animation3D: doesn't load original pose, which leads to wrong effect if not playing animation
2014-06-30 11:09:00 +08:00
[FIX] Animation3D: animation for unskined bones lost
2014-06-19 22:05:52 +08:00
[FIX] FileUtils: getStringFromFile may return a unterminated string
2014-06-23 16:45:47 +08:00
[FIX] Lua-binding: Sequence:create will cause drop-dead issue
2014-06-27 18:09:57 +08:00
[FIX] Lua-binding: lua-tests cant be loaded on 64 bits iOS devices and Linux
2014-06-25 14:42:12 +08:00
[FIX] Node: Node::setScale(float) may not work properly
2014-06-30 09:44:50 +08:00
[FIX] Physics integration: child node can move with its father
[FIX] Physics integration: support scale
2014-09-16 00:33:07 +08:00
[FIX] Sprite3D: 20% performance improved, simplify shader, use VAO and batch draw
2014-06-24 10:50:09 +08:00
[FIX] Studio support: NodeReader may cause crash
2014-06-19 22:07:25 +08:00
[FIX] UIButton: doesn't support TTF font
2014-06-25 13:59:41 +08:00
[FIX] UIButton: `getTitleColor()` doesn't equal to the value set by `setTitleColor()`
2014-06-23 17:22:56 +08:00
[FIX] UIListView: addEventListener can not work
2014-06-25 14:11:16 +08:00
[FIX] UIListView: element position is changed a little when you click and up a list view without move
[FIX] UIListView: element will respond to item_end event when end of scrolling a list view
2014-06-25 17:59:30 +08:00
[FIX] UIVideo: crash when try to remove videoView(STATE_PLAYBACK_COMPLETED) on android
2014-07-01 16:20:55 +08:00
[FIX] WP8: crash of utils::captureScreen()
2014-06-18 10:34:57 +08:00
2014-06-17 21:13:49 +08:00
cocos2d-x-3.2-alpha0 Jun.17 2014
2014-06-11 14:50:33 +08:00
[NEW] Console: add a command to show engine version
[NEW] Node: added setter/getter for NormalizedPosition(). Allows to set positions in normalized values (between 0 and 1)
[NEW] Scene: Added createWithSize() method
2014-06-09 15:19:58 +08:00
[NEW] TextField: added getStringLength()
2014-05-26 11:34:21 +08:00
[NEW] TextureCache: added unbindImageAsync() and unbindAllImageAsync()
2014-06-04 15:29:54 +08:00
[NEW] utils: added captureScreen()
2014-06-09 15:29:16 +08:00
[NEW] UIText: added shadow, outline, glow filter support
2014-06-17 18:38:33 +08:00
[NEW] Sprite3D: support 3d animation
2014-06-17 18:50:47 +08:00
[NEW] Animation3D: 3d animation
2014-05-26 11:34:21 +08:00
2014-06-04 15:29:54 +08:00
[FIX] Application.mk: not output debug message in release mode on Android
2014-06-03 16:58:53 +08:00
[FIX] Android: 3d model will be black when coming from background
2014-06-03 18:20:01 +08:00
[FIX] Android: don't trigger EVENT_COME_TO_BACKGROUND event when go to background
2014-05-29 15:07:57 +08:00
[FIX] Cocos2dxGLSurfaceView.java: prevent flickering when opening another activity
2014-06-12 16:19:05 +08:00
[FIX] Director: Director->convertToUI() returns wrong value.
2014-09-16 00:33:07 +08:00
[FIX] GLProgram: not abort if shader compilation fails, just return false.
2014-06-09 11:49:25 +08:00
[FIX] GLProgramState: sampler can not be changed
2014-05-27 16:51:23 +08:00
[FIX] Image: Set jpeg save quality to 90
2014-06-04 15:29:54 +08:00
[FIX] Image: premultiply alpha when loading png file to resolve black border issue
2014-05-29 14:48:47 +08:00
[FIX] Label: label is unsharp if it's created by smaller font
2014-06-09 14:21:14 +08:00
[FIX] Label: Label's display may go bonkers if invoking Label::setString() with outline feature enabled
2014-06-12 11:40:41 +08:00
[FIX] Label: don't release cached texture in time
2014-06-12 14:47:42 +08:00
[FIX] Label: calculated height of multi-line string was incorrect on iOS
2014-06-04 15:29:54 +08:00
[FIX] Lua-binding: compiling error on release mode
2014-06-05 11:51:02 +08:00
[FIX] Lua-binding: Add xxtea encrypt support
2014-06-04 13:55:00 +08:00
[FIX] Node: setPhysicsBody() can not work correctly if it is added to a Node
2014-06-09 17:18:55 +08:00
[FIX] Node: state of _transformUpdated, _transformDirty and _inverseDirty are wrong in setParent()
2014-06-10 13:53:41 +08:00
[FIX] Node: _orderOfArrival is set to 0 after visit
2014-06-06 13:41:40 +08:00
[FIX] Other: link error with Xcode 6 when building with 32-bit architecture
2014-06-16 10:46:16 +08:00
[FIX] RenderTexture: saveToFile() lost alpha channel
2014-05-27 16:51:23 +08:00
[FIX] Repeat: will run one more over in rare situations
2014-06-03 18:02:37 +08:00
[FIX] Scale9Sprite: support culling
2014-06-03 14:40:20 +08:00
[FIX] Schedule: schedulePerFrame() can not be called twice
2014-06-12 18:23:31 +08:00
[FIX] ShaderTest: 7 times performance improved of blur effect
2014-05-30 15:25:37 +08:00
[FIX] SpriteFrameCache: fix memory leak
2014-06-06 11:40:32 +08:00
[FIX] Texture2D: use image's pixel format to create texture
2014-06-12 11:38:28 +08:00
[FIX] TextureCache: addImageAsync() may repeatedly generate Image for the same image file
2014-06-04 17:21:12 +08:00
[FIX] WP8: will restart if app goes to background, then touches icon to go to foreground
[FIX] WP8: will be black if: 1. 3rd pops up a view; 2. go to background; 3. come to foreground
2014-06-09 16:34:41 +08:00
[FIX] WP8: project name of new project created by console is wrong
2014-06-17 13:51:11 +08:00
[FIX] WP8: missing texture after app switch
2014-06-05 11:01:43 +08:00
[3RD] curl: will crash if use https request on iOS simulator
2014-06-17 20:23:26 +08:00
[3RD] curl: update OpenSSL to v1.0.1h
2014-05-26 11:34:21 +08:00
cocos2d-x-3.1.1 May.31 2014
[FIX] GLProgramState: restores states after coming from background
2014-05-26 11:34:21 +08:00
2014-05-24 09:07:32 +08:00
cocos2d-x-3.1 May.24 2014
2014-05-26 11:34:21 +08:00
[FIX] EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
2014-05-21 11:24:23 +08:00
[FIX] Label: may crash when using outline effect
2014-05-21 11:44:15 +08:00
[FIX] Label: using outline and invoking 'Director::setContentScaleFactor' cause label show nothing
2014-05-20 15:41:19 +08:00
[FIX] ProgressTo: will start from 0 when it reaches 100
2014-05-21 18:35:14 +08:00
[FIX] Physics integration: may crashes if remove bodies at physics contact callback
2014-05-23 15:13:58 +08:00
[FIX] UIWidget: copyProperties() lost copy some properties
2014-05-21 11:24:23 +08:00
[FIX] WP8: orientation is not correct when it is set to portrait
2014-05-21 14:32:03 +08:00
[FIX] WP8: fix for precompiled shaders and precompiled headers
2014-05-23 09:30:06 +08:00
[FIX] WP8: template supports orientation
2014-05-20 15:41:19 +08:00
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
cocos2d-x-3.1-rc0 May.18 2014
2014-05-16 14:11:26 +08:00
[NEW] Cocos2dxActivity: Adds a virtual method to load native libraries.
Squashed commit of the following: commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 14:03:53 2014 -0700 More WP8 fixes commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c Merge: c2b1619 fea335f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:41 2014 -0700 Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d commit c2b1619005b5a62ef77afe727429584d6a57010e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 12:19:19 2014 -0700 Adds missing resources for Windows Phone 8 commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:54:15 2014 -0700 Updates CHANGELOG commit b8b93da914de97662c9df55cfc351ad8b74ea779 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:48:59 2014 -0700 Adds Sprite3d files and tests commit 059c842938e19068427bb2276d52f3e0ea1cc51f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 11:16:13 2014 -0700 fixes compiler warnings for windows commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sun May 18 10:53:34 2014 -0700 fixes for Sprite3D Adds copyright header removes compilation warnings cleans code a bit commit 1377787a4bcebdf349f9de0a05c329066c6eb626 Merge: f89725f 9a3c2d0 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:46:26 2014 -0700 Merge pull request #34 from dumganhar/pull/6731 fix compilation error of missing bind Mesh for luabindings. commit f89725f65ca604efb9abbcfe336c9d50135016b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:45:12 2014 -0700 use const & and changed typo commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:43:10 2014 +0800 fix compilation error of missing bind Mesh for luabindings. commit 59524b3850b27342f3cb4c390751bdf97362a794 Merge: ee4ec94 5c5a6b9 Author: James Chen <jianhua.chen@cocos2d-x.org> Date: Sat May 17 11:33:01 2014 +0800 Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731 commit 5c5a6b9bde410027db948b539bc3111dc243cf0b Merge: d4285e3 5f41732 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:23:58 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit d4285e336808699f828b82c6b90a83b1b0c0978c Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:22:49 2014 -0700 remove empty lines commit 5f4173271101e2411ffb6cbf600066e204df98d3 Merge: e272583 ac8cf25 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 20:15:44 2014 -0700 Merge pull request #33 from dabingnn/mesh3d_work Mesh3d work commit ac8cf2571d92b03c9632d0415078d08526322289 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 20:14:01 2014 -0700 added mesh3d file to template commit e272583cb8a7f41d8d74dbf7d7db71584187a779 Merge: 6a1b847 5d3a955 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 19:10:45 2014 -0700 Merge pull request #32 from dabingnn/mesh3d_work Mesh3d work commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca Merge: 4feae11 97cae73 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 18:18:13 2014 -0700 Merge branch 'v3' into mesh3d_work commit 6a1b847065a1b9d369892ab011478c47e80c9195 Merge: 4feae11 4ece4b3 Author: Trace0429 <yangtuo0429@gmail.com> Date: Fri May 16 17:15:39 2014 -0700 Merge pull request #31 from Trace0429/mesh3d_work windows work now commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Sat May 17 08:12:46 2014 +0800 windows work now commit 4feae11577f64c3aff943af51adc37dcb987bdc1 Merge: 510fc0c fdf82d3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:32:58 2014 -0700 Merge pull request #30 from dabingnn/mesh3d_work Mesh3d work commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:32:00 2014 -0700 fix compile error after merge (MAC can work) commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe Merge: 510fc0c d19de29 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:24:11 2014 -0700 Merge branch 'v3' into mesh3d_work Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/2d/cocos2d.vcxproj cocos/2d/cocos2d.vcxproj.filters cocos/Android.mk cocos/CMakeLists.txt cocos/renderer/CMakeLists.txt commit 510fc0cea76bdedfae858bb930d98715ce54f7e9 Merge: e098ed7 7fea347 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 16:11:39 2014 -0700 Merge pull request #29 from dabingnn/mesh3d_work Mesh3d work commit 7fea34782f30ef0498a7a993016f45fcb786b771 Merge: a8a409a e098ed7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:08:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit a8a409a7d5280b1075eb6258ee556611a5cba7b3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 16:05:37 2014 -0700 bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw commit e098ed7a5c187256be8313ec5d66294d3554c914 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 16:02:27 2014 -0700 bind buffer to 0 when finish draw commit d13f637a3777e81085e0285faf00105c58229d7c Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 14:00:38 2014 -0700 fix outline width commit 8a79c98b163ad862a2e09cbcc19a939f06556358 Merge: e208712 a0cf4ef Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:17 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e20871233915f8b6010e59595c38793ec3d6956e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 13:47:12 2014 -0700 make some member protected commit a0cf4efc48af801636a55d1c330fb6841896d33b Merge: c0b8902 8b723e8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:06:17 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 13:04:27 2014 -0700 linux work now commit 8b723e82d81cbffd78e7378cab6d11df30baa044 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:48:34 2014 -0700 inc drawcall commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c Merge: 1e7032b e783da9 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:31:44 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit e783da91fe6c14c8594d3da865e965256376dd10 Merge: 5da20fd 8f7a19a Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:31:31 2014 -0700 Merge pull request #28 from dabingnn/mesh3d_work Mesh3d work commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 12:30:01 2014 -0700 optimize code commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:29:37 2014 -0700 adjust code style commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b Merge: 659fbd6 553acfb Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 12:06:53 2014 -0700 Merge pull request #27 from dabingnn/mesh3d_work Mesh3d work commit 553acfb3ee685f5461a6d2a68779200abcca8670 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 12:06:02 2014 -0700 fix visual error for outline commit 659fbd652aa7f4c2d3629fe446051c3dd0377510 Merge: 056c3e1 c617bb7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:54 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 11:54:47 2014 -0700 fix shader, add multiple sprite to Sprite3DEffectTest commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa Merge: 94d7896 7b19c56 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 11:33:31 2014 -0700 Merge pull request #26 from dabingnn/mesh3d_work Mesh3d work commit 7b19c564e4053ad883617873b11043df1fb98a45 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:30:34 2014 -0700 share the same glprogram in effect3DOutline commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:19:56 2014 -0700 add class static variable for EffectOutline commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d Merge: 213bbb0 6837cea Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 11:07:04 2014 -0700 Merge branch 'v3' into mesh3d_work commit 213bbb0c289e579895e92620153b95a8cf374521 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:55:28 2014 -0700 add mesh.h in cocos2d.h commit 94d789610c9d4426b14e655a73197c652afc74f6 Merge: fa69e09 9af9da5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:24 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 10:41:05 2014 -0700 remove namespace commit 9af9da50a91804d11537cffe0750e486cf95c8a5 Merge: ff15926 8a38a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Fri May 16 10:30:23 2014 -0700 Merge pull request #25 from dabingnn/mesh3d_work Mesh3d work commit 8a38a384742ba130946de8ad1759b61ed2f70495 Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:27:28 2014 -0700 remove redundant uniform CC_Texture0 commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034 Merge: ff15926 511295e Author: Huabing.Xu <dabingnn@gmail.com> Date: Fri May 16 10:20:01 2014 -0700 Merge branch 'v3' into mesh3d_work commit ff15926f47edfbb1250440b060c1d887cfecd033 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 09:11:36 2014 -0700 warning more than one texture commit 5debbf8d6de4563361974b67aa52e572f7df9dd6 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Fri May 16 08:45:03 2014 -0700 remove redundant line commit ed357e7484a63bc3eb208d589943f802b7832e4d Merge: a1e2306 25dd07e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:53:10 2014 -0700 Merge pull request #24 from dabingnn/mesh3d_work Mesh3d work commit 25dd07edb7005f593003e90120d6e6439686e5f6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:52:33 2014 -0700 fix memory leak commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:49:04 2014 -0700 remove unused member variable commit a1e23064140328f4c9bbe434383ca6f25fcb7548 Merge: bac54fc 712e816 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 22:37:16 2014 -0700 Merge pull request #23 from dabingnn/mesh3d_work Mesh3d work commit 712e81606f2782ac41276c1e8a87d32217ac9d28 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 22:35:48 2014 -0700 fix memory leak commit bac54fce097edd4040b0a7cd522d15644e6b482a Merge: 8ed28c4 54538e8 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 20:01:49 2014 -0700 Merge pull request #22 from dabingnn/mesh3d_work Mesh3d work commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 20:01:29 2014 -0700 android work now commit a6cc0f77875e045d169758adf0cde87360f41475 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:53:39 2014 -0700 remove sprite3dEffect include commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:50:17 2014 -0700 remove unused Sprite3dEffect commit c5e2d5579daca64b0e9394a2b07613352847eca8 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:48:12 2014 -0700 remove unused outline shader files commit 09a100cf388d80aa1389d96994ae189cbb0652b2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 19:43:17 2014 -0700 fix error on IOS commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5 Merge: d23ffe3 c0e8ea2 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 18:47:37 2014 -0700 Merge pull request #21 from dabingnn/mesh3d_work Mesh3d work commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:46:54 2014 -0700 adjust indent, and line to the end of the file commit 661ceb72831d6eccfa522a09cedf994541af6f88 Merge: 8e764e7 d23ffe3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:35:18 2014 -0700 Merge branch 'mesh3d' into mesh3d_work Conflicts: cocos/3d/CCSprite3D.cpp cocos/3d/CCSprite3D.h tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp commit 8e764e74dd019852a0ef35b257895a7e79cd9a14 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:31:06 2014 -0700 add testCase for outline commit c2ced288851892299fd7258e51f32303959b374d Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 18:03:34 2014 -0700 extract base class Effect3D commit d23ffe3167476d10740df321e579bf647a3698d0 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 18:02:45 2014 -0700 RendeMeshData member rename commit fb8f25553cd317a277c1b924da2c11b9f3188666 Merge: 73cb4b4 819db70 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:57:29 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 819db702d5ffa9461fc9d1d232cea7d373536664 Merge: 2676911 b408f43 Author: Trace0429 <yangtuo0429@gmail.com> Date: Thu May 15 17:54:24 2014 -0700 Merge pull request #20 from Trace0429/mesh3d_work Mesh3d work commit 73cb4b444b222d34e135b0d09b426b9c73c1b790 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 17:54:03 2014 -0700 android meshcommand commit b408f4343e47766416b19a583bc6bb5167439693 Author: Trace0429 <yangtuo@chukong-inc.com> Date: Fri May 16 08:50:38 2014 +0800 windows work now commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 17:38:41 2014 -0700 raw EffectSprite commit 2676911bb71ef92b3d9cf198021169d9e4466525 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:37:20 2014 -0700 remove SpriteEffect from Sprite3D commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 16:34:36 2014 -0700 raw effectSpriteTest commit 39e372ef2037090317c9c4a2287b06cadf83c9c5 Merge: 734633e 6d27912 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 16:14:57 2014 -0700 use meshcommand commit 734633ec1ffc66e590b2ad2da94f6477d78146f2 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 15:38:30 2014 -0700 use meshcommand commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 15:31:43 2014 -0700 comment out effect framework commit 6d27912f148e03acc07da3e3b4d0c565af8afefa Merge: d6f6f63 61a9011 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 15:11:25 2014 -0700 Merge pull request #19 from dabingnn/mesh3d_work Mesh3d work commit 61a9011d6c78ea6918664bb608dc51344e0236e5 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:55:06 2014 -0700 fix compile error in testcases commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:52:43 2014 -0700 fix compile error after merge with v3 commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47 Merge: d6f6f63 760ee57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:48:19 2014 -0700 Merge branch 'v3' into mesh3d_work commit d6f6f633927eb00df984ec4239555f9ce2c7e44d Merge: c6fbd6e 76d2523 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 14:26:40 2014 -0700 Merge pull request #18 from dabingnn/mesh3d_work Mesh3d work commit 76d2523ae735384533a1e37f06e370cb3481b0f2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 14:25:40 2014 -0700 move 3d shaders to shader cache commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de Merge: 2c9a573 c6fbd6e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:56:00 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 13:55:49 2014 -0700 meshcommand commit 0631a51c5d9c0aae55447105b962a888e1158cd3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:21:36 2014 -0700 add mesh rebuild when come to foreground in android commit 8695016869ab56f3a046f488485f9fdfb6532417 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 13:13:59 2014 -0700 android work now commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5 Merge: cd7b235 0466a38 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 12:21:40 2014 -0700 Merge pull request #17 from dabingnn/mesh3d_work Mesh3d work commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8 Merge: e349e4e cd7b235 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:19:24 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:18:49 2014 -0700 commit the changed IOS/MAC project file commit a7c9a65d5603622b1d40cc009dfceee60c376f50 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 12:17:57 2014 -0700 remove MeshPart commit cd7b235b5ec5b3ce21bc856888d383e6224fd047 Merge: e666045 3b7b406 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Thu May 15 11:03:54 2014 -0700 Merge pull request #16 from dabingnn/mesh3d_work Mesh3d work commit 3b7b406caff0b6f79fe044612a32e909f778d1e3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Thu May 15 10:59:10 2014 -0700 raw version of single Mesh commit e666045aa4768199c530f494f0a1fb402f2ce922 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:44:04 2014 -0700 fix outline commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Thu May 15 10:09:45 2014 -0700 without normal no outline effect commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 22:39:03 2014 -0700 android listenBackToForeground commit 6bec670319ea154474c32c941c250bc3909a7e2e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:58:09 2014 -0700 add boss1 with normal commit 35c1b8d5fcec188cbef92457e24721ae53820328 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:54:20 2014 -0700 change cache commit 076166fba142d5432bbadaf3e75d6c35bcb6905a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 21:35:59 2014 -0700 depress no .mtl crash commit 498c9693a7e7009615382c5769b7493c3ff6be68 Merge: 8a63b49 d4fd946 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:50 2014 -0700 Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970 Merge: b4a8fee f395cc5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:58:36 2014 -0700 merge dabingnn commit d4fd946fc8afdc95741f6a170e489d3dca9e2519 Merge: f395cc5 a17f074 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:53:58 2014 -0700 Merge pull request #15 from dabingnn/mesh3d_work Mesh3d work commit a17f074302d10ff03881cba7e634e094d31feb0a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:52:58 2014 -0700 android can work now commit b4a8fee4b9735e16331a5656055572db9e551367 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 15:33:07 2014 -0700 refactoring render code commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2 Merge: f129e02 a2c12df Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 15:27:21 2014 -0700 Merge pull request #14 from dabingnn/mesh3d_work Mesh3d work commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac Merge: 1932e22 f129e02 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:26:19 2014 -0700 Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work commit 1932e22962a79530adf583f24070efcee32251d3 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 15:25:55 2014 -0700 android can compile now(can not work) commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def Merge: ae2aa0d c0d9097 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 14:21:09 2014 -0700 Merge pull request #13 from dabingnn/mesh3d_work Mesh3d work commit c0d90973c2b87582e99966256c74dcdf23712d6a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 14:15:16 2014 -0700 include Sprite3DEffect in the cocos2d header commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 12:51:09 2014 -0700 outline sprite commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a Merge: 1c76d4c 48e9f39 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:48:55 2014 -0700 meshvertexattrib work commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 10:40:55 2014 -0700 use meshvertexattribute commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6 Merge: b70bf52 e0d87a9 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Wed May 14 09:41:57 2014 -0700 Merge pull request #12 from dabingnn/mesh3d_work Mesh3d work commit e0d87a99f42f808429917c8b586509ca75e8a5e2 Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:40:14 2014 -0700 remove compile error commit c445e07c895fc2352f1220459d91f41f77690cd8 Merge: b70bf52 86fb75a Author: Huabing.Xu <dabingnn@gmail.com> Date: Wed May 14 09:31:14 2014 -0700 Merge branch 'v3' into mesh3d_work commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc Merge: da24c48 5a2127d Author: yangxiao <yangxiao@cocos2d-x.org> Date: Wed May 14 00:25:47 2014 -0700 vertex attrib commit da24c48c981029493900bcd2143495e546faa75e Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 23:49:09 2014 -0700 mesh vertex attribute commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd Merge: d98adb7 5148f76 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 19:06:38 2014 -0700 Merge pull request #11 from dabingnn/mesh3d_work Mesh3d work commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93 Merge: 02deb39 d98adb7 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:05:40 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 02deb399314f01ec1222d78f2383a65614e33a34 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 19:04:15 2014 -0700 fix texcoord y flipped commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775 Merge: 300eb4e 946283b Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 18:35:08 2014 -0700 Merge pull request #10 from dabingnn/mesh3d_work Mesh3d work commit 946283b83218de893c727dc9780291fe1683a4f9 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 18:22:16 2014 -0700 added blendFunc commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6 Merge: da7d6a0 ccc0baf Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 16:03:01 2014 -0700 Merge pull request #9 from dabingnn/mesh3d_work Mesh3d work commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 16:01:59 2014 -0700 fix compile error after merge commit 5bfc30b2b930131d23058d99a6862061c2217f38 Merge: da7d6a0 0171e27 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 15:56:46 2014 -0700 Merge branch 'v3' into mesh3d_work commit da7d6a087f22f4a11827ff3410fbcd2561f155fc Merge: 0caad32 f413b4e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 14:19:24 2014 -0700 Merge pull request #8 from dabingnn/mesh3d_work Mesh3d work commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0 Merge: f47cfc6 0caad32 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:17:01 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit f47cfc67041ed4655a916623a6731876758a5182 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 14:15:06 2014 -0700 add new interface for createSprite3D commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 13:58:35 2014 -0700 default GLProgram to object commit 901ccef93593e2c39cca190784b4fc9684dfa9d0 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:13:24 2014 -0700 remove compile warning commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8 Merge: 68bdd0b 3eef54c Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 13:01:20 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 12:59:59 2014 -0700 rename init->initWithFile in Sprite3D commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5 Merge: f719f45 1c8773c Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 12:58:23 2014 -0700 Merge pull request #7 from super626/mesh3d_tmp Mesh3d commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e Merge: 23e8786 f719f45 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 12:56:06 2014 -0700 Merge branch 'mesh3d_tmp' into mesh3d commit f719f45aba37791ffdfe107569350a1af94cbeb0 Merge: 6bd3f28 1b76467 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:59:46 2014 -0700 Merge pull request #6 from dabingnn/mesh3d_work Mesh3d work commit 1b7646759d9efcdf0942a42c0c22964a99309853 Merge: 6bd3f28 87adf9d Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:53:17 2014 -0700 Merge branch 'mesh3d' into mesh3d_work commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:52:41 2014 -0700 adjust line indent and header file define commit 23e8786892b89e25d1add091a7c3bc618990e579 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 11:44:22 2014 -0700 using vbo commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5 Merge: 56fc0f4 a239a7e Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:42:10 2014 -0700 Merge pull request #5 from dabingnn/mesh3d_work Mesh3d work commit a239a7e35a82f497c337d96a025125b92c8daefd Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:39:06 2014 -0700 add CCSprite3d include into cocos2d.h commit 8d580c28a084c1dab2a5ce925871f3361e6b970a Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:33:18 2014 -0700 remove cocos2d.h include in Sprite3DTest.h commit 56fc0f4cbccb07cda972efda302ff6689b958ab2 Merge: ab16a26 8bb75e3 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Tue May 13 11:28:47 2014 -0700 Merge pull request #4 from dabingnn/mesh3d Mesh3d commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:26:40 2014 -0700 fix compile error after rename commit 230a73132c09c66b449efbacbc417974616694c6 Author: Huabing.Xu <dabingnn@gmail.com> Date: Tue May 13 11:07:30 2014 -0700 rename FileXXX to CCFileXXX commit ab16a26376f7deddf1a82f3085668e3fd9f09a12 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Tue May 13 10:52:36 2014 -0700 rename _model to _mesh commit 92ac7f75d06ad081282bbddcad5920a1f7584264 Merge: 6b911b5 df147d1 Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 22:23:59 2014 -0700 Merge pull request #3 from dabingnn/mesh3d Mesh3d commit df147d14ddb8e61d907a44c6f03f404c8a68103f Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 22:21:22 2014 -0700 fix retain/release in sprite3D commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 20:04:16 2014 -0700 remove compile warnings commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 19:16:25 2014 -0700 using glprogramstate work ok commit 0b4f36a964c28f5f4b3224522f27402e0efbe123 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:38:52 2014 -0700 add obj commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 18:33:23 2014 -0700 use glprogramstate commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 13:01:56 2014 -0700 sprite3d commit 2a490c344f2db27d467506cf28c910410bb892e6 Merge: 23a5232 01b015d Author: Huabing.Xu <huabing.xu@cocos2d-x.org> Date: Mon May 12 10:52:17 2014 -0700 Merge pull request #1 from dabingnn/newcode Newcode commit 01b015d1238c89b6837ea276a95ce359cf0da5a7 Merge: 23a5232 5d24b3d Author: Huabing.Xu <dabingnn@gmail.com> Date: Mon May 12 10:50:14 2014 -0700 Merge branch 'v3' into newcode commit 23a5232fe5bb4c0b0bc821d1945426486dafe253 Author: yangxiao <yangxiao@cocos2d-x.org> Date: Mon May 12 09:44:41 2014 -0700 3d mesh initial code
2014-05-19 05:49:16 +08:00
[NEW] Directory Structure: reorder some files within the cocos/ folder
[NEW] Sprite3D: a node that renders 3d models
2014-05-16 22:09:30 +08:00
[NEW] EditBox: support secure input on Mac
2014-05-16 14:11:26 +08:00
2014-05-19 11:18:00 +08:00
[FIX] ControlButton: cascade opacity and color error
2014-05-16 17:13:17 +08:00
[FIX] Director: twice calling of onExit
2014-05-15 04:09:33 +08:00
[FIX] Math: Vector2->Vec2, Vector3->Vec3, Vector4->Vec4, Matrix->Mat4
[FIX] GLProgram: uniform CC_Texture0 is pre-defined by cocos2d. MUST NOT be defined in shaders
2014-05-15 04:09:33 +08:00
[FIX] GLProgramState: Supports multitexturing
2014-05-15 15:50:12 +08:00
[FIX] Studio:ActionObject: correct TotalTime of ActionObject
2014-05-17 12:18:44 +08:00
[FIX] Studio: FrameData::copy doesn't copy `isTween` property
2014-05-15 04:09:33 +08:00
2014-05-12 02:19:11 +08:00
cocos2d-x-3.1-alpha1 May.9 2014
2014-05-13 18:45:41 +08:00
[NEW] Animate: Dispatch a custom event after an animation frame is displayed
2014-05-12 02:19:11 +08:00
[NEW] GLProgram: Easy to customize uniforms and attributes by using the new class GLProgramState
2014-05-13 13:56:42 +08:00
[NEW] Template: cpp project support Eclipse c++ project
2014-05-08 13:47:04 +08:00
[NEW] UI: add navigation support
2014-05-08 18:46:34 +08:00
[NEW] UI: add a widget to play video
2014-05-08 15:42:05 +08:00
[NEW] VS: support VS 2013
2014-05-08 13:47:04 +08:00
2014-05-08 17:13:21 +08:00
[FIX] Audio: pause sound automatically when go to background on Android
2014-05-12 13:43:47 +08:00
[FIX] Director: remove keepData and releaseData
2014-05-06 11:56:00 +08:00
[FIX] Label: label is unsharp if it's created by system font with small size on iOS & Mac OS X
2014-05-08 10:52:15 +08:00
[FIX] Label: Label created with system font is still visible when its opacity is 0
2014-05-08 17:25:41 +08:00
[FIX] Label: Label created with system font havs black border on WP8/WINRT
2014-05-07 16:27:35 +08:00
[FIX] Lua: A potential crash in the bindings of sp.SkeletonAnimation.setAnimation
2014-05-08 18:00:01 +08:00
[FIX] Lua: Lua template should fail to launch on lua error
2014-05-08 10:52:15 +08:00
[FIX] ParticleSystem: Particles can be created without a texture
2014-05-12 02:19:11 +08:00
[FIX] ParticleSystem: yFlippedCoord behavior fixed.
Added cocos2d/tools/particle to fix particles that were based on the old (broken) behaviour
2014-05-12 16:54:18 +08:00
[FIX] Setup.py: Added SDK / NDK detection based on PATH
2014-05-14 09:59:38 +08:00
[FIX] UIText: support TTF
2014-05-12 14:00:11 +08:00
[FIX] Value: all types share the same union to reduce memory usage
cocos2d-x-3.1-alpha0 May.1 2014
[NEW] Android: Adds support for get response when Activity's onActivityResult is triggered
[NEW] Core: Adds RefPtr<T> smart pointer support
[NEW] Label: supports auto-culling
[NEW] Math: New unified math library that supersedes Kazmath, CCGeometry and CCAffine*
[NEW] Test: Adds a sample for making a outline sprite by using a custom shader
[FIX] Application: Application::run returns wrong value on Mac platform
[FIX] Build scripts: Improved cmake files for Linux, and Android.mk for Android
[FIX] Image: saveToImage may cause memory leak
[FIX] Lua: cc.pGetAngle may return wrong value
[FIX] Network: HttpRequest uses std::function as callback
[FIX] Particle: The effect of particle loaded from CocosBuilder is incorrectly
[FIX] ParticleSystem: particle direction in verticality is opposite when "configName" has value and "yCoordFlipped" is -1
[FIX] Physics: PhysicsSprite's transform couldn't be updated
[FIX] Value: default value changed to false
[FIX] WP8: Some bug fixes
cocos2d-x-3.0 Apr.23 2014
[NEW] Lua: add `RichText` test cases
[NEW] EditBox: Added missing Text Font and Placeholder feature for Mac platform
[FIX] cocos console: Zipalign the apk generated with release mode
[FIX] Director: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled
[FIX] Image: memoery leak
[FIX] Image: crashes when save a jpg file
[FIX] Lua: 'EditBox' can't response 'changed','ended' and 'return' event on Windows
[FIX] Lua: new project will crash on iOS 5.1 devices
[FIX] Others: compiling error when CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled
[3rd] libcurl: support ssl again on iOS
cocos2d-x-3.0rc2 Apr.15 2014
[NEW] Event: Adds `EventListener::setEnabled/isEnabled` to support enable/disable event listeners
[NEW] GLView: Added createWithFullscreen overloaded method for selecting monitor and setting video mode
[FIX] Android: Cocos2dxHelper.runOnGLThread() can't work
[FIX] Animation: Added 'loops' parameter to Animation::createWithSpriteFrames
[FIX] Audio: can not resume after pausing on windows
[FIX] Audio: stopalleffect lead to stop background music on WP8
[FIX] Audio: play effect may lead to memory leak on WP8
[FIX] CocoStudio: Potential crash in SceneReader::createNodeWithSceneFile
[FIX] Control: ControlButton can't swallow touch event
[FIX] Event: Removing and re-adding an event listener will trigger an assert
[FIX] Event: A potential crash when unregistering listener right after its registration
[FIX] Event: EventDispatcher::setDirtyForNode doesn't consider node's children
[FIX] FileUtils: 'isFileExist' doesn't consider SearchPaths and ResolutionOrders
[FIX] Image: The result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG
[FIX] JNI: doesn't cache classloader which may cause crash on Android devices with 4.2 or upper version
[FIX] Network: HTTPClient reports 2xx status codes as errors
[FIX] Lua: Added ScriptHandlerMgr::destroyInstance to avoid memory leak
[FIX] Physics: Skips one frame when delta time is equal to zero
[FIX] Physics: PhysicsShapeEdgeChain::init() always return false
[FIX] Setup: Force updating environment variables in setup.py
[FIX] Value: A potential memory leak in value's default constructor
cocos2d-x-3.0rc1 April.2 2014
[NEW] Application: Adds getCurrentLanguageCode() which returns iso 639-1 language code
[NEW] cocos2d::extension::ScrollView: Elastic bounce back effect support
[NEW] Constructor: Added CC_CONSTRUCTOR_ACCESS macro to re-define constructor/initXXX methods to 'public' access.
[NEW] Label: Added new methods 'set(Anti)AliasTexParameters' for enabling/disabling antialias
[FIX] Android: Reloaded texture is not shown if it has the mipmap
[FIX] Android: Application may become black at first time entering on some devices
[FIX] Audio: Stopped music could also be resumed on iOS
[FIX] CCBReader: Wrong logic in CCBAnimationManager::moveAnimationsFromNode
[FIX] CocoStudio: ActionObject memory leak in ActionManagerEx::initWithDictionary
[FIX] Console: initialize some variables that are not initilized in destructor
[FIX] Console: refactor 'upload' command, encode file with base64, detach 'upload' from main loop
[FIX] EventDispatcher: Potential crashes in EventDispatcher while using SceneGraphPriroity listeners
[FIX] FileUtils: addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path
[FIX] FileUtils: Boolean value could not be written to specified plist file
[FIX] GLView: Can't receive touchEnded event when mouse up outside of window on desktop platforms
[FIX] Image: Some functions and variables in Image class is private, it should be protected
[FIX] Label: Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called
[FIX] Label: Display incorrect of multi-line label if invoking 'getLetter'
[FIX] Label: Default Anchor point isn't in middle and shadow offset doesn't consider contentScaleFactor
[FIX] Label: Label's color is incorrect if it's created by font name
[FIX] Label: Missing letters if using old LabelTTF and running on iPhone 64bit simulator(device)
[FIX] Label: Refactor implementation of label's shadow
[FIX] Label: Stroke was not 'outside stroke' for Label which is generated by 'Font name'
[FIX] Label: Wrong logic in Label::setFontAtlas
[FIX] Label: Read file more than once for label created by different font size
[FIX] Label: Getting wrong rectangle by LabelTTF(LabelBMFont)::getBoundingBox.
[FIX] Label: Possible crash if invoking FontAtlasCache::purgeCachedData
[FIX] LuaBinding: Adds `addCustomHandler` in the ScriptHandlerMgr
[FIX] LuaBinding: Upgrading LuaSocket to the latest version
[FIX] Menu: Added missed scaleZ feature in ScaleTo and ScaleBy.
[FIX] Network: Implements 'SIODelegate::fireEventToScript' method to integrate JSB event handling with the original native code.
[FIX] Network: WebsocketTest crashes on win32, mutex varible may be deleted while it's still locked
[FIX] ParticleSystem: Particle will stop animating if it was removed and re-added to another node
[FIX] ParticleSystem: Set particle visible to false then set to true cause crashes
[FIX] Physics: Incorrect function invocation in PhysicsBody::setAngularVelocityLimit
[FIX] Physics: PhysicsBody::setGravityEnable doesn't work correctly sometimes
[FIX] Physics: PhysicsBody moves randomly when switch foreground/background
[FIX] Physics: Refactors PhysicsDebugDraw
[FIX] Tests: Memory leak in CocosDenshionTest
[FIX] Texture2D: Support to update partial texture
[FIX] Tools: The apk generated with release mode in cocos-console can't be installed
[FIX] UI: Widget::addNode is confused, need to add ProtectedNode to remove addNode API.
[FIX] UI: Adding HBox, VBox layouts, refactoring 'doLayout' function
[3RD] Chipmunk: Upgraded to v6.2.1
[3RD] libwebsockets: Upgraded to v1.23
cocos2d-x-3.0rc0 March.14 2014
[All]
[NEW] Action: RotateBy supports 3D rotations
[NEW] Bindings: Using python to automatically generate script bindings
[NEW] ccConfig.h: removed support for CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP
[NEW] Console: Added command: 'autotest run|main|next|back|restart'.
[NEW] Console: Added 'resolution', 'projection' commands. Improved API
[NEW] Console: Added more commands: director resume|pause|stopanimation|startanimation.
[NEW] Console: Added command: 'touch tap|swipe' to simulating touch events.
[NEW] Console: Added command: 'upload filename filesize' to upload a file to writable path.
[NEW] Director: Displays 'Vertices drawn' in the stats. Useful to measure performance.
[NEW] GLProgram: initWithVertexShaderByteArray() -> initWithByteArrays()
[NEW] GLProgram: initWithVertexShaderFilename()a -> initWithFilenames()
[NEW] GLProgram: addAttribute() -> bindAttributeLocation()
[NEW] Label: can custom shadow and outline size
[NEW] Label: LabelTTF was re-implemented as a wrapper of Label
[NEW] Node: Added set/get Position3D() and set/get Rotation3D()
[NEW] Node: Calculates rotation X and Y correctly.
[NEW] Node: set/get VertexZ() -> set/get PositionZ()
[NEW] Node: setRotationX() -> setRotationSkewX()
[NEW] Node: setRotationY() -> setRotationSkewY()
[NEW] Node: visit() and draw() new arguments: Renderer, parentTransform, and whether or not the parentTransform has changed since the last frame
[NEW] Language: Added Dutch support
[NEW] Sprite: Added auto-culling support. Performance increased in about 100% when many sprites are outside the screen
[NEW] Setup.sh: added script to set up environment needed for cocos2d-x
[NEW] Scheduler: Added new API [ schedule(std::function, ...), schedule(member_func, ...) ], deprecated the old API [ scheduleSelector(member_func, ...) ]
[FIX] Action: FadeIn and FadeOut behaviours is incorrect if it doesn't start from an edge value( 0 or 255)
[FIX] Array: crash when invoking initWithObjects()
[FIX] Action: Merge cocostudio/CCActionXxx to CCAction
[FIX] Bindings: Adds a macro to disable inserting script binding relevant codes
[FIX] Bindings: Supports 'setTimeout' and 'setInterval' in JSB
[FIX] Bindngs: Exposes the missing data structures of Spine to JS
[FIX] Bindings: cc.BuilderReader.load( path, null, parentSize ); was not allowed
[FIX] Console: crashes on Windows
[FIX] ControlButton: Crash if it was removed from parent in its callback
[FIX] CocoStudio: Logical error in 'TriggerObj::detect()'
[FIX] Director: Crash if invoking Director::end() on WINDOWS
[FIX] Director: setAnimationInterval has not effect on Mac
[FIX] EditBox: position would not be updated if its parent's position changed
[FIX] EditBox: Voice recognition input would cause crash on ios7
[FIX] EGLView: renamed to GLView, no longer a singleton, easier to customize
[FIX] EventDispatcher: removeAllEventListeners() remove event listeners used internally, make textures not reload on Android when come from background
[FIX] EventDispatcher: dispatchEventToListeners() causes "out of range" exception
[FIX] Image: s3tc compressed textures with no mipmaps fail to be loaded
[FIX] Label: A string which only contains CJK characters can't make a line-break when it's needed
[FIX] Label: Character would not be aligned on the baseline when label using distance field
[FIX] Label: Color and opacity can't take effect
[FIX] Label: Font size passed to new Label didn't consider 'contentScaleFactor'
[FIX] Label: loading custom fonts from ttf file fails on windows
[FIX] Label: LabelAtlas::setColor takes no effect
[FIX] MotionStreak: Added unimplemented position getter/setter
[FIX] Node: setAdditionalTransform receives a pointer and not a const reference
[FIX] Node: setRotation() moves opposite when node has a physics body
[FIX] Node: Can not use Node::setPhysicsBody to reset a physics body
[FIX] Object: Object -> Ref, and remove unneeded functions
[FIX] Other: Removes samples except testcpp|testjavascript|testlua. Moves sample games to `cocos2d/samples` repo
[FIX] Physics integration: Improves physical performance
[FIX] Physics integration: PhysicsContact::_contactData may be double freed.
[FIX] Physics integration: PhysicsShapeBox::getSize returns wrong value.
[FIX] ParticleSystemQuad: setTotalParticles() can not set a value larger than initialized value
[FIX] Renderer: Expand textureID bit from 18bits to 32bits. Resolves probably crash on Linux / Android
[FIX] RenderTexture: save screen with RenderTexture got unexpected result
[FIX] RenderTexture: saveToFile() can't write png file correctly
[FIX] Spine: spine::Skeleton would not be updated after being re-added to scene
[FIX] Sprite: not work as expected when CC_SPRITE_DEBUG_DRAW is 1
[FIX] Scheduler: Thread deadlock if new functions are added in callback of Scheduler:: performFunctionInCocosThread
[FIX] Tests: EditBoxText crashes on Win32 when being clicked many times
[FIX] Tests: ChipmunkTest bounding box for debugging couldn't be shown
[FIX] Tests: CocoStudioGuiTest/LabelBMFontTest crashes
[FIX] Tests: Particle test/AddAndRemove test crashes
[FIX] Tests: RenderTextureTest not drawn when coming from background
[FIX] Tests: LabelTTFMultiline show nothing on mac
[FIX] Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler
[FIX] Tests: Potential crash by switching repeatly between HttpClientTest, WebSocketTest, SocketIOTest
[FIX] Tests: State is changed to RESUME when game comes back to foreground if pause button was clicked in Interval Test
[FIX] TMXLayer: Removing child from TMXLayer may cause crash
[FIX] TMXObjectGroup: Object values (x, y, width and height) from TMXObjectGroup are incorrect
[FIX] TMXXMLParser: Refactored the codes of parsing pure xml layer format for tilemap
[FIX] TMXXMLParser: 'y' value is parsed incorrectly
[FIX] UI: Changes namespace from 'cocos2d::gui' to 'cocos2d::ui'.
[FIX] UI: Supports RichText
[FIX] Vector: Object which isn't in Vector would also be released when invoking Vector::eraseObject.
[FIX] Websocket: Potential crash when websocket connection closes.
[FIX] Websocket: No callback is invoked when websocket connection fails
[FIX] Xcode 5.1: Added Xcode 5.1 to build arm64 version, but can not require socket module in lua, will fix it soon
[3RD] Kazmath: Upgraded to latest version of Kazmath
cocos2d-x-3.0beta2 Jan.24 2014
[All]
[NEW] Full screen support for desktop platforms.
[NEW] Adds performance test for EventDispatcher.
[NEW] Adds performance test for Containers(Vector<>, Array, Map<K,V>, Dictionary).
[NEW] DrawNode supports to draw triangle, quad bezier, cubic bezier.
[NEW] Console: added the 'textures', 'fileutils dump' and 'config' commands
[NEW] GLCache: glActiveTexture() is cached with GL::activeTexture(). All code MUST call the cached version in order to work correctly
[NEW] Label: Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
[NEW] Label: Integrates LabelAtlas into new Label.
[NEW] Node: Added `setGlobalZOrder()`. Useful to change the Node's render order. Node::setZOrder() -> Node::setLocalZOrder()
[NEW] Renderer: Added BatchCommand. This command is not "batchable" with other commands, but improves performance in about 10%
[FIX] event->stopPropagation can't work for EventListenerTouchAllAtOnce.
[FIX] Uses unified `desktop/CCEGLView.h/cpp` for desktop platforms (windows, mac, linux).
[FIX] Bindings-generator supports Windows again and remove dependency of LLVM since we only need binary(libclang.so/dll).
[FIX] Removes unused files for MAC platform after using glfw3 to create opengl context.
[FIX] Wrong arithmetic of child's position in ParallaxNode::addChild()
[FIX] CocoStudio: TestColliderDetector in ArmatureTest can't work.
[FIX] CocoStudio: The order of transform calculation in Skin::getNodeToWorldTransform() is incorrect.
[FIX] Crash if file doesn't exist when using FileUtils::getStringFromFile.
[FIX] If setting a shorter string than before while using LabelAtlas, the effect will be wrong.
[FIX] Label: Memory leak in FontFreeType::createFontAtlas().
[FIX] Label: Crash when using unknown characters.
[FIX] Label: Missing line breaks and wrong alignment.
[FIX] Label: Corrupt looking characters and incorrect spacing between characters
[FIX] Label: Label:color and opacity settings are invalid afeter these these properties changed: 1)text content changed 2)align style changed 3)max line width limited
[FIX] Label: Crash when using unknown characters
[FIX] Console: log(format, va_args) is private to prevent possible resolution errors
[FIX] Configuration: dumpInfo() -> getInfo()
[FIX] ControlSlider doesn't support to set selected thumb sprite.
[FIX] ControlButton doesn't support to set scale ratio of touchdown state.
[FIX] Particles: Crash was triggered if there is not `textureFileName`section in particle plist file.
[FIX] Renderer: Uses a float as key with only the depth. Viewport, opaque are not needed now
[FIX] Renderer Performance Fix: QuadCommand::init() does not copy the Quads, it only store a reference making the code faster
[FIX] Renderer Performance Fix: Sprite and SpriteBatchNode (and subclasses) has much better performance
[FIX] Renderer Performance Fix: When note using VAO, call glBufferData() instead of glBufferSubData().
[FIX] Renderer Performance Fix: Doesn't sort z=0 elements. It also uses sort() instead of stable_sort() for z!=0.
[FIX] Sprite: removed _hasChildren optimization. It uses !_children.empty() now which is super fast as well
[FIX] Tests: Sprites Performance Test has 4 new tests
[FIX] TextureCache: getTextureForKey and removeTextureForKey work as expected
[FIX] TextureCache: dumpCachedTextureInfo() -> getCachedTextureInfo()
[FIX] Websocket doesn't support send/receive data which larger than 4096 bytes.
[FIX] Object: Remove _retainCount
[FIX] ParallaxNode: Coordinate of Sprite may be wrong after being added into ParallaxNode
[FIX] Crash if there is not `textureFileName`section in particle plist file
[FIX] Websocket cannot send/receive more than 4096 bytes data
[FIX] TextureCache::addImageAsync can't load first image
[FIX] ControlSlider: Can not set "selected thumb sprite"
[FIX] ControlSlider: Can not set "scale ratio"
[FIX] Crash when loading tga format image
[FIX] Keyboard pressed events are being repeatedly fired before keyboard is released
[Android]
[FIX] Background music can't be resumed when back from foreground
[FIX] ANR (Application Not Responding) appears on android 2.3 when pressing hardware button.
[lua binding]
[NEW] Can bind classes that have the same class names but different namesapces
[FIX] Use EventDispatcher to update some test cases
[FIX] sp.SkeletonAnimation:registerScriptHandler should not override cc.Node:registerScriptHandler
[javascript binding]
[NEW] Bind SAXParser
[FIX] Pure JS class that wants to inherite from cc.Class will trigger an irrelevant log
[FIX] Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode
[FIX] Crash when running JSB projects on iOS device in DEBUG mode
[FIX] Crash when Firefox connects to JSB application on Mac platform.
[Desktop]
[NEW] Support fullscreen
[Linux]
[FIX] "Testing empty labels" in LabelTest crashes.
[Mac]
[FIX] Removes unused files after using glfw3 to create opengl context
[Win32]
[FIX] Compiling error when using x64 target
[FIX] Tests: TestCpp works with CMake
[FIX] Bindings-generator supports Windows again and remove dependency of LLVM since it only needs binary of libclang
cocos2d-x-3.0beta Jan.7 2014
[All]
[NEW] New label: shadow, outline, glow support
[NEW] AngelCode binary file format support for LabelBMFont
[NEW] New spine runtime support
[NEW] Add templated containers, such as `cocos2d::Map<>` and `cocos2d::Vector<>`
[NEW] TextureCache::addImageAsync() uses std::function<> as call back
[NEW] Namespace changed: network -> cocos2d::network, gui -> cocos2d::gui
[NEW] Added more CocoStudioSceneTest samples.
[NEW] Added UnitTest for Vector<T>, Map<K, V>, Value.
[NEW] AngelCode binary file format support for LabelBMFont.
[NEW] New renderer: Scene graph and Renderer are decoupled now.
[NEW] Upgrated Box2D to 2.3.0
[NEW] SChedule::performFunctionInCocosThread()
[NEW] Added tga format support again.
[NEW] Adds UnitTest for Template container and Value class
[FIX] A Logic error in ControlUtils::RectUnion.
[FIX] Bug fixes for Armature, use Vector<T>, Map<K, V> instead of Array, Dictionary.
[FIX] Used c++11 range loop(highest performance) instead of other types of loop.
[FIX] Removed most hungarian notations.
[FIX] Merged NodeRGBA to Node.
[FIX] Potential hash collision fix.
[FIX] Updates spine runtime to the latest version.
[FIX] Uses `const std::string&` instead of `const char*`.
[FIX] LabelBMFont string can't be shown integrally.
[FIX] Deprecates FileUtils::getFileData, adds FileUtils::getStringFromFile/getDataFromFile.
[FIX] GUI refactoring: Removes UI prefix, Widget is inherited from Node, uses new containers(Vector<T>, Map<K,V>).
[FIX] String itself is also modified in `String::componentsSeparatedByString`.
[FIX] Sprites with PhysicsBody move to a wrong position when game resume from background.
[FIX] Crash if connection breaks during download using AssetManager.
[FIX] OpenAL context isn't destroyed correctly on mac and ios.
[FIX] Useless conversion in ScrollView::onTouchBegan.
[FIX] Two memory leak fixes in EventDispatcher::removeEventListener(s).
[FIX] CCTMXMap doesn't support TMX files reference external TSX files
[FIX] Logical error in `CallFuncN::clone()`
[FIX] Child's opacity will not be changed when its parent's cascadeOpacityEnabled was set to true and opacity was changed
[FIX] Disallow copy and assign for Scene Graph + Actions objects
[FIX] XMLHttpRequest receives wrong binary array
[FIX] XMLHttpRequest.status needs to be assigned even when connection fails
[FIX] TextureCache::addImageAsync may load a image even it is loaded in GL thread
[FIX] EventCustom shouldn't use std::hash to generate unique ID, because the result is not unique
[FIX] CC_USE_PHYSICS is actually impossible to turn it off
[FIX] Crash if connection breaks during download using AssetManager
[FIX] Project_creator supports creating project at any folder and supports UI
[Android]
[NEW] build/android-build.sh: add supporting to generate .apk file
[NEW] Bindings-generator supports to bind 'unsigned long'.
[FIX] XMLHttpRequest receives wrong binary array.
[FIX] 'Test Frame Event' of TestJavascript/CocoStudioArmatureTest Crashes.
[FIX] UserDefault::getDoubleForKey() doesn't pass default value to Java.
[iOS]
[FIX] Infinite loop in UserDefault's destructor
[Windows]
[NEW] CMake support for windows.
[Bindings]
[NEW] Support CocoStudio v1.2
[NEW] Adds spine JS binding support.
[FIX] Don't bind override functions for JSB and LuaBining since they aren't needed at all.
[FIX] The order of onEnter and onExit is wrong.
[FIX] The setBlendFunc method of some classes wasn't exposed to LUA.
[FIX] Bindings-generator doesn't support 'unsigned long'
[FIX] Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding
[Lua binding]
[NEW] New label support
[NEW] Physcis integrated support
[NEW] EventDispatcher support
[FIX] CallFuncND + auto remove lua test case have no effect
[FIX] Lua gc will cause correcsponding c++ object been released
[FIX] Some lua manual binding functions don't remove unneeded element in the lua stack
[FIX] The setBlendFunc method of some classes wasn't exposed to LUA
[Javascript binding]
[FIX] `onEnter` event is triggered after children's `onEnter` event
cocos2d-x-3.0alpha1 Nov.19 2013
[all platforms]
[DOC] Added RELEASE_NOTES and CODING_STYLE.md files
[FIX] Texture: use CCLOG to log when a texture is being decoded in software
[FIX] Spine: fix memory leaks
[FIX] fixed a memory leak in XMLHTTPRequest.cpp
[FIX] removeSpriteFramesFromFile() crashes if file doesn't exist.
[FIX] Avoid unnecessary object duplication for Scale9Sprite.
[FIX] create_project.py does not rename/replace template projects completely.
[FIX] Could not set next animation in CCBAnimationCompleted callback.
[FIX] The Node's anchor point was changed after being added to ScrollView.
[FIX] Refactored and improved EventDispatcher.
[FIX] EventListeners can't be removed sometimes.
[FIX] When parsing XML using TinyXML, the data size has to be specified.
[FIX] Parameter type: const char* -> const string&
[FIX] Armature: many bug fixed, add more samples, add function to skip some frames when playing animation
[FIX] Configuration of VAO in runtime
[FIX] Webp Test Crashes.
[FIX] TransitionScenePageTurn: z fighting
[FIX] AssetsManager: Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
[FIX] CCBReader: To set anchor point to 0,0 when loading Scale9Sprite
[FIX] OpenGL Error 502 in Hole Demo
[FIX] AssetsManager: downloading progress is not synchronized with actual download
[FIX] SpriteFrameCache: memory leak when loading a plist file
[FIX] removeSpriteFramesFromFile() crashes if file doesn't exist
[FIX] EditBox: can't click the area that outside of keyboard to close keyboard
[FIX] CCBReader: can not set next animation in AnimationCompleted callback
[FIX] Node's anchor point was changed after being added to ScrollView
[FIX] EventDispather: refactor method and fix some bugs
[FIX] EventListner: cann't be removed sometimes
[FIX] UserDefault: didn't set data size when parsing XML using TinyXML
[FIX] Webp test crashed
[FIX] CCHttpClient: The subthread of CCHttpClient interrupts main thread if timeout signal comes.
[NEW] Arm64 support.
[NEW] Added Mouse Support For Desktop Platforms.
[NEW] Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
[NEW] Sprite: Override setScale(float scaleX, float scaleY)
[NEW] External: added | operator for Control::EventType
[NEW] Android & iOS screen size change support
[NEW] GLProgram: setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv
[NEW] Color[3|4][B|F]: comparable and explicit convertible
[NEW] Contorl::EventType add | operation
[NEW] Performance Test: Sprite drawing
[NEW] Adjusted folder structure
[NEW] Added tools to simplify upgrading game codes from v2.x to v3.x
[FIX] Added virtual destructors on Interfaces
[Android]
[FIX] Added EGL_RENDERABLE_TYPE to OpenGL attributes
[FIX] Fixed application will crash when pause and resume.
[FIX] Clear NoSuchMethodError Exception when JniHelper fails to find method id
[FIX] Fixed crash when backging from background
[FIX] LabelTTF: crashed when setting dimension input height value less than the height of the font and the input width value is 0
[FIX] Changed data type of 'char' to signed as default
[NEW] Added xlargeScreens="true" to supports-screens
[NEW] Added build/android-build.py to build all Android samples, and remove all build_native.sh/cmd
[NEW] Added build_native.py to build template projects, and remove build_native.sh/cmd
[NEW] Added Cocos2dxHelper.runOnGLThread(Runnable) again
[NEW] Added support for orientation changed
[NEW] Disabled CDT Builder on Eclipse
[Mac]
[FIX] Removed unused CCLOG() from GL initialization
[FIX] HttpClientTest: crash
[iOS]
[FIX] Can't click the area that outside of keyboard to close keyboard when using EditBox.
[NEW] Added support for orientation changed
[Linux]
[NEW] Used CMake to build linux projects.
[FIX] Closed X display after getting DPI on Linux.
[Win32]
[FIX] Last test case of OpenglTest crashed
[Desktop]
[FIX] Trigger onKeyReleased only after the key has been released.
[NEW] Added mouse support
[Javascript binding]
[FIX] Fixed a memory leak in ScriptingCore::runScript()
[FIX] sys.localStorage.getItem() does not support non-ascii string.
[FIX] cc.Scheduler.schedule(target, func) without repeat argument couldn't repeat schedule forever on device.
[FIX] CCBReader can't play sequence automatically in JSB.
[FIX] Wrong convention to jsval in cccolor4f_to_jsval and cccolor3b_to_jsval
[FIX] sys.localStorage: doesn't support non-ascii string
[FIX] BuilderReader: can't play sequence automatically
[FIX] Wrong conversion to javal in cccolor4f_to_jsval and cccolor3b_to_jsval
[NEW] main.js -> cocos2d-jsb.js
[NEW] Remote debugging using Firefox, "step into" can not work
[NEW] Added binding for Node::setScale(float, float)
[NEW] Impvoved armature binding
[NEW] Added CocoStudio releated binding codes: gui, scene parser, and add corresponding samples
[Lua Binding]
[NEW] Added Armature lua binding and added test samples.
[NEW] Added LuaObjectBridge & LuaJavaBridge to simplify invoking objective-c codes and java codes from lua
[NEW] Added CocoStudio releated binding codes: gui, scene parser, and add corresponding samples
[NEW] Added AssetsManager binding and corresponding sample
[NEW] Added XMLHttpRequest lua binding and corresponding sample
cocos2d-x-3.0alpha0 @Sep.19 2013
[all platforms]
[FIX] TargetAction::reverse() works as expected
[FIX] Fixed crash in OpenGLTest
[FIX] Fixed logic when passing an empty std::vector to WebSocket::init()
[FIX] Fixed crash in ParticleSystemQuad due to improper deletion of VBO and VAO
[FIX] Point::isSegmentIntersect() returns correct value
[FIX] Improved UTF8 response code in XmlHttpRequest
[FIX] Observers with the same target and name but different sender are the same observer in NotificationCenter
[NEW] Added ATITC format support
[NEW] Better integration with physics engine
[NEW] New Event Dispatcher: supports Keybaord, Touches, Accelerometer, Custom events. Added Tests as well
[NEW] New Label code: Faster and more efficient than previous code
[NEW] Added S3TC support
[NEW] Added a method to get duration of timeline for CCBAnimationManager class
[NEW] Array is compatible with STL containers.
[3RD] Upgraded SpiderMonkey to Firefox v23
[Android]
[FIX] Fixed When lock screen or entering background and resume the application textures from pvr.ccz file become black
[FIX] Fixed Stroke font color
[NEW] Uses Native Activity
[iOS]
[FIX] Status bar can be hidden on iOS 7
[FIX] Added iOS7 icons to templates and tests
[Mac OS X]
[NEW] iOS and Mac tempaltes were merged into one single Xcode project file.
[NEW] Added Lua template
[JavaScript bindings]
[FIX] CCBReader is able to set properties to owner if 'owner var' is setted
[FIX] Fixed crash when extending cc.ScrollView in JS
[FIX] cc.registerTargettedDelegate supports pure js object as its target
[FIX] Fixed memory leak in the binding glue code of cc.FileUtils.getStringFromFile(getByteArrayFromFile)
[NEW] Added bindigns for Sprite::getDisplayFrame(), ControlButton callback and RemoveSelf
[Lua bindings]
[NEW] Bind Sprite::getDisplayFrame()
cocos2d-x-3.0alpha0-pre @Jul.30 2013
[all platforms]
[FIX] #2124: Image::initWithImageFileThreadSafe is not thread safe
[FIX] #2230: Node::onEnterTransitionDidFinish was called twice when a node is added in Node::onEnter
[FIX] #2237: calculation offset in font rendering
[FIX] #2303: missing precision when getting strokeColor and fontFillColor
[FIX] #2312: WebSocket can not parse url like "ws://domain.com/websocket"
[FIX] #2327: implement Node::isScheduled
[FIX] #2338: ccbRootPath is not passed to sub ccb nodes
[FIX] #2346: OpenGL error 0x0502 in TextureAtlas::drawNumberOfQuads
[FIX] #2359: Sprite will become white block when using ControlSwitch
[FIX] #2361: some bug fixed of the Set class
[FIX] #2366: text shadow
[FIX] #2367: ClippingNode works differently on different platforms
[FIX] #2370: Pivotjoint constructor and pointQueryFirst in Space class will return false instead of invalid shape object
[FIX] #2381: ControlSwitch wasn't displayed correctly when adding more than one switch
[FIX] #2384: The submenu of ExtensionTest in TestCpp can't scroll
[FIX] #2386: ClippingNode works wrongly when being set as a child
[FIX] #2396: Scale9Sprite::setInsetLeft/XXX can't work for rotated sprite frame
[FIX] #2401: LabelBMFont crashes in glDrawElements of CCTextureAtlas::drawNumberOfQuads randombly
[FIX] #2410: Black screen appears on android randomly
[FIX] #2411: Opacity option for shadow in CCLabelTTF is not working
[FIX] #2406: Color and Opacity of Scale9Sprite will not be changed when it's added to NodeRGBA and run with FadeIn/Out actions
[FIX] #2415: Warning of AL_INVALID_NAME and AL_INVALID_OPERATION in SimpleAudioEngineOpenAL.cpp
[FIX] #2418: Unused spriteframes also need to be removed when purgeCachedData
[FIX] #2431: Potential crash when loading js files
[FIX] #2229: Explicitly initialising CCAcceleration structure
[FIX] #2234: Add destructor to CCGLBufferedNode
[Feature] #2232: adding Norwegian language support
[Feature] #2235: Ability to save/retrieve CCData into/from CCUserDefault
[Feature] #2250: add support for std::function<> in CCMemuItem and CCCallFunc
[Feature] #2273: Hardware keyboard support
[Feature] #2278: Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 macros for MenuItems
[Feature] #2279: Updates chipmunk2d to v6.1.5
[Feature] #2283: Adds Polish language support
[Feature] #2289: Uses clone() pattern for actions
[Feature] #2332: Adding project for QtCreator
[Feature] #2364: Adds DrawPrimitives::DrawSolidCircle
[Feature] #2365: Adds Rect::unionWithRect
[Feature] #2385: Implemented pitch, pan and gain for SimpleAudioEngine
[Feature] #2389: Adding cookie support for HttpClient
[Feature] #2392: Adds append() function for String class
[Feature] #2395: Adds Scale9SpriteTest for TestCpp
[Feature] #2399: Adds SocketIO support
[Feature] #2408: Adds String::componentsSeparatedByString function for splitting string
[Feature] #2414: Bindings-generator could bind std::function<> argument
[Refactor] #2129: Removes Hungarian notation from ivars. Removes CC and cc prefixes from name classes and free functions.
[Refactor] #2242: Enables c++11
[Refactor] #2300: Using clone() pattern instead of 'copyWithZone' pattern
[Refactor] #2305: Use std::thread instead of pthread
[Refactor] #2328: ETC support for all platforms
[Refactor] #2373: Change some member functions to const
[Refactor] #2378: Remove the usage of CC_PROPERTY_XXX in engine code
[Refactor] #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked
[Refactor] #2397: Singleton refactor, sharedXXX --> getInstance, purgeXXX --> destroyInstance
[Refactor] #2404: Move all deprecated global functions and variables into CCDeprecated.h
[Refactor] #2430: Uses strongly typed enums (enum class) instead of simple enums
[iOS]
[FIX] #2274: compile and run for iOS7 and Xcode5
[Refactor] #2371: use one single Xcode project for iOS and Mac projects
[Android]
[FIX] #2306: CCLabelTTF::setString crash
[Refactor] #2329: use Android "asset manager" to improve file system read performance
[Refactor] #2400: use onWindowFocusChanged(bool) instead of onResume()/onPause()
[OS X]
[FIX] #2275: LabelTTF vertical alignment
[FIX] #2398: Add support for initializing Image with raw data
[windows]
[FIX] #2322: link error becasue of using multiply inheritance
[JavaScript bindings]
[FIX] #2307: PhysicsSprite::getCPBody return wrong type
[FIX] #2313: bind cc.ClippingNode
[FIX] #2315: iterating through cc.Node children crash
[Feature] #2285: bind MontionStreak
[Feature] #2340: Updates SpiderMonekey to Firefox v22 (JS Bindings)
[Feature] #2427: bind FileUtils.getInstance().createDictionaryWithContentsOfFile
[Lua bindings]
[Feature] #2276: Add CCScrollView Lua binding and corresponding test sample
[Feature] #2277: Add OpenGL Lua binding and corresponding test sample
[Feature] #2324: Add OpenGL Lua module
[Feature] #2343: Redesign the mechanism of invoking Lua func from c++
[Feature] #2344: make some execute functions into one function in ScriptEngineProtocol
[Feature] #2426: Add DrawPrimitives test sample
[Feature] #2429: LuaWebSocket supports sending binary string
[plugin-x]
[FIX] #2348: event will not be sent to server when paramMap argument of logEvent function is nil
[Emscript]
[Feature] #2289: Asynchronous Image loading
2.1rc0-x-2.1.4 @Jnue.12 2013
[all platforms]
Bug #2098: fix TouchPriority issue of CCScrollView
Bug #2107: fix crash in HttpClient request on 64Bit
Bug #2115: fix linking errors for TestCPP with libcurl
Bug #2128: remove setting ignoreAnchorPoint for child CCB files and fix crash while trying to load sprite frame when the file is missing
Bug #2140: fix a bug that the displayed color of CCDrawNode is incorrect when VAO is disabled
Bug #2142: adding CCDataVisitor and implementing CCPrettyPrinter
Bug #2143: fix a crash caused by ScrollView.setDelegate(tmp function)
Bug #2146: unpack texture data correctly
Bug #2147: fix null pointer access in CCBAnimationManager::getRunningSequenceName()
Bug #2150: fix a bug that setColor and setOpacity of CCControlButton and CCScale9Sprite are broken
Bug #2251: fix a logical error in CCDrawNode::drawPolygon()
Bug #2271: fix memory leak as possible
Feature #1859: make AssetsManager download resources in a new thread
Feature #2086: make CCLabelTTF supports shadows and stroke
Feature #2100: add CCDirector::popToSceneStackLevel(int level)
Feature #2105: add Travis build support
Feature #2108: add example for russian language in TestCpp
Feature #2111: add CC_DISABLE_COPY macro
Feature #2114: add __attribute__(__format__()) for CCLog and CCString
Feature #2116: support negative node scales for CCScrollView
Feature #2117: implement CCDictionary::writeToFile()
Feature #2122: add method to create a CCMenuItemToggle from a CCArray with a target selector
Feature #2132: add encrypted PVR.CCZ support to ZipUtils + Tests
Feature #2157: add Mingw-crt Support without breaking VS SDK
Feature #2265: add CCLabelTTF::createWithFontDefinition()
Feature #2270: add Armature(CocoStudio runtime) support
Refactor #2109: add const modifier for classes CCArray, CCObject
Refactor #2118: move ccpX functions to CCPoint methods and operators
Refactor #2119: use httpresponse_selector instead of callfuncND_selector for the callback function of CCHttpRequest
Refactor #2123: refactor network extension, fixing unlikely memory leaks, adding PUT/DELETE methods
Refactor #2127: add CCLOG before original path is returned in CCFileUtils::fullPathForFileName to aid in debugging
Refactor #2149: add const qualification to some CCNode's getters
Refactor #2189: CCLabelTTF::enableShadow() const update
Refactor #2215: refactor CCConfiguration
Refactor #2217: use CCLabelAtlas instead of CCLabelTTF to show FPS
Refactor #2231: implement a format of CCConfiguration
Refactor #2233: add support for "CCString" types for boolean and integers in CCConfiguration
Refactor #2236: fix memory hot spot of CCTextureAtlas::updateQuad()
[android]
Bug #1284: fix a bug that SimpleAudioEngine may cause crash on i9100
Bug #2151: fix custom font loading on Android for resource mapped font files
Bug #2190: updat .classpath of Android project to latest ADT 22 build tool compatibility
Bug #2266: fix a bug that CCFileUtils::getFileData() may not get file data correctly on Android
Feature #2161: add ETC1 image format
[iOS]
Bug #2102: fix missing protocol method warning for iOS 6.0 addition
Bug #2104: fix a bug that JPEG picture not displayed correctly on iOS 4.3
Bug #2260: fix a bug that CCDirectory::createWithContentsOfFile() returns a valid pointer though the file is missing on iOS
Refactor #2101: update cocos2dx Xcode project to detect more warnings
Refactor #2253: add UITextField only when keyboard was opened, removing it when keyboard was closed
[mac]
Bug #2249: fix linebreaks on Mac OSX
[win32]
Bug #2131: fix memory leak of SimpleAudioEngine::preloadEffect()
Bug #2145: center the window correctly on windows
[emscripten]
Feature #2120: compile c++ to js
Bug #2159: use browser font rendering instead of FreeType
Refactor #2133: compile for Emscripten in asm.js mode
Document #2121: write a document to describe the usage of emscriptenate port
[tizen]
Feature #2185: add support for Tizen
[JavaScript bindings]
Bug #2099: fix a bug in ScriptingCore::evalString() not setting the outval
Bug #2179: fix a bug that pointQueryFirst returns invalid Shape when a shape is not found
Bug #2186: fix a bug that new PivotJoint can't access 4 parameters like in html5 version
Bug #2187: JavaScript debugger improved and bug fixed
Bug #2243: fix a bug that XMLHttpRequest dones't support non-ascii characters
Bug #2244: fix a bug that cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values
Feature #1647: Bind websocket to JavaScript
Feature #2092: add XMLHttpRequest and bind it to JSB
Feature #2106: add support for JavaScript byte code
Feature #2162: add command line tool for generating JavaScript bytecode
Feature #2214: upgrade Spidermonkey to Firefox v21
Refactor #2152: log assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert
Refactor #2247: use functions instead of macros to speeding up building for JSB project
[Lua bindings]
Feature #2103: implement most test cases
cocos2d-2.1rc0-x-2.1.3 @May.01 2013
[all platforms]
Bug #1853: use SHELLOPTS instead of "-o igncr" for Android Eclipse project
Bug #1860: fix a bug that onNodeLoaded will be called twice if ccb was added as a CCBFile
Bug #1862: fix a bug that CCScrollView::setContainer may cause dangling pointer when NULL is passed into
Bug #1876: fix a bug that CCScale9Sprite::setColor() & setOpacity() are broken
Bug #1935: fix a bug that use "==" for float comparison of CCPoint and CCSize
Bug #1937: fix a bug that CCControl's touch priority is not set correctly, m_nDefaultTouchPriority is never used
Bug #1943: added some missing function for setting integer shader uniforms in CCGLProgram
Bug #1999: allowing to set fontName and fontSize separately for CCEditBox
Bug #2003: fix a potential crash in CCScheduler::removeHashElement()
Bug #2030: fix a bug that scissor rectangle in nested CCScrollView is wrong
Bug #2031: make CCFileUtils::createXXXXWithContentsOfFile() support relative path
Bug #2035: fix a potential crash in CCSaxParser
Bug #2037: fix a wrong logic in CCArray::initWithObjects()
Bug #2040: get scale property from sub-ccb node may trigger an assert
Bug #2054: fix a bug that anchorPoint property of CCScale9Sprite doesn't work in CCBReader
Bug #2055: enable easy switching between Box2D and chipmunk
Bug #2058: properly resets the tile's Y flipping
Bug #2061: fix a bug that wrong type of argument signature is used in setAccelerometerIntervalJNI function
Bug #2073: fix a memory leak in CCUserDefault
Bug #2080: fix a bug that _realOpacity isn't assigned in CCLayerColor::initWithColor
Feature #2001: add CCRemoveSelf Action
Feature #2048: support variable cell sizes in CCTableView
Feature #2065: adding kResolutionFixedHeight and kResolutionFixedWidth resolution policy
Feature #2068: adding a secureTextEntry property to CCTextFieldTTF
Feature #2069: adding new macro CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK to CCBMemberVariableAssigner.h
Feature #2075: support spine editor
Feature #2076: adding a method CCBReader::setResolutionScale for setting resolution scale manually
Refactor #1592: updating UTHASH to v1.9.8
Refactor #2042: remove libxml2
Refactor #2097: use pthread mutex and condition variable instead of pthread semaphore to load image asynchronizely
[android]
Bug #1996: adding missing JNIEXPORT / JNICALL declarations
Bug #2028: fix a bug taht application can not run correctly on Android simulator
Bug #2045: some small fixes to CocosPlayer
Bug #2062: fix for spaces at the beginning of wrapped lines
Bug #2083: fix a bug that Bytecode of LuaJIT can't work on android
Refactor #1613: not reload resources when coming from background on Android
Refactor #1861: CocosPlayer Android update
Refactor #1904: strip libcurl.a on x86 architecture
Refactor #2027: reduce function call in nativeInitBitmapDC to improve performance
Refactor #2047: clean up linked libraries for android
[iOS]
Bug #1863: fix a bug that CCUserDefault on iOS may not save immediately
Feature #2096: adding Cocosplayer for iOS and bug fixes
[linux]
Bug #1932: fix a bug that font rendering crashed for certain fonts
Bug #2036: correct passed buffer size to readlink
Bug #2044: link libpthread and libGL
Bug #2046: strip newlines from log message and fixing linux library location
Bug #2052: fix a bug that [-Werror=array-bounds] error appears when compiling Box2dTestBed
Feature #2032: Linux OpenAL support
Refactor #2000: improve font rendering performance for linux platform
Refactor #2053: set writable path to "<user's home>/.config/<app name>"
[mac]
Bug #2051: fix a bug that TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target
Feature #1856: adding 64bit target for Mac project
[JavaScript bindings]
Bug #1855: fix a bug that std_string_to_jsval generates messy js string when passed a non-ascii UTF8 std::string
Bug #2057: adding response for back and menu keypad event for Android
Bug #2059: fix a bug that cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string
Bug #2071: fix a bug that cc.TMXLayer.getTiles() can't work
Feature #1841: find a way to obfuscate JavaScript code on the top of JSB
Feature #1936: adding OpenGL Bindings to Javascript
Feature #2043: upgrading SpiderMonkey to Firefox20.0
Feature #2060: support for cc.FileUtils.getInstance().getByteArrayFromFile(filename)
Feature #2064: exposing cc.Node.nodeTo***Transform to JS
Refactor #1944: subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore
[Lua bindings]
Feature #1814: add menutest
Feature #1941: add TileMapTest
Feature #1942: add LayerTest
Feature #1945: use CCLOG to implement print() function
Feature #1993: add ParallaxTest
Feature #1994: add ActionManagerTest
Feature #1997: add IntervalTest
Feature #1998: add SceneTest
Feature #2002: add Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest
Feature #2004: add UserDefaultTest
Feature #2005: add CurrentLanguageTest
Refactor #1847: use luajit
Refactor #2084: unify the method of loading Lua files on all platforms
cocos2d-2.1rc0-x-2.1.2 @Mar.20 2013
[all platforms]
Bug #1529: use NSUserDefaults on iOS and SharedPreferences on Android implement CCUserDefault
Bug #1672: fix a bug that CCTableView is too sensitive on some devices with high density display
Bug #1689: support horizontal alignment for Custom TTF fonts
Bug #1691: fix a bug that CCControlSwitch::setOn(isOn,false) doesn't work
Bug #1692: add TMX polygon parsing
Bug #1697: fix a logical error in CCRenderTexture::initWithWidthAndHeight()
Bug #1710: add simpler,correct handling of spritesheet sources for CCScale9Sprite
Bug #1711: fix a bug that clipping rectangle of CCScrollView is wrong when the scale of its ancestors isn't equal to 1
Bug #1731: change declaration of CCSize, CCPoint and CCRect in pkg file
Bug #1751: fix a bug that clicking outside of CCTableViewCell will also get response when container size is smaller than view size
Bug #1754: fix a bug that offset of the container is wrong in CCTableView
Bug #1821: fix a bug that the display result is wrong when invoking CCControlButton::setHighlighted()
Feature #1686: synchronize to cocos2d-iphone v2.1rc0
Feature #1708: adding Portuguese and Arabic language support
Feature #1712: add an interface to get DPI
Feature #1741: CCLens3d can be concave
Feature #1742: add 'rotationIsDir' property to ParticleSystem
Feature #1761: implement setVisible() for CCEditBox
Feature #1807: add getStartLocationInView() and getStartLocation() methods in CCTouch
Feature #1822: add CCNotificationCenter::removeAllObservers(CCObject *target)
Feature #1838: synchronize CCBReader to the lastest version
Feature #1489: add AssetsManager
Refactor #1687: refactor CCFileUtils and CCImage
Refactor #1700: add webp image format support
Refactor #1702: change return value of CCFileUtils::getWritablePath()
Refactor #1703: replace libxml2 with tinyxml2
Refactor #1749: add 'setFont' and 'setAnchorPoint' to CCEditBox
[android]
Bug #1752: fix a bug that libcurl.a causes link error after being stripped
Bug #1760: fix a bug that cpufeatures module is redefined
Bug #1775: fix a bug that OpenSLEngine can not load resources from SD card
Bug #1812: fix a warning of getStringWithEllipsisJni() function when compiling it with clang
Feature #1827: support building android project, including native codes, in Eclipse
[iOS]
Bug #1750: fix a bug that CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode
Bug #1804: fix for loading custom fonts on iOS when referenced from a CCB file
Feature #1842: support kEditBoxInputFlagSensitive setting for CCEditBox on iOS
Refactor #1755: add CocosDenshion xcode project
Refactor #1825: use CCLabelTTF to show text for CCEditBox
[JavaScript bindings]
Bug #1707: fix a crash caused by unaligned memory access in CCBReader::readFloat()
Bug #1726: fix crash of JSB application on android device with armv6 architecture
Bug #1729: fix compiling error of ScriptingCore.cpp with C++11 on iOS
Bug #1747: fix a crash when passing null to cc.AnimationFrame.initWithSpriteFrame()
Bug #1823: use shared NodeLoaderLibrary in CCBReader bindings
Feature #1724: add HelloJS sample
Feature #1730: bind CCScrollView and CCTableView to js
Feature #1748: separate chipmunk and sqlite from js_binding_core.cpp
Feature #1753: upgrade SpiderMonkey to Firefox19.
Feature #1808: make cxx_generator support parsing functions that have default parameters
Feature #1811: add a method to get file data for JSB
Feature #1824: bind CCEditBox to JS
Refactor #1682: add ScriptingCore::getGlobalObject() function
Refactor #1740: add cleanup and reset methods to ScriptingCore
Refactor #1830: use JS::CompileOptions::setUTF8(true) to compile script
Refactor #1836: make js target of "cc.Scheduler().scheduleCallbackForTarget()" accept a object that not depend on CCNode or its subclass
Refactor #1837: refactor schedule binding codes
[Lua bindings]
Bug #1745: fix a bug that CCRepeat:create() receives error argument
Feature #1425: fix errors in Lua test cases and add more test cases
Feature #1698: add CCLuaObjcBridge
Feature #1802: add TouchesTest for Lua binding
Refactor #1818: cleanup the tolua++ bindings build system
[win32]
Feature #1634: CCEditBox support
Feature #1746: add VS2012 Express template installing support
[linux]
Bug #1688: fix a bug that truetype fonts from resource directory can't be found
Bug #1810: fix a bug that SimpleAudioEngine::playEffect() and playBackgroundMusic() play twice on linux
Bug #1819: fix a bug that building script exits when missing packages
Bug #1834: fix the size calculations for true type fonts (especially for italic fonts)
Refactor #1806: refactor linux build system
Refactor #1820: add 'make run' target for linux projects
[mac os]
Bug #1637: fix a bug that CCLabelTTF & CCMenuItemLabel cannot display on Mac Retina
[black berry]
Refactor #1709: add support for multiple background music sources
[chrome native client]
Feature #1762: add Native Client support
cocos2d-2.1beta3-x-2.1.1 @Jan.29 2013
[ all platforms]
Bug #1547: fix a bug that when CCMenuItem is removed before touch ended, application will crash if keeping moving
Bug #1553: fix a memory leak in CCControllButton
Bug #1604: fix a bug that the enum values in ccPVR3TexturePixelFormat are truncated to 32bit
Bug #1605: fix a crash that when adding just one action to CCSequence
Bug #1639: fix a bug that CCBReader miss parsing some properties
Bug #1659: fix a bug that invoking runAnimation() in CCBAnimationManagerDelegate::completedAnimationSequenceNamed will cause crash
Bug #1662: fix a bug that returns wrong full path if texture name in the plist doesn't contain relative path
Bug #1664: fix a logical error in CCAtlasNode::setOpacityModifyRGB
Bug #1670: fix a memory leak in CCBReader
Bug #1674: fix a logical error in CCScale9Sprite constructor
Bug #1680: fix a bug that can't set touch priority by invoking CCMenu::setTouchPriority()
Bug #1681: fix a bug that CCTableView crashes if CCTableViewDelegate is not provided
Feature #1598: add japanese language support
Feature #1625: add stackable action support and exchange the order of parameters for 3d relative actions
Feature #1667: add file name lookup support
Refactor #1593: remove all deprecated methods
Refactor #1599: do some improvements of CCScrollView and CCTableView
Refactor #1602: add randomObject to CCDictionary
Refactor #1603: adjust samples directory structure
Refactor #1606: return CCSequence pointer for CCSequence::create
Refactor #1648: make CCPoint, CCRect and CCSize not inherit from CCObject
Refactor #1649: change return type to const reference for member variable accessing
Refactor #1654: report function and line number for CCAssert
Refactor #1683: refactor CCFileUtils to make it be compatible with the resource searching strategy of cocos2d-iphone
Document #1650: add detailed comments for CCDictionary
Document #1678: add detailed doxygen comments for CCNode
[android]
Bug #1544: fix a bug that CCRenderTexture works wrong after coming back to foreground
Bug #1580: fix a bug that application may lost focus after popping up keyboard
Bug #1607: fix a bug that the path CCUserDefault saves in may cause issue
Bug #1610: fix a bug that CCLabelTTF will lost a character at the end of a line
Bug #1623: fix a bug that SimpleAudioEngine::playBackgroundMusic() may not take effect
Bug #1679: upload unstripped prebuilt libraries for armeabi-v7a architectures
Refactor #1673: add <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.xml
[iOS]
Bug #1600: fix a bug that application created by xCode template will crash after coming to foreground
Bug #1612: fix some compilation errors when using c++11 compiler
Bug #1657: fix a memory leak in CCTextureCache::addImageAsync()
Refactor #1636: refactor CCEditBox
[win32]
Refactor #1627: add VS version check in project file
[marmalade]
Bug #1631: make SimpleGame force landscape
Refactor #1629: add marmalade third party cleanup
Refactor #1630: add TestLua post-build script
Refactor #1632: remove grskia dependency and add in freetype support to the builds.
[linux]
Feature #1611: add Lua support
Refactor #1621: add linux 64bit target for eclipse project
Refactor #1676: refactor makefile and eclipse project configuration
[JavaScript bindings]
Bug #1550: fix some memory leaks in JSBinding
Bug #1614: fix a crash caused by DrawNodeTest
Bug #1622: fix a crash when cc.Node.getChildren is invoked if it has no children
Bug #1641: fix a bug that the coins in WatermelonWithMe don't animate
Bug #1644: fix a crash caused by passing NULL parameter to ccdictionary_to_jsval
Bug #1645: fix a bug that JS Project created by xXode template doesn't work correctly
Bug #1653: handle correctly when parsing int value in JSB
Feature #1620: add sys.localStorage support for JSB
Feature #1642: add tools for generating js-binding codes on windows
Feature #1646: update SpiderMonkey to v18.0
Feature #1660: add js-debugger for js-binding
Feature #1661: add jsb sample game CrystalCraze
Refactor #1530: do some improvements to JS Bindings
Refactor #1633: implement sys.capabilities for JSB
[Lua bindings]
Refactor #1608: add CCNode::scheduleUpdateWithPriorityLua() for LuaBinding
Refactor #1626: add CCDirector::setDisplayStats() for luabinding
cocos2d-2.1beta3-x-2.1.0 @Dec.5 2012
[all platforms]
Bug #1556: set a default texture for CCParticleFire, CCParticleFireworks, etc
Feature #1555: update to cocos2d-iphone v2.1 beta3
Feature #1564: update tests to cocos2d-iphone v2.1beta3
Feature #1572: add sample game WatermelonWithMe
Feature #1573: add sample game CocosDragonJS
Refactor #1545: remove the usage of NODE_FUNC and CREATE_FUNC
Refactor #1565: remove VS2008 support
Refactor #1576: update CCBReader to latest version of CocosBuilder
Refactor #1589: add CCBReader::setCCBRootPath()
[iOS]
Bug #1548: update libcurl header files to 7.26.0 on iOS
[android]
Bug #1551: add error handler when reading image data using libjpeg
Refactor #1558: improve the speed of accessing to files from apk
[marmalade]
Bug #1559: fix a bug that if a file in resource directory doesn't exist, it will not search from root directory
Bug #1571: add box2d rope to marmalade project
Bug #1590: JPEG and File fixes for marmalade
Feature #1557: Marmalade support
Refactor #1574: update marmalade languages
Refactor #1575: update samples/TestCpp to compatible with marmalade
Refactor #1578: create cocos2dx-ext marmalade project
Refactor #1591: add TestLua marmalade project
[JavaScript bindings]
Bug #1577: fix a bug that touch events lost on Win32 when using JSBinding
Bug #1586: fix a crash in WatermelonWithMe
Bug #1588: rescheduleCallback support for JSBinding
Refactor #1570: improve the debugger for JSBinding
[Lua bindings]
Bug #1587: remove Lua script handler in CCCallFunc's destructor
cocos2d-2.0-x-2.0.4 @Nov.2 2012
[all platforms]
Bug #1473: fix a bug that CCScale9Sprite does not support rotated spriteframe in atlas
Bug #1494: fix a bug that missing removing auto-release object from AutoReleasePool if it invokes 'autorelease' method more than one time
Bug #1495: fix a bug that CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world
Bug #1508: fix a bug that potential observer array modification while it's traversed in CCNotificationCenter
Bug #1510: fix a bug that application will freeze when 'numberOfCellsInTableView' returns zero
Bug #1516: fix a bug that the font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions
Bug #1536: CCControl* should not respond to touches if the control is not visible
Bug #1538: fix a logic error in CCControlHuePicker::checkSliderPosition()
Bug #1543: fix a bug that CCLayerGradient background of CocosBuilderTest can't be shown
Feature #1515: add a zoom function for debugging large resolution (e.g.new ipad) app on desktop
Refactor #1312: upgrade libcurl to 7.26.0
Refactor #1486: apply multi-resolution mechanic on iOS, especially for iphone5
Refactor #1520: add comments to describe the usage of multiresolution in HelloCpp
Refactor #1521: use relative coordinates in TestCpp
Document #1532: write a document describes how to debug games for ipad3 on low-resolution PC
Document #1493: add doxygen comments in CCNotificationCenter.h
[android]
Bug #1466: reload shader for test case "ShaderTest" after it comes from background
Bug #1500: fix a bug that CCRenderTexture cannot render properly on some Qualcomm Adreno GPUs
Bug #1507: fix a bug that can not play effect for the first time without pre-load effect
[iOS]
Bug #1527: fix a bug that MoonWarriors can not run on iOS simulator sometimes
Refactor #1491: remove dependency of FontLabel lib
[JavaScript bindings]
Bug #1526: fix a bug that JavaScript binding related samples will crash on iOS devices
Feature #1469: add MoonWarriors as a sample game
Refactor #1487: use shared JavaScript test cases with cocos2d-html5 and cocos2d-iphone
Refactor #1517: upgrade SpiderMonkey to FF 17.0 beta3
[Lua bindings]
Bug #1506: fix a compilation error of TestLua if the path of cocos2d-x contains spaces
[win32]
Bug #1496: fix an error of comparing font's face name in CCImage of win32 port
Bug #1511: fix openGL framebuffer access violation
Bug #1540: fix win32 CCLuaLog memory leaks and invalid console UTF8 output
Feature #1513: add Multi-Touch support for win7/8 tablet or ultrabook
Refactor #1512: change writable directory to "C:\Documents and Settings\username\Local Settings\Application Data\your app name" if the app be built in release mode
cocos2d-2.0-x-2.0.3 @Sep.26 2012
[all platforms]
Bug #1452: change CCRGBAProtocol to public in order for actions like CCTintTo to have an affect on the CCScale9Sprite
Bug #1454: make JavaScript binding work together with Lua binding and c++ codes
Bug #1464: fix a crash caused by CCLabelBMFont
Bug #1478: fix a bug that TMX parser causes tileset images not to be loaded
Bug #1479: fix a bug that CCNotificationCenter does not check whether the object is valid before post notification
Bug #1485: fix potential memory leak in CCNotificationObserver
Feature #1458: add CCTableView
Feature #1460: min/max allowed value for CCControlSlider
Feature #1470: update CCBReader to cocosbuilder v2.1 beta
Feature #1483: synchronize CCControlExtension to newest version
Refactor #1477: abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions
[iOS]
Bug #1482: fix a bug that orientation is wrong on iOS 6 SDK
Bug #1453: fix a bug that CCGL.h includes wrong path of a header file
Bug #1484: fix a minor memory-logic error in EditBoxImplIOS.mm
Feature #1455: add Xcode template for cocos2dx-js
[android]
Refactor #1481: refactor android Java+JNI
[mac os]
Bug #1456: remove code signing from MAC TestCpp project
[linux]
[win32]
Feature #1457: Add vs2012 sln
Feature #1474: popup a warning dialog instead of crash directly when OpenGL version is too old to run 2dx
[js-bindings]
Feature #1451: merge new js-binding codes
Refactor #1476: update location of spidermonkey-android makefile
[lua]
Refactor #1480: Update lua-binding for overloaded functions
[tools]
Feature #1404: add scripts for jenkins-ci
cocos2d-2.0-x-2.0.2 @Aug.30 2012
[all platforms]
Bug #1298: fix a logical error of CCSequence
Bug #1371: fix a particle crashes if setAutoRemoveOnFinish(true)
Bug #1379: fix a typo error of comment in CCNode.cpp
Bug #1381: fix a bug that CCLayerColor::setContentSize() declared differently with CCNode::setContentSize()
Bug #1382: fix a crash of CCBReader caused by null pointer
Bug #1384: fix an error when loading CCControlButton from ccbi
Bug #1385: fix a logic error in BitmapFontMultiLineAlignment
Bug #1386: fix a crash of PauseResumeActionsTest
Bug #1395: fix a bug that CCTextureCache::addImage ignores error in CCTexture2D::initWithImage()
Bug #1400: re-assign texture rect of CCControlSlider to consider SpriteFrame orientation
Bug #1403: fix a bug that do not support png8 format
Bug #1408: fix a bug that CCMenuItemImage is not loaded when the target and selector are empty in CCBReader
Bug #1409: fix a bug that loading CCControlButton from ccbi failed
Bug #1427: fix a bug that CCArray::randomObject() may use index that out of range
Bug #1430: fix a bug that can not compute correct label's width or height when its value is 0
Bug #1440: fix a bug that CCSprite::displayFrame() uses wrong offset to create a sprite frame
Feature #1416: add object-oriented API of CCGeometry
Feature #1405: implement multi-resolution adaption solution
Feature #1424: add a simple wrapper of http access
Feature #1429: add CCEditBox which wraps system edit control
Feature #1439: synchronize to cocos2d-iphone 2.0 stable version
Refactor #1399: adjust directory structure
Refactor #1402: improve static creator function names to avoid confusion
Refactor #1413: improve CCTouch::getLocation(), getDelta() which returns OpenGL coordinates directly
Refactor #1437: change the return type of CCApplication::sharedApplication() and CCGLView::sharedOpenGLView() to a pointer
Refactor #1441: put hd and iPad resources of TestCpp into separate directories
Refactor #1442: use CREATE_FUNC to replace LAYER_CREATE_FUNC and SCENE_CREATE_FUNC
[iOS]
Bug #1389: fix a Xcode 4.5-specific compiling errors that can not convert -1 to unsigned int
Bug #1432: fix a bug that "MutiTouchTest" crashes on IOS if putting more than 5 fingers on the screen
Refactor #1383: change the file path that CCUserDefault saves xml file in
Refactor #1433: remove fpsxxx.png in template
Refactor #1443: Fix some warnings
[android]
Bug #1284: use OpenSL ES to play effects when the device is i9100
Bug #1372: fix a typo error in platform/android/CCEGLView.h
Bug #1377: fix TMX Tile cracks in the Test App
Refactor #1407: cleaner build script
Refactor #1438: make android template use its own source files
[mac os]
Bug #1417: fix a compiling error when building TestCpp for mac port using command line
Feature #1401: add mac port
[win32]
Bug #1390: fix a win32 error says "The application failed to initialize properly"
[linux]
Bug #1445: fix compiling errors on linux
Feature #1419: add linux port
[blackberry]
Feature #1420: add blackberry port
cocos2d-2.0-rc2-x-2.0.1 @Jun.28 2012
[all platforms]
Bug #1257: synchronize CCGrabber.cpp
Bug #1280: fix a bug that BitmapFontMultiLineAlignment test doesn't work correctly
Bug #1286: fix the declaration of tgaLoadRLEImageData()
Bug #1293: fix a bug that CCDirector::getFrames() returns wrong value
Bug #1296: fix a logical error in CCTMXTiledMap::tilesetForLayer()
Bug #1300: fix a typo of CC_ENABLE_CACHE_TEXTTURE_DATA
Bug #1301: apply scissor with points in CCGLView::sharedOpenGLView().setScissorInPoints()
Bug #1302: change the parameter type of CCMenu::setHandlerPriority to signed int
Bug #1308: fix a logical bug in CCTouchDispatcher
Bug #1326: fix a bug that the compilation of HelloLua and testjs project was broken after synchronizing to rc2
Bug #1330: fix bugs of CCBIReader
Bug #1335: fix memory leaks in cocos2dx and CCBReader
Bug #1368: implement a test case(Effect4) in EffectsAdvancedTest
Feature #1202: remove CCFileData
Feature #1310: synchronize to rc2
Feature #1323: support CCBIReader
Feature #1324: add create() for static member functions that new an autorelease object
Feature #1332: add macro COCOS2D_VERSION in cocos2d.h
Feature #1333: support CCScrollView
Feature #1334: add ScrollViewTest to CocosBuilderTest
Refactor #1181: refactor CCRenderTexture
Refactor #1283: use relative path in cocos2d.h
Refactor #1288: enhances CCTransitionScene to work even if there is no running scene
Refactor #1289: update CCControlButton: add zoomOnTouchDown property and setPreferredSize
Refactor #1292: modify some function names to make them more readable
Refactor #1336: use CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces
Refactor #1367: change some function names that start with "createWith" to "create"
[iOS]
Bug #1290: fix a bug that a project generated by template can not find Shaders folder
Bug #1297: fix a bug that the effect is wrong when using projection 2d and enabling retina
Bug #1299: fix a bug that SimpleAudioEngine::resumeEffect and SimpleAudioEngine::resumeAllEffects will play effects that are played previously
Bug #1315: fix wrong effect of TileMapTest when enabling retina
Bug #1338: fix a crash of CocosdenshionTest when playing effect then clicking HOME menu
Bug #1343: fix a bug of Xcode template
Bug #1364: fix a bug that can not resume background music after pausing it
Refactor #1269: generate project for cocos2dx, then HelloWorld, tests, HelloLua and testjs can refer it
[android]
Bug #1239: fix a bug that can not stop effect if play effect with loop mode twice
Bug #1278: fix a bug that CocosDenshion::unloadEffect() can not stop playing effect
Bug #1322: make CCLabelTTF support vertical alignment
Refactor #1287: make android template's build_native.sh automatically copy new icons
Refactor #1329: move all java files part of engine into a certain directory, then all projects refer them
[win32]
Bug #1282: fix a crash that if the display card is ATI
Bug #1344: fix a bug of win32 template
Bug #1365: fix a bug that some files of Resources folder which is copied by build_native.sh will lost authority in cygwin
Bug #1366: fix a crash of tests
[lua]
Bug #1369: fix a crash when invoking CCLabelTTF:setPosition(x,y)
Feature #1327: export 'create' method for Lua bindings
cocos2d-2.0-rc0a-x-2.0 @May.31 2012
[all platforms]
Bug #1094: fix a bug that nothing will be shown when using CCParticleBatchNode
Bug #1115: fix a bug that CCFileUtils::fullPathFromRelativePath() with resolution parameter return error value with empty string
Bug #1137: fix a memory leak in CCLabelBMFont and sync the implementation of CCLabelBMFont to gles20 branch
Bug #1138: fix a memory leak in CCTextureCache::addPVRImage.
Bug #1155: revert CCDirector singleton to original implementation
Bug #1157: fix a bug that nothing is shown in TMX Orthogonal Test
Bug #1158: fix a bug in CCParticleSystemQuad
Bug #1159: update "CallFuncND + auto remove" test demo
Bug #1160: rename 'CGFloat' to 'CCFloat'
Bug #1164: add the render mode which uses VBO without VAO in CCParticleSystemQuad
Bug #1165: merge pull request #842
Bug #1187: fix a bug that spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test
Bug #1189: CCLabelBMFont updateLabel() optimizations and fixes
Bug #1212: fix a bug that TMXBug787Test crash.
Bug #1217: fix a bug that EaseActions reverse broken
Bug #1232: fix a bug that CCLayerGradient::updateColor() assign wrong value to m_pSquareColors
Bug #1244: fix memory leak in CCParticleSystem::initWithDictionary()
Bug #1273: fix a bug that app will crash after clicking closed button in TextureCacheTest
Bug #1275: fix memory leaks in tests project
Bug #1277: implement CCToggleVisibility::copyWithZone()
Feature #1114: integrate CCControlExtension and implement corresponding tests
Feature #1180: synchronize CCConfiguration
Feature #1194: merge texturewatcher contributed by NetGragon
Feature #1205: add ccbreader and test case for CocosBuilder
Feature #1240: support TIFF format picture
Feature #1258: merge Rolando's testjs into gles20 branch
Refactor #1156: synchronize CCDirector
Refactor #1166: improve CCString and CCArray, optimize CCDictionary
Refactor #1176: change linebreak symbol to UNIX format ('\n'), replace 'tab' with four spaces
Refactor #1177: refactor platform
Refactor #1178: use macro NS_CC_BEGIN instead of "namespace cocos2d {", NS_CC_END instead of "}"
Refactor #1188: refactor directory structure
Refactor #1191: update templates for all platforms
Refactor #1198: optimize CCTextureCache::removeUnusedTextures()
Refactor #1203: remove CCFileUtils::setResource(const char* pszZipFileName) and SimpleAudioEngine::setResource
Refactor #1204: refactor AppDelegate::initInstance()
Refactor #1206: remove some unused files, only supports iOS, win32 and android
Refactor #1211: translate Chinese comments to English for CCTextureWatcher and CCListView
Refactor #1246: fix CCDirector using CCLabelBMFont instead of CCLabelTTF
Refactor #1252: add CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device
Refactor #1253: add static method "purgeConfiguration" for CCConfiguration to avoid memory leak
[iOS]
Bug #1109: add parentheses to remove Xcode warnings
Bug #1230: fix a bug that Calculation of string width may be wrong on iOS
Bug #1266: fix a bug that CCTextureCahce::addImageAsync() don't work correctly on iOS
Feature #1095: IOS screen resolution support
[android]
Bug #1139: fix a bug that screen becomes black when backing from background
Bug #1140: fix a bug that ParticleTest crashed
Bug #1141: fix a bug that NodeTest crashed in StressTest1 and StressTest2
Bug #1142: fix a bug that TouchesTest crashed
Bug #1143: fix a bug that MenuTest crashed
Bug #1144: fix a bug that ParallaxTest crashed
Bug #1145: fix a bug that TileMap crashed
Bug #1146: fix a bug that IntervalTest crashed
Bug #1147: fix a bug that ChipmunkAccelTouchTest crashed
Bug #1148: fix a bug that LabelTest crashed
Bug #1149: fix a bug that SpriteTest crashed when go to second test case
Bug #1150: fix a bug that RenderTextureTest crashed at second test case
Bug #1151: fix a bug that Box2DTest crashed
Bug #1152: fix a bug that PerformanceTest crashed at 1, 2, 5 test cases
Bug #1185: fix a bug that when backing to foreground, will lost texture if it uses sprite batch node
Bug #1216: fix JNI memory leaks
Bug #1229: fix a bug that android port can not be compiled on ndk android-8 level
Bug #1236: fix a bug that JniHelper::jstring2string may crash when parameter is null
Bug #1237: fix a bug that line number message printed by CCAssert is wrong
Bug #1279: fix a bug that NodeNonOpaqueTest can't be shown correctly
Feature #1247: add profiler support for android
Feature #1265: build dynamic library of SpiderMonkey for Android, and implement testjs for android
Refactor #1179: popup a message box when invoking CCAssert() on Android
Refactor #1201: simplify the usage of writing Android.mk
[windows]
Bug #1215: fix a bug that Win32 retina cannot work
Bug #1251: add CocosBuilderTest to the test project for VS2008
Bug #1264: fix wrong string alignment when using utf-8 encoded text with CCLabelTTF
Bug #1268: fix a bug that Testjs will crash after clicking the close button on win32
Bug #1270: fix some warning on win32
Feature #1186: add console window for Win32 application, all debug message output to this console window
Feature #1263: build dynamic library of SpiderMonkey for win32, and add testjs project to solution
Refactor #1170: remove win32 template of wophone
[lua]
Refactor #1190: update Lua binding to 2.0
Refactor #1220: using CCString::stringWithContentsOfFile to get string from Lua script files
cocos2d-1.0.1-x-0.12.0 @ Mar.5 2012
[all platforms]
Bug #925: rename HelloWorld/Resource to HelloWorld/Resources
Bug #948: fix a bug that CCMutableArray::getIndexOfObject returns 0 on both "index 0" and "not existing"
Bug #951: remove definition of NSMutableSet
Bug #961: fix mad behaviour in second stage of CCEaseBackInOut
Bug #965: remove some dynamic_cast calling since selector_protocol.h was removed
Bug #967: fix a bug that PVR Textures cannot be reloaded after GL context lost
Bug #986: add init() funciton in CCMenu class
Feature #952: make CCLabelBMFont supports other languages, include Chinese, Korean, Janpanese and so on.
Feature #972: add Support for CCNotificationCenter
Refactor #933: refactor CCUserDefault
Refactor #958: move the implement of SelectorProtocol to CCObject
Document #975: add comment for CCTMXTiledMap::getMapSize and more methods
[iOS]
Bug #946: fix a bug that can not load HD image for both Retina and Normal correctly
Bug #762: fix a bug that CCLabelTTF is in different position (higher) than in previous version on iphone
Refactor #985: remove template for xcode3
[android]
Bug #947: fix a bug that long chinese string causes closed loop on android
Bug #950: fix a crash when touching the screen because of RTTI
Bug #954: fix a bug that accelerometer axes inverted on android tablet when setting orientation to portrait
Bug #957: fix a bug that when running textInputTest, application enters background after input character and click back key on android devices
Bug #959: fix a bug that get wrong multitouch id
Bug #964: fix a bug that can not show whole charactor
Bug #971: fix dynamic_cast error on android
Feature #982: make android template supports box2d, chipmunk and lua
Refactor #970: use modules in the Android NDK build
Bug #1008: fix a bug that missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform
[bada]
Bug #984: use static library for cocos2dx project on bada and qnx platform
[blackberry]
Bug #960: detect when the application goes and return from background in QNX (Black Berry Playbook)
Bug #962: fix some bugs on qnx port
Bug #963: fix a bug that applicationWillEnterForeground will be invoked twice when application is launched
Bug #968: fix a bug about "Out of bound" in CCFileUtils::getWriteablePath() for BlackBerry
Feature #994: add support for bbndk2.0
[marmalade]
Bug #995: modify project configure for marmalade port after adding extension support and refactor resource folder
[win32]
Feature #969: implement Accelerometer Simulation for Win32.
[lua]
Bug #942: fix a crash when invoking CCScheduler:sharedScheduler():scheduleScriptFunc in lua
Bug #953: add tolua++ for Mac
Refactor #973: refactor Lua support
cocos2d-1.0.1-x-0.11.0 @ Jan.13 2012
[blackberry]
Feature #907: support blackberry playbook
[all platforms]
Bug #752: fix a bug that enable and disable touch more times in touch handler callback function may cause memory leak
Bug #911: fix a bug that TextureCache::addUIImage() cannot create texture when key is null
Bug #920: export export functions in CCAffineTransform with CC_DLL
Bug #922: make CCTexture2D::setPVRImagesHavePremultipliedAlpha() to be a static function
Bug #926: fix a crash caused by RTTI when running TouchesTest
Bug #936: fix a bug that touch menu item may crash when selector is null
Feature #892: use RTTI to simplify the codes
Feature #903: add touch index for CCTouch
Refactor #934: add 'isEqual' function for CCString, make CCObject::isEqual to a virtual function
Refactor #940: use new icons and new background pictures with new logo of cocos2d-x
[android]
Bug #923: fix a bug that CCTextureCache::addImageAsync() crashes when a game enters foreground from background
Bug #906: remove unneeded codes in CCImage_android.cpp
Bug #910: fix a bug that create-android-project.bat may erase exist folder with appointed name
Bug #884: fix a crash error caused by CocosDenshion on android simulator
Bug #921: fix a bug that accelerometer axes inverted in Motorola Xoom tablet
Bug #928: fix a bug that 16-bit texture is changed to 32-bit after application enter foreground
Bug #935: fix a bug that terminateProcessJNI() invoke wrong jni function
Bug #937: fix a compiling error on android x86
Bug #941: fix a bug that volume of background music may not in [0, 1.0]
Feature #887: define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk r7
Feature #919: improve build_native.sh and create-android-project.sh
Refactor #924: make loading music resources thread safe
Document #837: Write a document describes how to use jni
Document #914: update document to fit android r5~r7
[iOS]
Bug #917: implement CCFileUtils::getFileDataFromZip()
Feature #893: remove cached data when receiving memory warning on iOS
[bada]
Bug #918: fix a compiling error after renaming airplay to marmalade
Bug #927: fix a crash caused by invoking unloadEffect after invoking stopEffect
Bug #938: fix a bug that glGenFramebuffersOES isn't supported on wave m device
Bug #943: fix a bug that box2d can't be compiled successfully on bada sdk 1.2.1
Refactor #904: Recreate bada 2.0 projects
[win32]
Bug #915: fix a bug that msvc template uses old version of .cpp files
[linux]
Bug #888: fix compiling error with eclipse
Bug #930: fix a crash caused by load jpg format files
[marmalade]
Refactor #908: merge marmalade to latest cocos2d-x source
cocos2d-1.0.1-x-0.10.0 @ Dec.2 2011
[bada]
Feature #223 integrate cocos2d-bada branch to master
Bug #852 fix a bug that CCSpriteBatchNode cannot be drawn correctly
[all platforms]
Feature #854 integrate pthread and write a test case on all platforms
Feature #465 implement CCTextureCache::addImageAsync()
Feature #850 upgrade box2d from 2.1.2 to last 2.2.1
Feature #781 add functions for effects
Feature #760 add methods to get/set CCDirector::m_pNotificationNode
Bug #883 fix the crash of SpriteTest
Refactor #879 use CCAssert() instead of assert()
Document #882 Write a document describes some cautions about using pthread
[android]
Feature #838 support android x86 platform
Bug #758 fix a bug that custom TTF fonts causing low memory
Bug #848 fix a bug that accelerometer values are wrong if the content is scaled
Bug #885 fix a bug that SimpleAudioEngine::setEffectVolume() don't take effect immediately
Document #864 write a describe how to build on sdk 4.0 & ndk-r7
Document #878 write a document describe how to build project for x86 android
Document #881 write a document describes building android ndk project with ndk-r7
[linux]
Bug #780 fix build error on ubuntu 11.0
Bug #776 fix a bug in the audio player
cocos2d-1.0.1-x-0.9.2 @ Oct.20,2011
[linux]
Feature #728 Linux port is born! http://www.cocos2d-x.org/projects/cocos2d-x/wiki/How_to_run_HelloWorld_and_tests_on_linux
[all platforms]
Feature #672 Implements copyWithZone() for CCShow & CCHide
Feature #676 add more languages into CCApplication::getCurrentLanguage()
Feature #678 add private constructor for CCArray
Feature #684 add test case for CCApplication::getCurrentLanguage()
Feature #685 add test case in LabelTest to display Chinese charactors
Bug #675 Fix memory leak in CCLayer when using accelerometer
Bug #686 CCTMXLayer::appendTileForGID() not setting Z index tag causes the first screen of tiles to be re-created
Bug #689 CCRect should assert the width and height is positive
Bug #698 CCSprite::init() is excited twice in all CCSprite's static methods
Bug #700 CC_SWAP32 marco has a typo with leads to error swap result
Bug #701 CCZHeader.version should be unsigned short
Bug #715 CCFadeOut causes a crash when applied to CCMenuItem and m_pSelectedImage is NULL
Bug #718 fix a typo in method CCMenu::alignItemsInRows
Bug #749 CCSpriteTest crashes at the test case SpriteNilTexture
Bug #750 CCTextureCache::textureForKey() can't find textures added by function addUIImage()
Refactor #677 Pass arguments by reference instead of pointer if possible
Refactor #703 Refactor Accelerometer. Because it only sends data to one delegate, so it needs only one setDelegate()
Document #692 Describe the usage of view orientation http://www.cocos2d-x.org/projects/cocos2d-x/wiki/About_device_orientation
[android]
Feature #670 Pause & resume effect playing when activity is paused & resumed
Feature #687 Implement preloadBackgroundMusic to android
Feature #688 Support reading resources not only from apk
Feature #726 use external storage on android
Feature #746 add a helper method to draw filled polygons
Bug #683 getPackagenameJNI() and getCurrentLanguageJNI() mustn't return invalid pointer
Bug #696 Some android devices may crash at CCRenderTexture::end(bool)
Bug #719 CocosDenshionTest crashes when start the test case on android
Bug #714 CCLabelTTF has different visual result between Android & Windows
Bug #727 Memory leak of NewStringUTF
Bug #736 Remove android:installLocation in AndroidManifest.xml
Bug #743 nativeInit is called with wrong screen size when running on device with software android buttons
Bug #744 CCUserDefault crashes in v0.9.1
Bug #755 Multi-touch causes crash on sum sung devices
[ios]
Bug #660 CCLabelBMFont image error in retina display
Bug #693 CCLabelTTF can not break line by '\n' on iOS
Bug #716 subbing & adding volume of sound effects don't change volume little by little on iOS
Bug #738 Passing CCSize(width,0) to CCLabelTTF causes the label invisible
Bug #753 visual orientation is wrong on ios5 simulator
Bug #754 Missing png file for CCLabelAtlas cause crashes on iOS 4.3.3 & 5.0
[win32]
Feature #731 add ability of simulating android back/menu key on win32
Feature #735 add ability of simulating android enter/resume background on win32. Shift+F1=android Back, Shift+F2 =android Menu
Feature #745 export CCTime to all
Bug #747 Win32 templates should put all resources into "Resources" folder
Bug #748 build error in win32 release version
[wophone]
Bug #702 tests crash at the start on wophone devices
[lua]
Feature #704 Print error descriptions ad pop error code in CCLuaScriptModule::executeString & CCLuaScriptModule::executeScriptFile
Feature #707 Support 'require' for Lua on android
Feature #732 Add particle systems to Lua bindings
Feature #733 Use ant to generate a Lua project, refer to http://www.cocos2d-x.org/boards/11/topics/3957
Feature #734 Use ant to generate LuaCocos2d.cpp
cocos2d-1.0.1-x-0.9.1 @ Aug.17,2011
[all platforms]
Feature #347 Support custom TTF fonts
Feature #536 Support PVR Texture
Feature #645 update to cocos2d-iphone v1.0.1
Feature #633 allow SimpleAudioEngine::playEffect repeatly
Feature #630 implement CCRenderTexture::saveBuffer method
Feature #613 Call executeCallFuncN instead of executeCallFunc in CCMenuItem::active()
Feature #620 add Texture2d test case
Feature #638 Add support for per ccz format
Feature #641 users can CCRenderTexture::saveBuffer to any path
Feature #643 swap Accelerometer input x/y according to the orientation
Feature #665 add test case for CCRenderTexture::saveBuffer
Bug #513 CCProgressTimer doesn't work with CCspriteFrameCache
Bug #609 Retain & Release CCObject in CCSet
Bug #628 CCMutableArray::arrayWithObjects should autorelease array object
Bug #629 pass eImgFmt to initWithImageData in initWithImageFile
Bug #636 CCTextureCache::textureForKey() can't find the right texture
Bug #639 m_PositionInPixels isn't correctly initialized
Bug #640 the image read from render texture is upseted
Bug #644 CCSpriteBatchNode::removeAllChildrenWithCleanup() not work as expected
Bug #680 CCtouchDispatcher::rearrangeHandlers() crash
Refactor #623 refactor Cocos2dJni.cpp
Refactor #652 refactor char* JniHelper::jstringtochar()
Document #622 comment CCUserDefault in doxygen format
Document #651 add CCFileUtils to oxygen api document
[lua]
Feature #679 bind Lua to CocosDenshion
Feature #647 add a method to set search path of Lua script
Feature #611 Add some methods in CCMenuItemLabel & CCMenuItemToggle for lua
Feature #612 Export CCNode::getContentSizeInPixels & setContentSizeInPixels to lua
Feature #653 add CCScheduler::unscheduleScriptFunc
Bug #615 CCLOG may crash in LuaEngineImpl
[android]
Feature #610 Remove the support of ndk-r4 crystax.net version
Bug #608 CCRenderTexture cannot show textures after sleep and wake-up
Bug #618 HelloWorld & Tests crash when X is clicked
Bug #619 CCFadeTo may crash on android
Bug #624 CCLabelTTF::setString("\n\n\n") crashes on android
Bug #625 test_image_rgba4444.pvr.gz can not packed into app
Bug #631 TextInputTest crash when input nothing
Bug #637 Create resources folder instead of resource in create-android-project.sh
Bug #648 CCRenderTexture::saveBuffer may crash on some devices like Moto Defy
Bug #655 CCLabelTTF doesn't draw all characters, it may lost the last char
Refactor #656 refactor CCFileUtils, make it support reading data from directory other than assets
[ios]
Feature #642 CCImage_ios.mm should be modified for saving image
Feature #658 xcode3 template should create AppDelegate.cpp/.h instead of ${PROJECT_NAME}AppDelegate.cpp/.h
Feature #661 fix TMXTiledMap for iPhone Retina mode
Bug #667 AppDelegate::applicationDidEnterBackground isn't invoked on iOS
Bug #668 CCLabelBMFont display 4 characters in a square per character block in retina mode
[win32]
Feature #620 change Lua library to static lib
Feature #632 Update visual studio template for Lua support
cocos2d-1.0.0-x-0.9.0 @ Jul.14,2011
[all platforms]
Feature #584 sync with cocos2d-iphone v1.0.0
Feature #601 use Chipmunk v5.3.5
Feature #581 change return types of xxxAction::reverse() to its own type
Bug #522 CCSpriteFrameCache::addSpriteFramesWithFile(const char* pszPlist) crashed if the param have no '/'
Bug #522 CCTextureCache::removeTextureForKey(const char*) cache the image path incorrectly
Bug #573 CCLayerColor does not init its m_tColor, which will result to a random color
Bug #576 some CCMutableDictionary methods must return _KeyT instead of std::string
Bug #577 CCReverseTime may crash
Bug #578 Debian & LavaFlow of ParticleTest have not picture, the effect of ParticleFire is wrong
Bug #580 ShuffleTilesTest of EffectText may crash
[ios]
Bug #546 CCLabelTTF::labelWithString() works incorrectly when height = 0
Bug #604 test.xcodeproject miss Summary & Info in xcode4 since v0.8.5
[android]
Feature #547 deal with line wrap of CCLabelTTF::initWithString(...)
[win32]
Bug #659 ChipmunkTest Sensors crashes in a few seconds
Bug #583 SimpleAudioEngine::playBackgroundMusic(const char*, true) have no sound on win32
Bug #605 export C methods in CCNS.h to dll interfaces
Bug #548 export CCConfiguration to dll interfaces
[marmalade/airplay]
Bug #600 incorrect memory allocation in marmalade port
Refactor #582 use libpng instead of CIwImage in CCImage_airplay.cpp
[wophone]
Bug #545 fix the wrong effect of ChipmunkTest
Bug #606 PageTransitionForward in TransitionsTest has wrong visual effect
cocos2d-0.99.5-x-0.8.5 @ Jun.28,2011
[all platforms]
Feature #577 Lua Support! We export all the cocos2d-x classes & methods to lua!
Please compile and run HelloLua, and read HelloLua/Resource/hello.Lua for more details.
And the Lua new project template/wizard is ready on xcode3, xcode4 and VisualStudio2008 & 2010
Feature #398 Xcode4 templates! Run install-template-xcode.sh to do the magic
Feature #323 Internationalization support! Add CCApplication::getCurrentLanguage() method on all platforms
Feature #529 add static node() method to CCLayerColor & CCLayerGradient
Bug #534 don't raise compile error if ios project includes CCImage.cpp & CCFileUtils.cpp
Bug #429 Effect is wrong when the value of defaultAlphaPixelFormet=kCCTexture2DPixelFormat_A8 in CCTexture2D
Bug #491 Unsafe cycle in CCScheduler::unscheduleAllSelectors
Bug #502 Refactor the singleton mode of CCConfiguration
Bug #512,#525 fix warnings in /Wall flag
Bug #516 Undefined behavious in ccCArray.h (signed / unsigned conversion)
Bug #518 CCScheduler::unscheduleAllSelectors() uses tHashSelectorEntry in wrong way
Bug #521 the effect of PageTurn3D is curious
Bug #523 CCParticleSystemQuad::particleWithFile() can't work correctly
Bug #524 CCFileUtils::dictionaryWithContentsOfFile() can't parse special plist format
Bug #526 glScissior can't work correctly when use autoscale function
Bug #543 EffectTest renders x4 scale when use auto-scale on android/win32/wophone
Bug #544 some test cases of TransitionTest renders x4 scale when use auto-scale on android/win32/wophone
[android]
Bug #490 TextInputTest show words on soft keyboard detach instead of each key pressed
Bug #507 RenderTextureTest failed on some android devices
Bug #532 GLSurface has no response when tap screen frequently for a long time
Bug #542 SimpleAudioEngine::setBackgroundMusicVolume() not work when background music changed
Refactor #535 remove skia dependence when drawing strings, which cause bug #507
[ios]
Feature #540 Add RootViewController into xcode3/xcode4 templates. Games can use ios rotation mechanism
[win32]
Feature #537 Update PVRFrame lib to version 2.8 for ATI graphic card new driver
[wophone]
Bug #539 games on wophone wva devices probably failed on reading resource from zip package
cocos2d-0.99.5-x-0.8.4 @ May.26,2011
[android]
Feature #496 SUPPORT ANDROID 3.0! We test it on both Motorola XOOM & Samsung Galaxy Tab 10.1 (Highlight!!!!!)
Bug #494 typo fixed, Cocos2dxActivity::setPackgeName() to setPackageName()
Bug #495 Memory leak of CCFileUtils::getWriteablePath()
Bug #497 soft keyboard stays shown on some devices while the project includes CCTextFieldTTF
Bug #501 projects creaed by android template have the same package name
Bug #510 Tests progress is killed at the power down phase
[all platforms]
Feature #503 upgrade chipmunk from 5.1 to 5.3.4, keep sync with cocos2d-iphone (Highlight!)
Feature #509 For integrting IME, we had to rotate UI to landscape by default
Bug #499 CCRGBAProtocol isn't inherited and implemented in CCMenuItemSprite
[ios]
Bug #493 the return value of CCFileUtils::getWriteablePath() is not end with '/'
Bug #508 Problem in running Tests in Retina resolution since 0.8.2
[win32]
Bug #492 CCFileUtils::fullPathFromRelativeFile forget to consider the path separated by '\'
Feature #489 Use GetCurrentDirectory instead of GetModuleFileName in CCFileUtils_win32.cpp
cocos2d-0.99.5-x-0.8.3 @ May.12,2011
[all platforms]
Feature #317 wrap input box for game dev, CCTextFieldTTF. (Highlight!)
Feature #455 implement CCUserDefault for data persistence (Highlight!)
Feature #456 integrate libcurl for network access (Highlight!)
Feature #468 implement CCProfiler & CCProfilingTimer
Feature #450 can set default pixel format other than RGBA888
Feature #449 Remove the sources for mac platform. We plan to focus on mobile platforms & reduce the complexity
Refactor #451 Remove the event dispatcher and refactor CCLayer & CCMenu & CCParticleSystemPoint.
Refactor #452 Refactor CCDirector CCGrid CCNode, reduce the complexity
Refactor #472 Refactor duplicated modules under cocos2dx/platform, reduce the complexity
Bug #341 CCTMXFiledMap crashed when a child is not the obj of CCTMXLayer
Bug #371 A layer can't registered as a StandardTouchDelegate when touch event is handling
Bug #428 Function addChild low efficiency
Bug #448 CCCallFuncO crashes
Bug #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time
Bug #471 invoke CCFileUtils::setResourcePath may cause loading texture for ParticleSystem failed
Bug #484 CCTextureAtlas::initWithTexture() may cause memory leak
Bug #486 transition test FlipX, FlipY, FlipAngular, ZoomFlipXxx flickers on ios simulator & device
[ios]
Bug #447 really exit application when "x" button is clicked
Bug #460 cocos2dx + box2d template cannot find libxml2.dylib
[android]
Feature #393 use full version of libxml2, with xmlXPath.. serial methods
Feature #477 Set compilation default ndk version to r5
Bug #374 replace the method for EGL rendering context lost
Bug #453 Android Cocosdenshion can't replace background music
Bug #462 no applicationDidEnterBackground / applicationWillEnterBackground on Android
Bug #470 use GAME_ROOT or other words instead of HELLOWORLD_ROOT in anroid new projects
Bug #475 CCImage::initWithString return true even if the bitmap hasn't been initialized
[win32]
Feature #454 Modify the including path of Box2D genereated by win32 template
Bug #459 the project create by template for vs use the RuntimeLibrary MTd, different with other project
[wophone]
Feature #482 Modify the resource data path for the new WoPhone SDK
Feature #487 Implement the function CCFiltUtils::getWriteablePath() on wophone
Refactor #466 Refactor CCFileUtils for the new packing approach on wophone
Bug #481 After power down & up, backlight will turn off automaticlly if there's no operation
Bug #485 reduce the CPU occupation, modify the approach of FPS control on wophone
[airplay]
Feature #480 add template for airplay
cocos2d-0.99.5-x-0.8.2 @ Apr.7,2011
[all platforms]
390 Feature Implement performance test
411 Feature support .plist format outputed by the last version of Zwoptex
415 Feature Make all xxxFromFile methods can accept relative path
439 Feature all file reading must pass though CCFileUtils::getFileData
441 Feature Initialize pointers in construction & detect them in destruction
427 Refactor refactor CCTMXXMLParser with multi-platform CCSAXParser design
434 Refactor refactor class CCFileUtils
396 Refactor remove ccxScopedPtr & ccxScopedArray, use STL instead
350 Bug TransitionFade flickers
391 Bug CCSpriteFrameCache doesn't support .plist files which format isn't equal to 0
420 Bug CCSprite::spriteWithFile() returns a valid object when the image file isn't present
440 Bug Can't show MessageBox when imageFromFile can't find the image
[ios]
349 Bug deal with plist files in binary format
435 Bug CocosDenshion crashes at foreground/background switching
438 Bug MotionStreak Test crashes on device
[android]
421 Feature Add a template & new project script for android
443 Feature implement CCKeypadDelegate on android
367 Bug Android.mk of HelloWorld and Tests depends on alphabet order
422 Bug the 2nd point in multi-touch isn't located to the correct coordinate
430 Bug replace glColor4ub with glColor4f to avoid "called unimplement OpenGL ES API" on some android devices
431 Bug ParticleFlower on G3 can't show the particles correctly
[win32]
417 Bug No touchEnd when the mouse move out from the window
424 Bug open vs2010.sln says cannot open CCamera.cpp
[airplay]
379 Feature integrate airplay sdk port
442 feature implement CocosDenshion on airplay port
cocos2d-0.99.5-x-0.8.1 @ Mar.21,2011
[all platforms]
400 Bug typo, rename CCamera.cpp to CCCamera
403 Feature rename cocos2d::UIEvent to cocos2d::CCEvent, to avoid class name conflict on ios
405 Bug CCConfiguration::checkForGLExtension(const string&) sometimes may crashes
407 Bug replace "CCGL.h" with "CCGL.h" in CCCamera.cpp, for case-sensitive systems
408 Bug memory leak in CCImage::_initWithPngData
409 Feature rename cocos2d::NSArray to cocos2d::CCArray, to avoid the conflict on ios
418 Feature add copyright of cocos2d-iphone original authors to each file
423 Bug fix compilation warnings when COCOS2D_DEBUG == 2
[ios]
404 Bug HiResTest isnot prerfect on HVGA/Retina yet
410 Bug xcode3 template, cannot find libxml from header searh paths in release build
419 Bug test case TMXIsoVertexZ in TileMapTst has wrong effect on ios
[android]
399 Bug HelloWorld crashes when the screen is touched
405 Bug CocosDenshion test, BGM isn't paused after HOME key tapped
[win32]
395 Bug make AppDelegate.cpp created by VS wizard portable without any modification
401 Bug VisualStudio template for 2010 OutputDir errors
cocos2d-0.99.5-x-0.8.0 @ Mar.15,2011
[all platforms]
316 Feature Resolution auto adjustment, auto scale HVGA resource to WVGA or any other resolutions
336 Refactor refactor platform porting layer
253 Bug xml parser sometimes crashes
375 Feature Rename NS,CG,UI prefix classes/definitions to CC prefix, avoid the crash at ios dev
332 Feature upgrade tests from 0.99.4 to 0.99.5
[ios]
363 Bug CCLabelTTF can't treat line breaks and wrapping correctly.
351 Feature CCLabelTTF cannot automatic line break on iphone
352 Bug ccRemoveHDSuffixFromFile & CCFileUtils::getDoubleResolutionImage isnot work
392 Bug border of sprite debug draw isn't scaled if enableRetinaDisplay(true)
385 Feature implement ccos2d::CCLog
388 Feature update the template for iOS
[android]
247 Feature support multitouch
242 Feature support accelerometer on android
353 Feature support jpg on android
344 Feature add APP_ABI := armeabi armeabi-v7a to improve the performance on some devices
356 Bug CCLabelTTF::initWithString crashed
[wophone]
386 Bug resolve the compile conflict on wophone sdk
383 Bug The approach which handle left soft-key clicked is not work
377 Feature Replace the word "uphone" with "wophone"
357 Bug CCLabelTTF doesn't support words contain line breaks.
348 Bug CCLabelTTF blur if color = white and fontSize < 24
[win32]
373 Feature Disable PVRFrame window when cocos2d running
355 Bug CCLabelTTF doesn't support line breaks and wrapping words
300 Feature wizard for Visual C++ 2008 Express & VS2010 Express/Professional
cocos2d-0.99.5-x-0.7.2 @ Jan.26,2011
[all platforms]
- upgrade engine logic internal & interfaces to 0.99.5
- the list of menu items in tests is showing how to scroll now
- lots of bugs fixed
[iphone]
- add new project templates for Xcode
- add the c++ wrapper for CocosDenshion::SimpleAudioEngine
- support UTF8 charactors in text renderring, such as CCLabelTTF, CCMenuItemFont
[android]
- add CocosDenshion::SimpleAudioEngine implement on android
- the engine can adjust the apk filename automatically
- the engine will not crash at surface recreate, especially at background-to-foreground switching
[wophone]
- switch the game to background, then press power key will not cause the background music play again
- remove the methods of using resouce map in cocos2d-wophone & SimpleAudioEngine.
Only zip resource is recommended and suppported.
- can auto find the installed path of your game, and load zip resource file from the current folder.
No absolute path in code any more. Do this to support installing games to micro-SD card
cocos2d-0.99.4-x-0.7.1 @ Dec.20,2010
[all platforms]
- add CCKeypadDelegate class, which enable CCLayer to respond "back" key in wophone & android
- Add namespace for CocosDenshion
- fix compile errors when enable CC_XXX_DEBUG_DRAW switchs in ccConfig.h
- fix memory leaks on each platform
- more details: http://www.cocos2d-x.org/versions/show/5
[android]
- Run through all the test cases of cocos2d, support ndk r4,r5, sdk higher than 2.0. Tested on HTC G2,G3,G6,G7
- HelloWorld integrate all platforms in one directory now
- WANRNING: this version isn't ready for android games porting yet. The CocosDenshion isn't ported to android,
and this version will crashes when screen orientation changes or the game gack to foreground
look more on this bug http://www.cocos2d-x.org/boards/10/topics/202
[iphone]
- Add support of loading textureImageData from the ParticleDesign plist file
- Fix more then 3000 complie warnings
- You can try to use this version to develop your iOS game now. It's much more stable than the previous version
[wophone]
- Games can easily read resources from zip file now. This will drastically reduce the memory usage
- Add power management: pause the message loop when cocos2d-x game is switched to background or backlight down
- Multi-touch support
[win32]
- SimpleAudioEngine can play background musci with repeating now
cocos2d-0.99.4-x-0.7.0 @ Nov.29,2010
* cocos2d-iphone-cpp port ready! include accelerometer & multi-touch
* refactor the directory structure of HelloWorld & tests
* cocos2d-wophone supports accelerometer
* add cocos2d-x wizard for cocos2d-win32 & cocos2d-wophone for VisualStudio2008
* jump out a message box when load texture failed (win32 & wophone)
* more details: http://www.cocos2d-x.org/versions/show/4
cocos2d-0.99.4-wophone-win32-stable-rc1
http://www.cocos2d-x.org/versions/show/1
http://www.cocos2d-x.org/versions/show/2
http://www.cocos2d-x.org/versions/show/3