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

14810 Commits

Author SHA1 Message Date
James Chen 012e7f6618 Merge pull request #4698 from dumganhar/map-fix 
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
 2013-12-27 00:09:21 -08:00
CaiWenzhi 6123344d9b Modify location of members define 2013-12-27 16:07:02 +08:00
CaiWenzhi 26fd64c61a Merge branch 'develop' into develop_nutty_modify_framework_addnewreader 2013-12-27 16:02:38 +08:00
CaiWenzhi e45c2a8601 Modify manager of some widgets' children 2013-12-27 16:01:03 +08:00
James Chen f8020a9318 Update AUTHORS [ci skip] 2013-12-27 15:59:05 +08:00
James Chen ff3c7ca06d Merge pull request #4697 from seobyeongky/CCData_bugfix 
CCData bugfix
 2013-12-26 23:57:34 -08:00
boyu0 1e8e15506d closed #3509: Sprites with PhysicsBody moves to wrong position when switch foreground/background. 2013-12-27 15:53:55 +08:00
James Chen 3ee48fc1ca Map::bucketSize fix. 2013-12-27 15:50:48 +08:00
walzer ece68aafc2 add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +08:00
James Chen 0d4a816e3b Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods. 2013-12-27 15:44:23 +08:00
byeonggee.seo b9d56ae793 CCData bugfix 2013-12-27 16:34:00 +09:00
CaiWenzhi 1a486f22ec Add "override" 2013-12-27 15:15:11 +08:00
James Chen febc19ea8d Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
minggo 533e520c35 Merge pull request #4695 from Dhilan007/update_vs_project 
fix compiling error in vs project on win7.
 2013-12-26 22:44:28 -08:00
Huabing.Xu 8198970421 fix testcase remove commandpool 2013-12-27 14:42:45 +08:00
Dhilan007 861925e752 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +08:00
Huabing.Xu 66e550e5a0 Merge branch 'develop' into develop_removeCommandPool 
* develop: (33 commits)
  fix black screen when back to foreground  on android.
  Fix set FPS broken.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CCString.cpp
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Renames: IntValueMap —> ValueMapIntKey
  Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
  Modify reader
  long --> ssize_t for TableView callback.
  Generates execute file in cocos root_dir/bin folder for HelloCpp.
  Add listview and pageview  reader
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Modify actionnode
  [AUTO] : updating submodule reference to latest autogenerated bindings
  optimize loop
  fix LabelTestNew
  Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
  Fix box2dView
  ...
 2013-12-27 14:07:04 +08:00
Huabing.Xu 76d07fc76e remove empty interface releaseToCommandPool 2013-12-27 14:02:17 +08:00
Huabing.Xu 268f2fcc21 adjust comment codes 2013-12-27 13:52:44 +08:00
Huabing.Xu 40af66a7bc remove commandPool in renderCommand 2013-12-27 13:51:11 +08:00
minggo ef6295f046 Merge pull request #4693 from Dhilan007/black_screen_android 
fix black screen when back to foreground  on android.
 2013-12-26 21:46:18 -08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
zhangcheng dd4339b0bb Merge branch '#3457' of git://github.com/chengstory/cocos2d-x into #3457 2013-12-27 12:41:01 +08:00
zhangcheng 1b666d4d41 fixed #3457 scenetest crashed when back to menu. 2013-12-27 12:39:21 +08:00
samuele3hu ee7aa0f077 Rename EVENT_KEYBOARD_RELEASED and resolve a possible memory leak bug 2013-12-27 12:05:12 +08:00
Dhilan007 f250d24766 fix black screen when back to foreground on android. 2013-12-27 11:56:56 +08:00
James Chen 9581720646 Merge pull request #4692 from dumganhar/develop 
Fix set FPS broken.
 2013-12-26 19:56:10 -08:00
James Chen 0d9fe874a3 Fix set FPS broken. 2013-12-26 19:49:54 -08:00
samuele3hu d51440f62a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_extension_manual.cpp
 2013-12-27 11:17:11 +08:00
cheng.zhang 31e46b85d7 Merge pull request #5 from liamcindy/MergeCocos2d_3.0 
update coco action with correct coding rule
 2013-12-26 18:55:37 -08:00
Liam 0cdf2d15fe merge from develop branch 2013-12-27 10:50:50 +08:00
Liam 2a6c24f8bf update coco action with correct coding rule 2013-12-27 10:43:49 +08:00
samuele3hu 6d9e865f15 Delete some ScriptEventType only used to Lua 、adjust the event callback mechanism and rename cc.HANDLERTYP_ related to avoid overlong 2013-12-27 10:35:44 +08:00
zhangcheng 6a9fbfbc60 fixed #3457 update libCocosStudio.vcxproj, add trigger code. 2013-12-27 10:24:50 +08:00
James Chen 48d3e8e334 Update CHANGELOG [ci skip] 2013-12-27 10:09:49 +08:00
James Chen 476157fd09 Update AUTHORS [ci skip] 2013-12-27 10:08:34 +08:00
James Chen 25da4071d6 Merge pull request #4689 from luocker/patch-1 
Update CCString.cpp, don't modify string itself in `String::componentsSeparatedByString` .
 2013-12-26 18:06:44 -08:00
Huabing.Xu 37fd265a5f Merge pull request #2 from boyu0/develop_removeCommandPool 
Develop remove command pool
 2013-12-26 17:35:06 -08:00
luocker fc655162fa Update CCString.cpp 
we can't change _string value after get Array.
 2013-12-27 00:26:02 +08:00
walzer d7704d574a issue #3517, enable CC_USE_PHYSICS by default 2013-12-27 00:00:50 +08:00
walzer c5e95618d9 fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment 2013-12-26 23:55:05 +08:00
chengstory 7a7d939da0 issue #3457 use C++ 11 auto loop. 2013-12-26 23:51:55 +08:00
chengstory 774e3d8536 issue #3457 
1. replace UIAction NULL to nullptr.
2. modify  class variable  name.
 2013-12-26 23:40:50 +08:00
chengstory cfbbb7889b Merge branch 'develop' into #3457 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-12-26 23:01:34 +08:00
James Chen 2946fadcbd Merge pull request #4687 from CocosRobot/updategeneratedsubmodule_1388069286 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-26 06:49:27 -08:00
CocosRobot edeeae4ff9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 14:48:08 +00:00
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
chengstory bd8f32e1a6 fixed #3457 fixes failed to build android. 2013-12-27 06:33:42 +08:00
James Chen 4e70156caf Merge pull request #4686 from dumganhar/develop 
Renames: IntValueMap —> ValueMapIntKey
 2013-12-26 06:42:54 -08:00
James Chen 31188710a0 Updates Bindings-generator. 2013-12-26 22:14:48 +08:00