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

336 Commits

Author SHA1 Message Date
minggo 653986a3a2 Merge pull request #8106 from super626/v3 
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
 2014-09-19 16:16:33 +08:00
XiaoYang d1328cfb41 Merge pull request #132 from lvlonggame/v3 
Deal read string length problem!
 2014-09-19 14:47:59 +08:00
lvlong eb89efe510 deal the length problem! 2014-09-19 14:30:02 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +08:00
yangxiao 34f642377e fix billboard anchor point 2014-09-17 18:01:18 +08:00
yangxiao c5f6f8de5b share glprogramstate 2014-09-17 13:42:08 +08:00
yangxiao 2e0e4e58c8 support transparent object 2014-09-12 17:57:54 +08:00
yangxiao 9eb62ed1f6 Merge branch 'newcode' into v3 2014-09-12 10:00:13 +08:00
yangxiao 33cabb553a add transparent property 2014-09-11 09:15:24 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
yangxiao b88c462c8f remove Sequence3D 2014-09-09 11:34:17 +08:00
yangxiao a295159a3a Merge branch 'newcode' into transition 2014-09-09 10:37:08 +08:00
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao 31dc3301b3 add space line 2014-09-04 17:03:46 +08:00
yangxiao a5e1e692e8 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-04 17:00:49 +08:00
liuliang c42bef1f02 Add a bulletin board test example 2014-09-04 16:58:00 +08:00
yangxiao d114e11a0b android, linux and lua 2014-09-04 16:45:42 +08:00
yangxiao 226e60a3ee rename billboard 2014-09-04 16:26:36 +08:00
yangxiao 86d9ce381b rename billboard 2014-09-04 16:26:11 +08:00
yangxiao 08a1405bdc fix bug on custom mesh 2014-09-04 14:26:23 +08:00
yangxiao 4e65d070a1 rename BillBoard Model 2014-09-03 18:19:12 +08:00
XiaoYang 58f4e84b9a Merge pull request #126 from songchengjiang/billboard 
Billboard
 2014-09-03 18:12:08 +08:00
songchengjiang 114de83a0b Added View_Oriented and View_Plane_Oriented Mode 2014-09-03 18:04:48 +08:00
songchengjiang 68ce6449e8 repaired camera orientation 
Testing RotateBy action
 2014-09-03 17:17:57 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
XiaoYang f03c4d4790 Merge pull request #125 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 15:59:49 +08:00
liuliang c167ed17ee Set the node name 2014-09-03 15:55:11 +08:00
yangxiao 5a85cb405e fix billboard face 2014-09-03 15:28:15 +08:00
XiaoYang 4e0c358a90 Merge pull request #124 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 13:12:33 +08:00
yangxiao adda886210 tmp work 2014-09-03 11:58:09 +08:00
liuliang 278a3441ce Set the node name 2014-09-03 11:43:42 +08:00
yangxiao fed2021707 Fixme: frustum culling 2014-09-03 09:02:32 +08:00
lvlong 387f190ff1 Merge newcode into v3 2014-09-02 17:52:02 +08:00
lvlong 27f771744a static model load problem of old version . 2014-09-02 17:33:22 +08:00
yangxiao f84c6a5d27 Merge branch 'newcode' into transition 2014-09-02 17:15:05 +08:00
songchengjiang 8a88ba6142 Tab Format 2014-09-02 11:50:09 +08:00
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +08:00
yangxiao d542624bfd remove from map when release 2014-09-02 10:40:29 +08:00
yangxiao 9ce30bdabd add to linux 2014-09-01 17:52:13 +08:00
yangxiao 57a70b629f add sequence3d 2014-09-01 16:00:50 +08:00
yangxiao 33005bedcb add to cocos3d 2014-09-01 15:32:06 +08:00
yangxiao 97c8764ae7 remove unused header 2014-09-01 15:21:47 +08:00
yangxiao 538fe2e543 Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00