Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp/TestCpp/Classes
History
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 		2013-11-15 09:44:29 +08:00
..
AccelerometerTest issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
ActionManagerTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
ActionsEaseTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
ActionsProgressTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
ActionsTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
Box2DTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
Box2DTestBed EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
BugsTest issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
ChipmunkTest Merge pull request #4160 from dabingnn/iss3025_TextureCache 2013-11-10 23:08:01 -08:00
ClickAndMoveTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
ClippingNodeTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
CocosDenshionTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
ConfigurationTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
CurlTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
CurrentLanguageTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
DataVisitorTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
DrawPrimitivesTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
EffectsAdvancedTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
EffectsTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
ExtensionsTest fixed #3185 support for html5. 2013-11-14 17:03:45 +08:00
FileUtilsTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
FontTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
InputTest Merge folder changes from develop 2013-10-30 23:19:36 -07:00
IntervalTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
KeyboardTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
KeypadTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
LabelTest issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
LayerTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
MenuTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
MotionStreakTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
MutiTouchTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
NewEventDispatcherTest closed #3106: Update NewEventDispatcherTest.cpp. 2013-11-02 22:05:04 +08:00
NodeTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
ParallaxTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
ParticleTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
PerformanceTest issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
PhysicsTest issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
RenderTextureTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
RotateWorldTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
SceneTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
SchedulerTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
ShaderTest issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
SpineTest issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
SpriteTest Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
TextInputTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
Texture2dTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
TextureCacheTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
TexturePackerEncryptionTest replaces `delete[]` with `free()` in C-based API 2013-11-11 18:09:47 -08:00
TileMapTest EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
TouchesTest issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder 2013-11-07 21:48:39 +08:00
TransitionsTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
UserDefaultTest closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
ZwoptexTest Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
AppDelegate.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
AppDelegate.h issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00
BaseTest.cpp closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
BaseTest.h Removes Hungarian notation 2013-07-25 15:53:24 -07:00
VisibleRect.cpp fix line end in windows 2013-09-20 22:23:13 +08:00
VisibleRect.h fix line end in windows 2013-09-20 22:23:13 +08:00
controller.cpp Adds more strings 2013-11-07 12:42:16 -08:00
controller.h Implement MouseWheel Event, also fix a typo in EventListener interface 2013-10-04 10:07:39 -07:00
testBasic.cpp issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
testBasic.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 2013-09-17 23:24:14 +08:00
testResource.h More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
tests.h Mouse working on mac 2013-10-11 14:35:38 -07:00