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

28794 Commits

Author SHA1 Message Date
yangxiao 9cefa3a9da weak ref to vertexdata 2015-04-09 10:52:05 +08:00
minggo e9ea77adcc Merge pull request #11348 from WenhaiLin/v3-fixCocosRobot 
[ci skip]Removes unneeded zlib files from the external/zlib folder.
 2015-04-09 10:25:35 +08:00
XiaoYang ff64b58311 Merge pull request #294 from tangziwen/terrain 
remove unnecessary reload in terrain test
 2015-04-09 10:22:03 +08:00
tangziwen 0649f9709c remove unnecessary reload in terrain test 2015-04-09 10:20:06 +08:00
WenhaiLin 9984dacf18 [ci skip]Removes unneeded zlib files from the external/zlib folder. 2015-04-09 10:17:42 +08:00
minggo 5b834eb90e Merge pull request #11343 from MSOpenTech/v3-wp8-fix 
V3 wp8 fixes
 2015-04-09 10:08:27 +08:00
minggo f28d444856 Merge pull request #11347 from WenhaiLin/v3-fixCocosRobot 
Fixed CocosRobot may commit unnecessary files
 2015-04-09 10:08:12 +08:00
WenhaiLin 76db62c1e9 Fixed CocosRobot may commit unnecessary files 2015-04-09 10:06:21 +08:00
minggo e7ec8f97b8 Merge pull request #11340 from CocosRobot/update_cocosfiles_1428499804 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-09 10:05:42 +08:00
XiaoYang 83b38a61e0 Merge pull request #293 from tangziwen/terrain 
Terrain
 2015-04-09 10:05:19 +08:00
tangziwen 176532eef4 update Terrain Lua binding 2015-04-09 10:01:40 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
tangziwen 58a9e43c9c update terrain test 2015-04-09 09:39:27 +08:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00
Igor Mats 7f24eb0cf6 Add setStroke method. 2015-04-08 21:55:24 +03:00
Dale Stammen 6993fc382b removed incorrect zlib files 2015-04-08 08:13:59 -07:00
Dale Stammen ec77f3380d updated freetype include path 2015-04-08 08:02:49 -07:00
Dale Stammen c88e8064c7 updated dll name to v3.6 2015-04-08 07:51:40 -07:00
minggo 64c45fa3ca [ci skip]update CHANGELOG 2015-04-08 22:40:18 +08:00
Dale Stammen 272bb35246 Merge branch 'v3' into v3-wp8-fix 2015-04-08 07:29:45 -07:00
CocosRobot 3b0573392d [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 13:30:05 +00:00
minggo 1177310550 Merge pull request #11334 from andyque/fix-windows-universal 
update freetype2 and chipmunk on wp8 and wp8.1
 2015-04-08 21:28:15 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
minggo 8a1aa78f7d Merge pull request #11336 from xiaofeng11/v3 
Update reader
 2015-04-08 18:40:32 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3 
Modify changelog and add getAABBRecursively
 2015-04-08 18:03:48 +08:00
andyque 24c0c8d811 fix wp8 compile issue 2015-04-08 18:01:56 +08:00
minggo 0b8f9ad269 [ci skip]update CHANGELOG 2015-04-08 17:52:16 +08:00
minggo e080c17a0f Merge pull request #11333 from WenhaiLin/v3-cpptem 
Disable the CDT builder of cpp-template-defualt
 2015-04-08 17:50:13 +08:00
xiaofeng11 2656b4b2a7 Merge pull request #9 from pipu/update_CSParseBinary_generated 
Update CSParseBinary_generated
 2015-04-08 17:11:39 +08:00
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
Wenhai Lin b87b46a3d2 Disable the CDT builder of cpp-template-defualt 2015-04-08 16:29:10 +08:00
yangxiao 3b01222787 modify changelog 2015-04-08 16:27:26 +08:00
yangxiao ac3e34144e reset submodule 2015-04-08 16:25:01 +08:00
minggo c8bc8779fd [ci skip]update CHANGELOG 2015-04-08 16:24:18 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
minggo 263506fb74 Merge pull request #11282 from hawkwood/patch-8 
Fix iOS 5.1.1 crash caused by interruptionHandler
 2015-04-08 16:23:12 +08:00
andyque f52899c257 update freetype2 and chipmunk on wp8 and wp8.1 2015-04-08 16:21:19 +08:00
yangxiao 427c15e53f modify changelog 2015-04-08 16:13:41 +08:00
yangxiao 37d75654f4 modify changelog 2015-04-08 16:09:13 +08:00
XiaoYang 9856864ded Merge pull request #289 from lvlonggame/v3 
add getAABBRecursively
 2015-04-08 16:04:16 +08:00
XiaoYang 71ed251042 Merge pull request #291 from tangziwen/terrain 
Terrain
 2015-04-08 15:33:07 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
tangziwen 0c2c8b072a terrain update terrain test update ,resource update 2015-04-08 15:13:24 +08:00
minggo 295d697f3c Merge pull request #11332 from CocosRobot/update_cocosfiles_1428474985 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-08 14:50:33 +08:00
minggo e4fb954fde [ci skip]update CHANGELOG 2015-04-08 14:46:06 +08:00
CocosRobot deb44cc0e8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 06:36:26 +00:00
minggo 00c0e4c432 Merge pull request #10909 from babcca/webview_ios_load_data_fix 
Webview ios load data fix
 2015-04-08 14:34:42 +08:00
minggo e4099acdc8 Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979 
[AUTO]: updating luabinding automatically
 2015-04-08 13:54:22 +08:00
minggo 01654f3298 Merge pull request #11329 from andyque/removeZlib 
remove zlib
 2015-04-08 13:33:43 +08:00