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

46 Commits

Author SHA1 Message Date
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
yangxiao 1a72d89194 fix AABB computation 2014-10-20 22:53:24 +08:00
minggo 50a2cb2b86 remove unneeded includes 2014-08-28 17:32:23 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
yangxiao f2729c7ef2 cache work 2014-08-19 11:56:09 +08:00
yangxiao 01c1691a4f deal aabb 2014-08-18 17:02:13 +08:00
yangxiao 79a55286ce refactor to new model 2014-08-18 11:13:08 +08:00
yangxiao 7159914248 old model work 2014-08-16 16:56:04 +08:00
yangxiao d09695b118 create from data 2014-08-15 17:41:04 +08:00
yangxiao 342dc05890 adjust 2014-07-31 20:17:51 +08:00
yangxiao 4aec1d37c8 code adjust 2014-07-31 20:14:43 +08:00
yangxiao 49052ab28d code adjust 2014-07-31 18:42:58 +08:00
yangxiao 38c86f7697 skeleton retain 2014-07-31 10:57:19 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
yangxiao fd8541e32d rename Bone to Bone3D 2014-07-11 10:17:36 +08:00
yangxiao 2175b25730 fix animation bug 2014-06-26 21:58:26 +08:00
lvlong da835cb837 modify origin-pos stuff 2014-06-25 11:35:55 +08:00
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
XiaoYang 2371e8e6ae Merge pull request #38 from lvlonggame/v3 
binary loader
 2014-06-20 18:46:52 +08:00
yangxiao c5e562106f Animate3D support spawn 2014-06-20 17:55:25 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
 2014-06-20 16:02:22 +08:00
yangxiao f633c6a8c2 create sub Animate3D 2014-06-20 12:01:54 +08:00
yangxiao c5bb10e5f4 add comments 2014-06-19 14:11:14 +08:00
yangxiao 4db0bea73f bone original pose 2014-06-19 12:01:03 +08:00
yangxiao 052b4fa1ce bone origin matrix 2014-06-18 17:16:54 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
yangxiao fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08:00
yangxiao 10a49523b9 fix cache, android work 2014-06-16 23:43:07 +08:00
yangxiao 7ae06d44a6 cache work 2014-06-16 20:58:13 +08:00
yangxiao 531f8998a1 skincache 2014-06-16 19:17:07 +08:00
yangxiao 0c07b05e1d remove unused code 2014-06-16 18:36:30 +08:00
yangxiao c00cdd0ae3 use bone dirtyflag 2014-06-16 18:22:32 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
yangxiao 58a6adca02 construct BoneBlendState 2014-06-16 15:45:58 +08:00
Huabing.Xu a0ba6775c6 adjust animation logic 2014-06-16 15:22:00 +08:00
yangxiao 7b621c5c93 aa 2014-06-16 00:26:31 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
yangxiao ff6ef1140d two animate3d the same time 2014-06-13 19:20:19 +08:00
yangxiao 09fe7e13b7 blendstate 2014-06-13 09:12:29 +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
yangxiao a991940268 debug Sprite3D with .c3t 2014-06-09 18:37:58 +08:00
yangxiao 87c7e2b0e9 worldmat cache in bone 2014-06-05 18:21:25 +08:00
yangxiao 54caf26a57 animation3d 2014-06-04 18:17:09 +08:00