Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d
History
Ricardo Quesada 69d2ac1786 fix: collection of vr fixes (#15947) 
* fix: collection of vr fixes

Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input

fix: setNodeToParentTransform() and setAdditionalTransfrom() work...

...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.

fix: compile in windows

* doc: documentation for this fix
 		2016-06-24 10:03:38 +08:00
..
libcocos2d_8_1 Merge pull request #15853 from ricardoquesada/vr_squashed 2016-06-17 10:15:20 +08:00
libcocos2d_win10 Merge pull request #15853 from ricardoquesada/vr_squashed 2016-06-17 10:15:20 +08:00
win10_props added missing _USRJSSTATIC preprocessor define (#15438) 2016-04-18 15:10:35 +08:00
winrt_8.1_props added missing _USRJSSTATIC preprocessor define (#15438) 2016-04-18 15:10:35 +08:00
wp_8.1_props
…
CCAction.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCAction.h Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
CCActionCamera.cpp Fix compile error isnan -> std::isnan #15111 2016-04-27 13:15:08 +02:00
CCActionCamera.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionCatmullRom.cpp Fix unused parameter warning 2016-06-02 15:30:24 +09:00
CCActionCatmullRom.h Use const references whenever possible 2016-05-17 13:17:56 +09:00
CCActionEase.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionEase.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionGrid.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionGrid.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionGrid3D.cpp Use const references whenever possible 2016-05-17 13:17:56 +09:00
CCActionGrid3D.h Use const references whenever possible 2016-05-17 13:17:56 +09:00
CCActionInstant.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionInstant.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionInterval.cpp #9367 blend mode does not work with animated sprite 2016-05-26 09:39:48 +09:00
CCActionInterval.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionManager.cpp Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
CCActionManager.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionPageTurn3D.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionPageTurn3D.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionProgressTimer.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionProgressTimer.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionTiledGrid.cpp Remove incorrect unary operator to fix warnings 2016-04-21 14:39:42 +09:00
CCActionTiledGrid.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionTween.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCActionTween.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCAnimation.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCAnimation.h Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
CCAnimationCache.cpp Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCAnimationCache.h Refine 'CCActionXXXX' (#15319) 2016-04-08 13:40:36 +08:00
CCAtlasNode.cpp Remove duplicate header includes 2016-05-26 23:25:44 +09:00
CCAtlasNode.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCAutoPolygon.cpp Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
CCAutoPolygon.h fix: make PolygonCode cleaner 2016-05-24 20:57:40 -03:00
CCCamera.cpp Squashed commit of the following: 2016-06-15 11:33:25 -07:00
CCCamera.h Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
CCCameraBackgroundBrush.cpp Bug fix & make test case more clear. 2015-12-07 18:36:28 +08:00
CCCameraBackgroundBrush.h Merge pull request #14502 from xiaofeng11/v3_combine_2d 2015-12-04 16:05:24 +08:00
CCClippingNode.cpp Fixed ClippingNode not cleaning up _stencil correctly (#15814) 2016-06-15 14:55:29 +08:00
CCClippingNode.h refactor stencil state management code 2015-11-25 14:14:17 +08:00
CCClippingRectangleNode.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCClippingRectangleNode.h Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
CCComponent.cpp Refine components to improve performance 2015-09-18 14:34:02 +08:00
CCComponent.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCComponentContainer.cpp no message 2015-11-27 23:33:20 +10:00
CCComponentContainer.h Fix inconsistent header include guards 2015-12-12 21:05:22 +09:00
CCDrawNode.cpp Merge pull request #14005 from wighawag/draw_node_shader_fix 2016-04-22 10:49:41 +08:00
CCDrawNode.h Fix indent 2015-12-04 15:14:47 +08:00
CCDrawingPrimitives.cpp fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCDrawingPrimitives.h Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
CCFastTMXLayer.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCFastTMXLayer.h Use const references whenever possible 2016-05-17 13:17:56 +09:00
CCFastTMXTiledMap.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCFastTMXTiledMap.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCFont.cpp Improve coding style 2015-07-30 11:33:18 +08:00
CCFont.h Improve coding style 2015-07-30 11:33:18 +08:00
CCFontAtlas.cpp Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
CCFontAtlas.h Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
CCFontAtlasCache.cpp refine 2016-03-25 21:21:09 +08:00
CCFontAtlasCache.h Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
CCFontCharMap.cpp Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
CCFontCharMap.h Improve coding style 2015-07-30 11:33:18 +08:00
CCFontFNT.cpp Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
CCFontFNT.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCFontFreeType.cpp Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
CCFontFreeType.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCGLBufferedNode.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCGLBufferedNode.h
…
CCGrabber.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCGrabber.h Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
CCGrid.cpp Merge pull request #12744 from fusijie/fix_pageturndown 2015-07-28 11:35:15 +08:00
CCGrid.h fix typos 2015-09-09 11:37:41 +08:00
CCLabel.cpp fix: underline will have the same solor as text in TTF 2016-06-17 17:23:59 -07:00
CCLabel.h fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
CCLabelAtlas.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCLabelAtlas.h Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCLabelBMFont.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCLabelBMFont.h
…
CCLabelTTF.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCLabelTTF.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCLabelTextFormatter.cpp fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
CCLabelTextFormatter.h Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
CCLayer.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCLayer.h fix typos 2015-09-09 11:37:41 +08:00
CCLight.cpp
…
CCLight.h
…
CCMenu.cpp fix: little menu fixes 2016-06-21 16:46:27 -07:00
CCMenu.h fixed documentation for better reading clarity 2016-01-27 11:42:25 +10:00
CCMenuItem.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCMenuItem.h fix jsb API inconsistency. 2016-03-18 16:18:40 +08:00
CCMotionStreak.cpp Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
CCMotionStreak.h Fix comment. 2015-04-13 19:24:19 +03:00
CCNode.cpp fix: collection of vr fixes (#15947) 2016-06-24 10:03:38 +08:00
CCNode.h fix: collection of vr fixes (#15947) 2016-06-24 10:03:38 +08:00
CCNodeGrid.cpp Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
CCNodeGrid.h Completed test case and comment. 2015-07-08 22:34:33 +08:00
CCParallaxNode.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParallaxNode.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
CCParticleBatchNode.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCParticleBatchNode.h
…
CCParticleExamples.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCParticleExamples.h
…
CCParticleSystem.cpp Added Particle Emitter Pause option, and tests (#15836) 2016-06-15 18:31:10 +08:00
CCParticleSystem.h Added Particle Emitter Pause option, and tests (#15836) 2016-06-15 18:31:10 +08:00
CCParticleSystemQuad.cpp Added Particle Emitter Pause option, and tests (#15836) 2016-06-15 18:31:10 +08:00
CCParticleSystemQuad.h Added Particle Emitter Pause option, and tests (#15836) 2016-06-15 18:31:10 +08:00
CCProgressTimer.cpp Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
CCProgressTimer.h Fix typos in documentation 2016-02-18 16:16:36 +09:00
CCProtectedNode.cpp Fixes 1605 include path in 541 files 2016-03-20 21:53:44 +08:00
CCProtectedNode.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCRenderTexture.cpp RenderTexture - set opacity modify RGB 2016-06-13 23:07:17 +03:00
CCRenderTexture.h lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
CCScene.cpp fix: collection of vr fixes (#15947) 2016-06-24 10:03:38 +08:00
CCScene.h Squashed commit of the following: 2016-06-15 11:33:25 -07:00
CCSprite.cpp Squashed commit of the following: 2016-06-15 11:33:25 -07:00
CCSprite.h Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
CCSpriteBatchNode.cpp fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode 2016-06-20 19:13:53 -07:00
CCSpriteBatchNode.h Fix typos in documentation 2015-12-03 21:03:00 +09:00
CCSpriteFrame.cpp fix: make PolygonCode cleaner 2016-05-24 20:57:40 -03:00
CCSpriteFrame.h fix: make PolygonCode cleaner 2016-05-24 20:57:40 -03:00
CCSpriteFrameCache.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCSpriteFrameCache.h SpriteFrameCache: take pixelFormat into account if specified 2016-02-11 15:47:23 +03:00
CCTMXLayer.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCTMXLayer.h Use const references whenever possible 2016-05-17 13:17:56 +09:00
CCTMXObjectGroup.cpp Optimize Vec2 2015-04-19 20:40:52 +03:00
CCTMXObjectGroup.h
…
CCTMXTiledMap.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCTMXTiledMap.h Add missing reference-return types 2016-02-18 05:10:42 +09:00
CCTMXXMLParser.cpp csv support working test 2016-04-23 17:31:10 -06:00
CCTMXXMLParser.h csv support working test 2016-04-23 17:31:10 -06:00
CCTextFieldTTF.cpp Fix password style text in UTF-16 (#15620) 2016-05-23 09:48:15 +08:00
CCTextFieldTTF.h improve textfield code 2016-04-01 09:31:18 +08:00
CCTileMapAtlas.cpp Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 2016-06-15 15:01:26 +08:00
CCTileMapAtlas.h
…
CCTransition.cpp Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
CCTransition.h
…
CCTransitionPageTurn.cpp
…
CCTransitionPageTurn.h
…
CCTransitionProgress.cpp
…
CCTransitionProgress.h
…
CCTweenFunction.cpp
…
CCTweenFunction.h
…
CMakeLists.txt Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
cocos2d.def
…
cocos2d_headers.props Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
cocos2dx.props updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
libcocos2d.vcxproj fix: remove liboculus 2016-06-15 17:53:01 -07:00
libcocos2d.vcxproj.filters Squashed commit of the following: 2016-06-15 11:33:25 -07:00