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

174 Commits

Author SHA1 Message Date
koowolf aa51e5dd22 fix compiler error in wp8 2014-04-10 15:15:17 +08:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
Anton Sokolchenko e063e97a5d Incompatible pointer type? 
Why sizeof(void**) and not sizeof(void*)?
 2014-04-09 11:44:01 +03:00
samuele3hu 130c2608da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:40:21 +08:00
James Chen cb16bb1158 Merge pull request #6084 from dumganhar/update-websocket-v1.23 
Updates websocket to the latest release v1.23.
 2014-04-01 11:36:03 +08:00
samuele3hu abaaa3132c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:33:50 +08:00
samuele3hu 22720fa1b7 Update `build_ios.sh` for building luajit 2014-04-01 11:28:27 +08:00
minggo 7fb5e1f13a Merge pull request #6066 from minggo/quadcommand-optimize 
use xxhash to generate material id
 2014-04-01 11:27:51 +08:00
James Chen b73a7d2939 Updates websocket to the latest release v1.23. 2014-04-01 10:44:50 +08:00
samuele3hu de3e9aa916 Add ignored `Makefile` file for building luajit 2014-03-31 17:06:36 +08:00
minggo 66440ac335 add xxhash on linux 2014-03-31 15:43:35 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
Dale Stammen aa0ef00de3 added external libs for wp8 2014-03-28 12:02:27 -07:00
James Chen 8ca714fa67 Windows will not include <alloca.h>. 2014-03-26 19:43:34 +08:00
James Chen d9b4b70ed7 Removed unused include file. 2014-03-26 19:28:10 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
Ricardo Quesada c82933e3c4 chipmunk fixes for Linux 2014-03-25 16:46:10 -07:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen 368d5216ad Merge pull request #5897 from Dhilan007/develop_edtaa_license 
update license.
 2014-03-21 11:09:36 +08:00
Dhilan007 cca1591e8a update license. 2014-03-21 10:23:11 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
boyu0 c2e81817c0 add i386 architecture to each mac .a file 2014-03-14 14:48:37 +08:00
boyu0 38a1b13415 extract arm64 architectures form .a file, add condition link arguments. 2014-03-14 14:18:13 +08:00
boyu0 44a69db0cb update external library, add iOS x86_64 and arm64 architectures, support Xcode5.1 iPhone simulator(64 bit) 2014-03-13 18:32:03 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
James Chen 05c79b54ac issue #3900: Typedef jschar to wchar_t to fix linking errors on windows. 2014-02-07 17:30:02 +08:00
James Chen 558fb7e420 issue #3900: Adds spidermonkey v27 library for windows. 2014-02-07 15:13:14 +08:00
James Chen 20ab9daa3a issue #3900: Adds spidermonkey v27 library for Android. 2014-02-07 14:21:41 +08:00
James Chen 90c4a63677 issue #3900: Adds spidermonkey v27 library for iOS and Mac. 2014-02-07 14:05:03 +08:00
James Chen 2ff4a44324 closed #3857: Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode. 
For more details why I did this, please refer to http://www.cocos2d-x.org/issues/3857.
 2014-01-26 14:19:42 +08:00
James Chen 3250604478 issue #3823: Removes curl libraries for linux. It was installed by 'apt-get'. 2014-01-23 01:04:21 -08:00
James Chen 767fed989c issue #3823: Removes glfw3 header file since it was installed to system by tools/travis-script/install-glfw.sh. 2014-01-23 16:11:06 +08:00
James Chen a0f801159d issue #3823: Updates glfw to v3.0.4 for windows. 2014-01-23 16:09:58 +08:00
James Chen 46b1ccf4c0 issue #3823: Updates glfw to the latest release v3.0.4. 2014-01-23 15:53:47 +08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
zhangcheng 5214965e4f fixed #3456 2013-12-24 18:33:19 +08:00
samuele3hu 783be69322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 17:20:17 +08:00
minggo 16ed9155c0 Merge pull request #4460 from Dhilan007/label_distanceField 
new label:add support for distanceField
 2013-12-16 23:18:41 -08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
samuele3 ad8638d976 issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper 2013-12-06 14:16:33 +08:00
boyu0 0ff2e65467 reset cmakelists.txt 2013-11-28 15:41:23 +08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
minggo 3469f2adf5 closed #2539:use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings 2013-11-27 10:34:05 +08:00