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

20560 Commits

Author SHA1 Message Date
lvlong 0fa4e921f0 delete girl - 副本.c3t 2014-06-16 09:25:12 +08:00
yangxiao 79d2de3b67 make character up 2014-06-16 00:31:31 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
lvlong 3af0bdfef6 texture 2014-06-13 09:18:25 +08:00
lvlong dbadabb6e9 skin: getPosition() 2014-06-12 18:46:45 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
lvlong 1ca69d2689 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2014-06-12 16:28:36 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
yangxiao ee5aa0f648 android work 2014-06-12 15:42:53 +08:00
yangxiao e37c6ab7ee test action sequence 2014-06-12 14:20:38 +08:00
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
lvlong 9fe7c1a9da loader 2014-06-12 10:01:54 +08:00
Huabing.Xu 8ca8715a85 Merge pull request #35 from dabingnn/v3Animation 
V3 animation
 2014-06-11 23:23:55 +08:00
Huabing.Xu f1bc0971aa extract mesh data, material data, skin data into a header file for reuse in converter and engine 2014-06-11 18:24:14 +08:00
Huabing.Xu 65acec013b Merge branch 'v3' into v3Animation 2014-06-11 17:45:31 +08:00
Huabing.Xu 18663609b4 add interface for speed and playback in animate 2014-06-11 15:07:37 +08:00
minggo 0ad57bdde7 [ci skip] 2014-06-11 14:50:33 +08:00
minggo ccb24abf52 Merge pull request #7028 from heliclei/cocos-version 
[ccconsole]Add version command.
 2014-06-11 14:49:47 +08:00
yangxiao d76525ced1 use my data temp 2014-06-11 14:20:14 +08:00
yangxiao 5b05ab6353 fix rendering bug 2014-06-11 14:05:35 +08:00
Huabing.Xu 9ee6f1f3e0 adjust shader uniform settings 
use a new fake data for testing
 2014-06-11 12:07:25 +08:00
minggo 14ea582fbc Merge pull request #7035 from samuele3hu/v3_keypad_fix 
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
 2014-06-11 11:35:31 +08:00
Huabing.Xu a8c321fe64 add use glprogram before setting uniform data for meshcommand 2014-06-11 11:34:04 +08:00
minggo 11d8663f2b Merge pull request #7034 from CocosRobot/update_lua_bindings_1402453768 
[AUTO]: updating luabinding automatically
 2014-06-11 11:31:33 +08:00
samuele3hu 1a3cb575d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-11 11:26:44 +08:00
samuele3hu 54379f48a9 Fix the crash of Texture2dTest when `—ndk-mode` is `release` 2014-06-11 11:24:17 +08:00
CocosRobot 818c478224 [AUTO]: updating luabinding automatically 2014-06-11 02:30:38 +00:00
minggo c6b7ec2769 Merge pull request #7033 from samuele3hu/v3_keypad_fix 
Update values of KeyCode used in the Lua to fix related error
 2014-06-11 10:27:00 +08:00
samuele3hu 2d50df8b01 Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:19:07 +08:00
samuele3hu d200dd83a4 Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:15:38 +08:00
samuele3hu 2252bc271b Update the KeyCodeTest in the NewEventDispatcherTest 2014-06-11 10:14:24 +08:00
samuele3hu 4ce2d7f193 Update values of KeyCode used in the Lua to fix related error 2014-06-11 10:10:11 +08:00
yangxiao cddad40ec0 make it rotate 2014-06-11 10:01:52 +08:00
yangxiao 6d09b50699 animation bug 2014-06-10 19:53:06 +08:00
heliclei d4a9640a5e [ccconsole]Add version command. 2014-06-10 16:29:06 +08:00
minggo 8222cdd8aa [ci skip] 2014-06-10 13:53:41 +08:00
minggo d7af5eccd4 Merge pull request #7024 from pandamicro/SpriteFrame_Ctor 
Issue #5533: Add SpriteFrame's constructor
 2014-06-10 13:38:27 +08:00
pandamicro 8bc531a0fb Fixed #5533: Fix usage of new SpriteFrame in engine 2014-06-10 12:04:20 +08:00
pandamicro 92a33225ff Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues 2014-06-10 11:39:48 +08:00
minggo 2ab54a0da9 Merge pull request #7023 from samuele3hu/v3_lua_ui_fix 
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
 2014-06-10 11:37:18 +08:00
samuele3hu aa877f2b50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-10 11:31:08 +08:00
samuele3hu 5a80b4da2e Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget 2014-06-10 11:30:39 +08:00
pandamicro bb7cf801e6 Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected 2014-06-10 11:28:34 +08:00
minggo 0ca9a98f4a Merge pull request #6920 from minggo/orrderOfArrival 
don't have to set _orderOfArrival to 0 after visit
 2014-06-10 10:28:38 +08:00
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
minggo 9ef1272de7 [ci skip] 2014-06-09 17:18:55 +08:00
minggo 9517f9b852 Merge pull request #6996 from newnon/v3_setparent_fix 
move node from one parent to another fix
 2014-06-09 17:13:59 +08:00
minggo b11b978010 Merge pull request #7019 from minggo/v3 
fix issue on Xcode 6
 2014-06-09 17:08:42 +08:00
minggo 66c7b85134 fix issue on Xcode 6 2014-06-09 17:06:40 +08:00