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

1541 Commits

Author SHA1 Message Date
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
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
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 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
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
Dhilan007 2f84abd19c fix compiling error in TransitionTest on vs. 2014-01-03 16:13:13 +08:00
CaiWenzhi e734f3ccaf optimize button 2014-01-03 12:14:21 +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
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
minggo 07600bd46b network -> cocos2d::network 2014-01-02 16:25:35 +08:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 2013-12-31 14:58:11 +08:00
Huabing.Xu 8d9f62731e fix RenderTextureTestDepthStencil test sample 2013-12-31 14:48:07 +08:00
Huabing.Xu bc9f0311f4 migrate render texture test sample to new renderer 2013-12-31 11:49:46 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
James Chen 1d8ee016e5 Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug 
closed #2050: fix tilemap firstgid bug
 2013-12-30 05:42:19 -08:00
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding 
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
 2013-12-30 21:06:57 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
minggo 1900366c77 Merge pull request #4731 from dabingnn/develop_fixRawStencilTest 
Develop fix raw stencil test
 2013-12-30 02:18:43 -08:00
minggo 0add02bc47 Merge pull request #4737 from dabingnn/develop_ShaderTestSprite 
Develop shader test sprite
 2013-12-30 02:16:44 -08:00