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

22599 Commits

Author SHA1 Message Date
boyu0 2354c79c3f Fix compile error 2014-07-14 23:05:16 +08:00
Huabing.Xu 8bbce767f3 add CC_DLL for ActionEase 2014-07-14 22:42:44 +08:00
minggo ff31144bd2 Merge pull request #7438 from Dhilan007/v3-320final 
disable warn on zero-sized structure[android].
 2014-07-14 21:04:03 +08:00
minggo 0ceef253ba Merge pull request #7437 from CocosRobot/update_lua_bindings_1405327888 
[AUTO]: updating luabinding automatically
 2014-07-14 21:03:19 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
boyu0 7fd0ca217c Implement utils::atof() 2014-07-14 20:42:08 +08:00
boyu0 0c4f4efc0b merge iOS arm64 lib to fat lib, change the project setting. 2014-07-14 19:27:19 +08:00
Huabing.Xu 91314ed504 remove CC_DLL for template class and CC_DLL for CCValue 2014-07-14 18:40:10 +08:00
samuele3hu b3bfa87f51 Fix the TMXOrthoFlipRunTimeTest bugs. 2014-07-14 18:30:59 +08:00
samuele3hu f1ed090f4f Fix the OpenGLTest display bugs. 2014-07-14 18:30:02 +08:00
samuele3hu 7757df222a Add bit extend module 2014-07-14 18:26:39 +08:00
Dhilan007 5e10575ab0 disable warn on zero-sized structures. 2014-07-14 17:53:55 +08:00
Huabing.Xu 9806b37398 add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
Huabing.Xu 952ca0eb75 add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CocosRobot 1ef1a809b5 [AUTO]: updating luabinding automatically 2014-07-14 08:53:13 +00:00
Huabing.Xu 190264c090 add CC_DLL in Event systems 2014-07-14 16:43:28 +08:00
Huabing.Xu 09a75f73cf add CC_DLL in math folder 2014-07-14 16:40:54 +08:00
minggo 6d063fb97b Merge pull request #7431 from andyque/addTextFieldTTFTest 
add TextField TrueTypeFont tests
 2014-07-14 16:31:36 +08:00
minggo 981922eb95 Merge pull request #7432 from joshuastray/transition_ctor_access 
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
 2014-07-14 16:28:18 +08:00
minggo 7f68bdf179 Merge pull request #7434 from samuele3hu/v3_hot_fix 
Fix the crash that CocoStudioGuiTest in the Linux platform and error display than Sprite3DTest
 2014-07-14 16:26:42 +08:00
minggo e3b149deda Merge pull request #7433 from heliclei/check-build-size 
check libcpp-empty-test.so size after successful build
 2014-07-14 16:25:52 +08:00
minggo b5a6ccc220 Merge pull request #7435 from Dhilan007/v3-320final 
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
 2014-07-14 16:25:10 +08:00
chuanweizhang2013 3788df5e53 add support program to top 2014-07-14 16:23:57 +08:00
samuele3hu 4cb6c1c74f Add lua bindings for TextureCache::addImageAsync and update the related test cases 2014-07-14 16:05:48 +08:00
cocoscodeide 42e5c9c293 Merge pull request #53 from cocos2d/v3 
update 2d-x
 2014-07-14 15:56:12 +08:00
heliclei 9812532103 [ci skip]add .so to file name 2014-07-14 15:51:04 +08:00
Dhilan007 a5317dde87 fixed using the incorrect res in test case of 'TextureMemoryAlloc'. 2014-07-14 15:50:20 +08:00
samuele3hu 5f453d0105 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-14 15:32:03 +08:00
heliclei 06ae2ba2a6 check libcpp-empty-test.so size after successful build 2014-07-14 15:30:11 +08:00
samuele3hu ace0d05bd4 Fix the crash that CocoStudioGuiTest in the Linux platform and errors than Sprite3DTest 2014-07-14 15:28:52 +08:00
cocoscodeide de04cce39e Merge pull request #52 from chuanweizhang2013/v3luaruntime 
modify lua template source code
 2014-07-14 15:04:51 +08:00
Huabing.Xu 52c0bd365b add chipmunk.lib for release 2014-07-14 14:47:00 +08:00
Huabing.Xu 469dbea7da window dll version work now 2014-07-14 14:40:47 +08:00
andyque 4fe3723edf add TextField TrueTypeFont tests 2014-07-14 14:29:28 +08:00
joshuastray 98b1c0bbed add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
joshuastray e14c2587b5 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
minggo f07270454d [ci skip] 2014-07-14 13:59:43 +08:00
chuanweizhang2013 1db6daa60a modify lua template source code 2014-07-14 13:58:21 +08:00
minggo 92cfe90937 Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont 
Fix the bug that UITextField doesn't support TTF font
 2014-07-14 13:57:54 +08:00
minggo 181d895053 Merge pull request #7429 from Dhilan007/v3-320final 
update test case of new label[lua].
 2014-07-14 13:57:31 +08:00
minggo 9f01645bdb Merge pull request #7430 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-14 13:53:28 +08:00
zhangbin 30ebba8d51 Update the reference of submodule cocos2d-console. 2014-07-14 13:51:44 +08:00
Dhilan007 8949d90212 update test case of new label[lua]. 2014-07-14 13:48:28 +08:00
minggo 62b9c72609 Merge pull request #7281 from aslmaswd/v3-cmake 
CMake Fix:GLFW header
 2014-07-14 11:18:51 +08:00
edwardzhou c0254c9318 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-14 11:14:03 +08:00
minggo 19e9879514 Merge pull request #7428 from Dhilan007/v3-320final 
fixed crash cause by incorrect font name.
 2014-07-14 10:16:28 +08:00
chuanweizhang2013 a5a9dbe9f5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-14 10:14:18 +08:00
Dhilan007 b3017fb773 fixed crash cause by incorrect font name. 2014-07-14 10:01:29 +08:00
Dhilan007 d40d25104d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game-controller 2014-07-14 09:56:34 +08:00
zhangbin 272146cfb6 Solve the error when compiling lua projects on android. 2014-07-14 09:48:16 +08:00