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

15270 Commits

Author SHA1 Message Date
James Chen c964451f5f Merge pull request #4991 from dumganhar/iss3597-particle-plist 
closed #3597:  Merge PR #4846
 2014-01-07 18:49:24 -08:00
James Chen eb8f621ab0 closed #3597: Uses !xxx.empty() instead of xxx.size() > 0. 2014-01-08 10:47:27 +08:00
James Chen 685b80796b Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist 2014-01-08 10:36:51 +08:00
minggo 6529380b77 Merge pull request #4988 from dumganhar/develop 
If this.ctor was not found, output a log.
 2014-01-07 06:41:53 -08:00
James Chen 65b5a7c031 If this.ctor was not found, output a log. 2014-01-07 22:39:14 +08:00
James Chen 20f2f7255e Merge pull request #4986 from CocosRobot/updategeneratedsubmodule_1389104844 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 06:28:04 -08:00
CocosRobot a650ddf88b [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 14:27:34 +00:00
minggo ac8a7b4ce1 Merge pull request #4983 from dabingnn/develop_layerColorBug 
fix layerColor occlude sprite bug on android
 2014-01-07 06:25:59 -08:00
James Chen 32809bfcaa Merge pull request #4985 from samuele3hu/developNewUI 
Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua[ci skip]
 2014-01-07 06:25:15 -08:00
samuele3hu 643ef73fad Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 22:20:03 +08:00
James Chen 2fde6db026 Merge pull request #4984 from dumganhar/develop 
JSB TableView Fixes
 2014-01-07 06:18:47 -08:00
James Chen b07acb6c12 [JSB] Supports cc.ScrollView.extend, cc.TableView.extend, cc.TableViewCell. 2014-01-07 22:17:22 +08:00
James Chen e93b567000 ScrollView::intWithView supports be invoked several times. 2014-01-07 22:16:24 +08:00
samuele3hu a61f9fce27 Fix:Resolve the pLengthSQ’s error in the Cocos2d.lua 2014-01-07 22:16:07 +08:00
James Chen 4bb091067f Adds empty constructor for TableView and TableViewCell. 2014-01-07 22:15:20 +08:00
Huabing.Xu b1d9d5e55e fix layerColor occlude sprite bug on android 2014-01-07 22:08:00 +08:00
James Chen 01745f5ba6 Merge pull request #4980 from CocosRobot/updategeneratedsubmodule_1389101321 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 05:46:08 -08:00
James Chen 93b4ed9b10 Merge pull request #4981 from dumganhar/develop 
[Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw.
 2014-01-07 05:42:31 -08:00
James Chen 1d852788e2 [Spine] Saves old transform matrix in Skeleton::draw, uses it in ::onDraw. 2014-01-07 21:40:06 +08:00
CocosRobot 6fd72db513 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 13:28:43 +00:00
James Chen b089970308 Merge pull request #4978 from dumganhar/jsb-spinetest-fix 
[JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer...
 2014-01-07 05:21:01 -08:00
James Chen 9387e516be [JSB] Fix for SpineTest didn’t show anything. Skeleton uses new renderer. 2014-01-07 21:19:51 +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 2276887253 Merge pull request #4976 from samuele3hu/developNewUI 
Fix:Replace the “setDisplayFrame” function with the "setSpriteFrame" function
 2014-01-07 04:57:06 -08:00
James Chen e25c4b5f4d [JSB] Armature should be able to be extended in JS. 2014-01-07 20:55:07 +08:00
James Chen 7a52d2aad7 Small fix in ArmatureScene.cpp/.h 2014-01-07 20:54:34 +08:00
James Chen c7639319ee Fix Armature::init() crashes 2014-01-07 20:53:44 +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 e90f35daa6 Merge pull request #4975 from chengstory/fix_UIAction_play_error 
fixed UIAction play error.
 2014-01-07 03:17:41 -08:00
zhangcheng bf8187fee2 fixed UIAction play error. 2014-01-07 19:04:18 +08:00
James Chen 54cbfe938b Merge pull request #4973 from CocosRobot/updategeneratedsubmodule_1389091226 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 02:41:53 -08:00
CocosRobot ab84228037 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 10:40:28 +00:00
James Chen 18963b46f5 Merge pull request #4971 from Dhilan007/develop_crash 
update liblua vs project for add miss file.
 2014-01-07 02:31:58 -08:00
James Chen cc69c31ad3 Merge pull request #4972 from dumganhar/develop 
Some fixes:
 2014-01-07 02:31:37 -08:00
Dhilan007 ba4833e070 update liblua vs project for add miss file. 2014-01-07 18:30:12 +08:00
James Chen 1aa44383b1 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-01-07 18:29:15 +08:00
James Chen ac3697db19 fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS? 2014-01-07 18:28:46 +08:00
James Chen 5391024399 Adds override keyword. 2014-01-07 18:27:04 +08:00
James Chen 26efb4bf5c long —> ssize_t for some classes. 2014-01-07 18:26:31 +08:00
James Chen 5de6ab1153 Merge pull request #4969 from dumganhar/develop 
Updates JS-Test submodule.
 2014-01-07 02:03:42 -08:00
James Chen a6da007e4f Updates JS-Test submodule. 2014-01-07 18:01:22 +08:00
James Chen c081a3b155 Merge pull request #4965 from CocosRobot/updategeneratedsubmodule_1389088022 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 01:49:30 -08:00
James Chen f4256c6ee4 Merge pull request #4964 from dumganhar/develop 
ScrollView uses new renderer now.
 2014-01-07 01:47:24 -08:00
CocosRobot 6967caeff9 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 09:47:05 +00:00
James Chen 5c217f70d1 ScrollView uses new renderer now. 2014-01-07 17:46:24 +08:00
James Chen 849b522924 Merge pull request #4962 from Dhilan007/develop_crash 
update bindings-generator submodule
 2014-01-07 01:41:47 -08:00
Dhilan007 3cab3e5df3 update bindings-generator submodule 2014-01-07 17:19:29 +08:00
James Chen ce34ef6be4 Merge pull request #4961 from CocosRobot/updategeneratedsubmodule_1389085505 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-07 01:15:54 -08:00
CocosRobot 7e142d79f7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-07 09:05:07 +00:00