Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,356 Commits 2 Branches 35 Tags 1.1 GiB
Commit Graph

1472 Commits

Author SHA1 Message Date
Dhilan007 629f111f7d Relieve inherit from LabelProtocol 2014-01-15 17:21:08 +08:00
Dhilan007 69c004108b issue#3630:Adjust some method for more easily create and change type. 2014-01-11 22:33:07 +08:00
Ricardo Quesada 95b7196a2a Adds more tests cases for Node 
Adds more tests cases for Node
 2014-01-09 14:26:36 -08:00
Ricardo Quesada d13612ef32 Improves description in camera test 2014-01-09 11:38:44 -08:00
Ricardo Quesada e8ea39127a Merge pull request #5021 from ricardoquesada/node_test 
Adds a new test that shows the problem with the Camera
 2014-01-09 09:32:37 -08:00
minggo dfcd0872ed Merge pull request #5006 from dabingnn/develop_layerColorDepthTestOccludeBugcase 
Add Test Case: LayerColor should not occlude sprites and labels when dep...
 2014-01-09 01:59:16 -08:00
James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode 
Conflicts:
	cocos/2d/CCDrawNode.h
 2014-01-09 17:03:08 +08:00
Huabing.Xu 1b339a4635 Add Test Case: LayerColor should not occlude sprites and labels when depth test is true 2014-01-09 14:50:29 +08:00
Dhilan007 3a235f1ffc amendment incorrect use of macro 2014-01-09 09:50:02 +08:00
Ricardo Quesada dccd1b40de Adds a new test that shows the problem with the Camera 
Apprently the bug is in  QuadCommand, since if we use CustomCommand
the camera works OK.
 2014-01-08 16:28:18 -08:00
James Chen 7a52d2aad7 Small fix in ArmatureScene.cpp/.h 2014-01-07 20:54:34 +08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
James Chen 23012352ce Deletes unused Makefile for linux. 2014-01-06 19:36:13 -08:00
CaiWenzhi 8cfc6fcafb Remove useless samples 2014-01-07 09:47:46 +08:00
Dhilan007 4806ef5c6f change time of initialization 2014-01-06 18:26:14 +08:00
Dhilan007 8e3eb8580f fix crash in NewEventDispatcherTest.cpp on vs 2014-01-06 18:00:52 +08:00
Dhilan007 5786c8aa41 fix crash in TouchesTest.cpp on vs 2014-01-06 17:31:49 +08:00
minggo cd6b000016 Merge pull request #4920 from minggo/develop 
don't rlease autoreleased object
 2014-01-06 01:21:13 -08:00
minggo 4033ecea77 don't rlease autoreleased object 2014-01-06 17:20:42 +08:00
James Chen e705dfe471 Merge pull request #4917 from chengstory/AddTriggerCode 
Add Trigger code to sceneTest on cocos2dx 3.x.
 2014-01-06 01:16:46 -08:00
minggo 7b55c3da1e don't release autoreleased objec 2014-01-06 17:03:24 +08:00
minggo 63ad431349 don't assign last element with (null, null) 2014-01-06 16:41:42 +08:00
zhangcheng 573737df40 Add Trigger code to sceneTest on cocos2dx 3.x. 2014-01-06 16:32:39 +08:00
minggo 94e0b03d47 don't release autoreleased object 2014-01-06 16:28:15 +08:00
James Chen c40cedc804 Don't test Map<K,V>::bucketCount since it's platform dependence. 2014-01-06 16:09:01 +08:00
James Chen d9e79b4ec5 Merge pull request #4915 from Dhilan007/develop_crash 
fix crash in UnitTest.cpp on vs.
 2014-01-05 23:27:08 -08:00
Dhilan007 4261a441de fix crash in UnitTest.cpp on vs. 2014-01-06 15:19:47 +08:00
James Chen 22fa5319a9 Wrong search path fix for CocoStudioTest/SceneTest 2014-01-06 14:49:32 +08:00
James Chen f9f369258b Renames resource folder name from 'loadXXX' to 'LoadXXX' 2014-01-06 13:47:11 +08:00
James Chen d74d21a6f0 Merge pull request #4884 from daltomi/debug 
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
 2014-01-05 19:08:37 -08:00
Huabing.Xu a274d35025 remove node reuse in renderTextureSave 2014-01-06 09:49:04 +08:00
Dhilan007 8abc54bbac add miss file for vs project. 2014-01-05 18:12:11 +08:00
chengstory 4893c561db Merge branch 'develop' into #3582 2014-01-05 12:43:41 +08:00
James Chen 03200374b0 Merge pull request #4887 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-04 20:10:40 -08:00
Dhilan007 49d8b76b9e fix crash related to not support the z length modifier for size_t on vs 2014-01-05 11:59:32 +08:00
Daniel T. Borelli 8ffb05b6c9 Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness 2014-01-04 19:26:16 -03:00
chengstory bac600ab9f fixed #3582 
1.  create Component By  component Factory.
 2014-01-05 02:22:32 +08:00
James Chen 4c3fa3da49 Merge pull request #4865 from dumganhar/testjs-bugfix 
Some fixes for TestJavascript
 2014-01-03 23:34:08 -08:00
James Chen ef5ab1b9be sharedXXX -> getInstance, purgeXXX -> destroyInstance. 2014-01-04 14:23:40 +08:00
James Chen e65c6b8e53 Merge pull request #4841 from dumganhar/template-container-unit-test 
Template container unit test
 2014-01-03 20:01:25 -08:00
James Chen 55e45d44c4 Merge pull request #4810 from chengstory/#3480 
Update SceneReaderTest Samples
 2014-01-03 19:49:28 -08:00
James Chen 29e2bb89b1 issue #3577: Captures ‘this’ to make old gcc on linux happy. 2014-01-04 11:44:29 +08:00
James Chen cf8fa8e5fa issue #3577: Adds ValueTest. 2014-01-04 11:41:06 +08:00
James Chen a48f561ac5 issue #3577: Adds UnitTest to controller.cpp. 2014-01-04 11:41:06 +08:00
James Chen 15029e0173 issue #3577: Includes `UnitTest.h` in tests.h. 2014-01-04 11:41:05 +08:00
James Chen 4980214d0f issue #3677: Updates Makefile. 2014-01-04 11:41:05 +08:00
James Chen 0915d4b00e issue #3577: Removes unused spaces. 2014-01-04 11:41:05 +08:00
James Chen f76a1f0527 issue #3577: Adds UnitTest.cpp/.h. 2014-01-04 11:41:05 +08:00
chengstory a6b70bef83 fixed #3480 loadSceneEdtiorFileTest -> LoadSceneEdtiorFileTest 2014-01-03 20:33:07 +08:00
CaiWenzhi 785e1740e4 Add "addNode" methods 2014-01-03 20:29:16 +08:00