Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,156 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

478 Commits

Author SHA1 Message Date
minggo 4cac8e2cb4 Merge pull request #9595 from super626/v3 
Do not try to load empty texture
 2014-12-24 10:31:44 +08:00
yangxiao 908b9e470d do not try to load empty texture 2014-12-23 15:52:45 +08:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao 37f4d67a49 make it thread safe 2014-12-19 10:20:37 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
XiaoYang a59d4ab2a3 Merge pull request #171 from tangziwen/v3 
let billboard can rotate in the Z axis
 2014-12-08 09:34:58 +07:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
yangxiao 2a445ef1d9 correct unsuitable word 2014-12-05 16:44:49 +08:00
yangxiao 11d9f27c00 createAsync comment 2014-12-05 16:11:14 +08:00
yangxiao 3439b7f68d refactor async load callback funtion 2014-12-05 15:48:46 +08:00
yangxiao c99185b755 add async load test 2014-12-05 15:01:30 +08:00
yangxiao bc57e47ddb add async task callback dipatcher, call it in the main thread 2014-12-04 18:31:10 +08:00
tangziwen 8605595a5b let billboard can rotate in the Z axis 2014-12-04 15:19:41 +08:00
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
minggo f13f649a7b Merge pull request #9306 from super626/v3 
refactor bundle
 2014-12-03 14:04:59 +08:00
lvlong 82241a74dd fix bug: if the material's content that version 0.1 is empty. 2014-11-27 17:31:22 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
XiaoYang e68199b8bb Merge pull request #163 from lvlonggame/v3 
fix bug: read animation number by different version.
 2014-11-19 18:03:27 +08:00
lvlong 3b8fcd21eb fix bug: read animation number by different version. 2014-11-19 17:59:35 +08:00
yangxiao 460bc2bf08 move aabb calculation to bundle 2014-11-19 17:58:40 +08:00
tangziwen 0d43a8f337 add macro CC_MODEL_VIEWER 2014-11-19 17:01:34 +08:00
tangziwen 63fcdcebdd use dummy texture even if in release mode 2014-11-19 16:16:59 +08:00
yangxiao fb638bdf94 Merge branch 'newcode' into v3 2014-11-19 10:12:05 +08:00
yangxiao eccfbe5c59 merge bundle modification 2014-11-19 10:09:30 +08:00
Vladimir Timofeev b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03:00
lvlong a33bad7482 modify read animation. 2014-11-18 16:10:33 +08:00
cpascal 74ba46f225 Fixed "warning: bundle reader out of range" 
This warning was displayed even if it's valid c3b file..
Changed "validLength <= needLength" to "validLength < needLength".
 2014-11-09 07:38:44 +09:00
XiaoYang 5deaccda29 Merge pull request #153 from songchengjiang/new_v3 
Read AABB Info From Model File(obj/c3t/c3b)
 2014-11-06 12:47:37 +07:00
songchengjiang ce46773dd7 optimization 2014-11-06 10:37:32 +08:00
songchengjiang e9c0249f9d change include path 2014-11-06 09:38:16 +08:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite 
add Sprite3D::getMeshArrayByName and refactor re-skin test
 2014-11-05 18:11:51 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
songchengjiang 79f5d0e014 consider v0.3 v0.4 2014-11-04 11:39:09 +08:00
songchengjiang 2ed3d7d8e3 merge v0.5 Code 2014-11-04 11:14:11 +08:00
songchengjiang a55575eeb7 Tab Format 2014-11-04 10:39:41 +08:00
songchengjiang 80885dc77c fix calculateAABB BUG 2014-11-04 10:20:22 +08:00
songchengjiang d5805fbce8 Read AABB Info From Model File(obj/c3t/c3b) 2014-11-03 18:05:23 +08:00
lvlong 2019aa21fc Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2014-10-31 11:28:10 +08:00
lvlong fbdfaaf685 optimize Bundle3D about multi-animation loading. 2014-10-31 11:07:24 +08: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 77aebb657d merge cocos 2014-10-30 11:56:20 +08:00
yangxiao 7656ff2f0e fix wrong vertex buffer size 2014-10-27 13:59:40 +08:00
yangxiao 0696041ea9 add getMeshArrayByName method 2014-10-25 12:27:03 +08:00
yangxiao 4d08a08809 add getMeshCount method 2014-10-24 15:57:47 +08:00
yangxiao f878533f85 load attached sprite from cache 2014-10-24 15:52:24 +08:00
XiaoYang 01e2d62e90 Merge pull request #149 from lvlonggame/v3 
Fix bug: load sprite3D from cache, the attach node will be discarded.
 2014-10-24 15:43:37 +08:00