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

2811 Commits

Author SHA1 Message Date
Ricardo Quesada afb4077de5 Remove Sprites works as expected 2014-01-16 12:22:11 -08:00
Dhilan007 a765e5e7e1 closed #3628:Integrate LabelAtlas with new Label 2014-01-16 16:37:29 +08:00
James Chen 21dc91bf78 Merge pull request #5082 from Dhilan007/develop_label 
closed #3726:Fix crash when using unknown character.
 2014-01-16 00:10:53 -08:00
James Chen d000d9739d Merge pull request #5084 from andyque/develop 
closed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
 2014-01-15 23:33:45 -08:00
Dhilan007 547ab3ef0a update subtitle. 2014-01-16 15:07:20 +08:00
andyque 4a6e137389 fixed #3683. fixed convertToWorldSpaceAR of CCSkin returning error coordinate 2014-01-16 15:00:35 +08:00
Dhilan007 18bd978480 1.add label crash test 
2.fix lose char when label have unknown character.
 2014-01-16 14:37:07 +08:00
Huabing.Xu 21d586d4ca Merge branch 'develop' into develop_renderer_tileMapTest 
* develop: (24 commits)
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  More renderer optimizations
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG [ci skip]
  Sprite: removed _hasChildren
  Compilation fix: Updates cocos_files.json and removes unused  in template.
  use data.isNull() instead of !data.getBytes()
  Update VS project file.
  Updates CHANGELOG
  SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
  Updates Xcode, Android and Linux project
  fixes #3720
  Renderer performance fixes
  Console::log(format, va_args) is private
  fix compiling error
  Relieve inherit from LabelProtocol
  closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
  add check data valid in getStringFromFile
  ...
 2014-01-16 12:47:32 +08:00
zhangbin e7b584908e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs 2014-01-16 11:58:49 +08:00
James Chen 2e7516c582 Merge pull request #5041 from Dhilan007/develop_label 
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF  to reduce parameters and make this interface more easily to use.
 2014-01-15 18:37:40 -08:00
Ricardo Quesada 4278f024b8 Console::log(format, va_args) is private 
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
 2014-01-15 11:17:21 -08:00
zhangbin 536eaca24d closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects. 2014-01-15 17:27:53 +08:00
Dhilan007 629f111f7d Relieve inherit from LabelProtocol 2014-01-15 17:21:08 +08:00
boyu0 a5c26b7da9 issue #3401: add physics action and pump test for lua. 2014-01-15 13:52:24 +08:00
Huabing.Xu 25998f0237 closed #3640: change windows project files 2014-01-15 11:44:08 +08:00
Huabing.Xu 19705fcf37 issue #3640: add performance test->renderer LargeTileMap test 2014-01-15 11:27:57 +08:00
Ricardo Quesada 2efeb32352 Merge pull request #5063 from ricardoquesada/performance_test_fixes 
Performance Test fixes
 2014-01-14 17:24:49 -08:00
Ricardo Quesada c267c479db Performance Test fixes 
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
 2014-01-14 17:22:45 -08:00
Nite Luo fd04e17808 add a new line 2014-01-14 17:11:32 -08:00
Nite Luo edc7547f70 add test instructions 2014-01-14 17:06:22 -08:00
Nite Luo 5f661babd2 Add VBO full test 2014-01-14 17:03:54 -08:00
boyu0 de30a9cfea issue #3401: add lua physics slide test, add more banding code, and fix some bugs. 2014-01-14 15:48:44 +08:00
Ricardo Quesada 6eed3a2b27 Adds missing copyright headers in some files 2014-01-13 14:48:12 -08:00
Ricardo Quesada f2c3d2f3ae Camera and Node fixes 
OrbitCamera: added getters (public). Setters moved from `protected` to `public
	: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
 	: Setters receives `kmVec3` as well. Old API is still supported

Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
	Instead, once the additional transform is set, in order to remove it the user needs to pass
	the identity matrix
 2014-01-13 12:52:07 -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 95568648c9 Console Enabled by default on TestCpp 2014-01-10 20:32:39 -08:00
Ricardo Quesada 2a6b9fe08e Console is a property of Director. 
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
 2014-01-10 17:11:14 -08:00
James Chen 0088399d94 Merge pull request #5016 from akof1314/develop 
Support MinGW with CMake for TestCpp
 2014-01-09 23:13:19 -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
WuHuan f87af9e998 fix linux build 2014-01-09 19:49:11 +08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop 
update
 2014-01-09 02:56:21 -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
WuHuan 4dbb0ee1e8 mingw console 2014-01-09 17:48:37 +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
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
James Chen 5a31680211 Merge pull request #4977 from dumganhar/jsb-armature-fix 
Jsb armature fix
 2014-01-07 05:18:45 -08:00
James Chen 7a52d2aad7 Small fix in ArmatureScene.cpp/.h 2014-01-07 20:54:34 +08:00
samuele3hu bebdfd8e55 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 20:40:17 +08:00
samuele3hu de5c86a184 Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function 2014-01-07 20:39:46 +08:00
James Chen a6da007e4f Updates JS-Test submodule. 2014-01-07 18:01:22 +08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
James Chen f5ae2bbacc Merge pull request #4932 from boyu0/iss3401_physical_lua_binding 
issue #3401: physical lua binding
 2014-01-06 23:48:47 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
James Chen 2eb8691f6a Merge pull request #4946 from dumganhar/linux-template-fix 
Linux template update
 2014-01-06 20:57:28 -08:00
James Chen 23012352ce Deletes unused Makefile for linux. 2014-01-06 19:36:13 -08:00
James Chen e52d8e562b Merge pull request #4942 from Dhilan007/develop_submodule 
Updates JS-Tests submodule.
 2014-01-06 19:03:49 -08:00
Dhilan007 f897407470 Updates JS-Tests submodule. 2014-01-07 10:55:42 +08:00
boyu0 cf146b32cf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2014-01-07 10:16:44 +08:00
CaiWenzhi 8cfc6fcafb Remove useless samples 2014-01-07 09:47:46 +08:00
boyu0 eaa3041a97 issue #3401: physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
Dhilan007 4087afaf4e fix compiling error on vs project. 2014-01-06 19:55:29 +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 7ae83848a9 Updates JS-Tests submodule. 2014-01-06 13:55:20 +08:00
James Chen f9f369258b Renames resource folder name from 'loadXXX' to 'LoadXXX' 2014-01-06 13:47:11 +08:00
samuele3hu d5d213aa0a Fix:Update the file spelling 2014-01-06 11:19:40 +08:00
samuele3hu 130fa33a50 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-06 11:13:26 +08:00
samuele3hu 7e279219ff Fix:Resolve the error that CocoStudioSceneTest load resource in android 2014-01-06 11:12:44 +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
James Chen bf19541330 Updates JS-test submodule after merging. 2014-01-06 10:45:14 +08:00
James Chen 26e10ff662 [develop] Updates JS-test submodule 2014-01-06 10:38:04 +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
chengstory 125c52a10c Merge branch 'develop' into #3582 2014-01-05 11:11:25 +08:00
James Chen 4699eb5751 Updates JS-Test submodule . 2014-01-05 10:10:51 +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
samuele3hu 465aba951c Fix:Remove the ScollView and TableView of extension gui lua binding 2014-01-04 18:36:33 +08:00
samuele3hu 70ee13e2e1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-04 15:46:27 +08:00
samuele3hu 0550ec33ad Fix:Resolve the bugs that some lua test cases can’t run 2014-01-04 15:46:04 +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 5c77f7d035 Refactors search path setting for TestJavascript. 2014-01-04 14:24:25 +08:00
James Chen ef5ab1b9be sharedXXX -> getInstance, purgeXXX -> destroyInstance. 2014-01-04 14:23:40 +08:00
James Chen 98346474b8 Merge pull request #4863 from Dhilan007/develop_crash 
fix compiling error and miss file on vs.
 2014-01-03 20:41:19 -08:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +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
James Chen 32546b58f9 Merge pull request #4840 from nutty898/develop_nutty_modify_framework_addNode 
Develop nutty modify framework add node
 2014-01-03 18:53:51 -08:00
James Chen baeacaddfc closed #3579: Bug fix in setTouchEnabledForLayer for luabindings. 
Also fixed lua module error.
 2014-01-04 10:30:11 +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
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 2014-01-03 19:36:22 +08:00
chengstory 46c7338008 fixed #3480 
1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
 2014-01-03 19:30:47 +08:00
minggo b0c23eacf5 Don't release autoreased object. 2014-01-03 18:28:43 +08:00
minggo 1d04b42947 Put "initxx" functions into protected. 2014-01-03 18:15:56 +08:00
minggo 7c0d4240ae Don't release an autoreleased object 2014-01-03 18:12:58 +08:00
minggo d52e980538 don't release an object return by Object::create() 2014-01-03 16:53:04 +08:00
James Chen c5ec24195a Merge pull request #4821 from nutty898/develop_nutty_modify_framework_optimizewidgets 
optimize button
 2014-01-03 00:35:48 -08:00
James Chen b4da0e71fd Merge pull request #4828 from Dhilan007/develop_crash 
fix compiling error in TransitionTest on vs.
 2014-01-03 00:30:07 -08:00
James Chen 5346677a47 Merge pull request #4825 from samuele3hu/developNewUI 
Update the lua test cases about the armature
 2014-01-03 00:29:24 -08:00
Dhilan007 2f84abd19c fix compiling error in TransitionTest on vs. 2014-01-03 16:13:13 +08:00
CaiWenzhi a32976802a Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets 2014-01-03 15:50:35 +08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
CaiWenzhi e734f3ccaf optimize button 2014-01-03 12:14:21 +08:00
samuele3hu bfc7441453 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:51:05 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
James Chen 04760f2508 [Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module. 2014-01-03 10:30:55 +08:00
Ricardo Quesada d76e8e57bb NodeTest converted to lambda functions 
Uses Lambda functions to call the subtests
Easier to add new tests
 2014-01-02 15:51:26 -08:00
Ricardo Quesada f023ada6f6 Improves transitions test 
Unifies functions with trantions name
 2014-01-02 14:25:28 -08:00
chengstory ee2d9e9c74 fixed #3480 remove unused ret. 2014-01-03 02:49:11 +08:00
chengstory e08e4ce0f8 fixed #3480 add search paths. 2014-01-03 02:21:36 +08:00
chengstory 77dca5958f issue #3480 upload Samples resources. 2014-01-03 02:03:05 +08:00
chengstory 5903a74bd2 issue #3480 
1.  add getNode  and  setNode class function to Component.
            2.  fixes some build error.
 2014-01-03 01:42:14 +08:00
chengstory 6892d8cf6a issue #3480 
1.  add SceneReader Tests.
                  2.  Modify class member name.
 2014-01-03 01:14:12 +08:00
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config 
don't build spine module when build 2d module
 2014-01-02 06:53:15 -08:00
minggo 22195a44d0 include spine dependence in testjavascript 2014-01-02 22:06:18 +08:00
minggo 054972fd3b Merge pull request #4796 from minggo/deprecated-function 
use std::function for call back
 2014-01-02 03:29:17 -08:00
minggo ded3e753f3 use std::function for call back 2014-01-02 17:23:00 +08:00
minggo f2b1a3cc83 Merge pull request #4793 from minggo/namespace 
network -> cocos2d::network
 2014-01-02 00:38:50 -08:00
James Chen c29e328490 Merge pull request #4779 from samuele3hu/DispatcherBak1 
Develop branch adds lua trigger for CocoStudio
 2014-01-02 00:29:30 -08:00
minggo 07600bd46b network -> cocos2d::network 2014-01-02 16:25:35 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
James Chen 1480dd99d6 Merge pull request #4777 from 2youyouo2/develop 
update armature, change interface from "by" to "with"
 2014-01-01 22:47:18 -08:00
samuele3hu cc2e6aef63 Add missis “ccs.” prefix 2014-01-02 14:25:15 +08:00
James Chen e2887a2b64 Updates JS-Test submodule reference. 2014-01-02 14:22:22 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
James Chen 71d21d2e10 Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename 2013-12-31 19:13:59 +08:00
James Chen f793ff01b2 Updates JS-test submodule. 2013-12-31 18:15:47 +08:00