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

584 Commits

Author SHA1 Message Date
Linghui 4e09856624 change the platform java path. 2014-02-24 04:32:47 +08:00
James Chen 004a846847 issue #4058: Template fix. Object -> Ref 2014-02-20 11:31:49 +08:00
JianjunMao 789ebffb14 fix string concatenation 
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11") which leads to list of strings.
The result is "-stdlib=libc++;-std=c++11"  if CMAKE_CXX_FLAGS is defined as "-stdlib=libc++"
 2014-02-17 21:23:29 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01: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
Éloi Rivard 3fb2b61591 Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
chuanweizhang2013 ea82fa33e6 lower-case for StartRuntime and ReloadRuntime 2014-02-12 18:23:07 +08:00
chuanweizhang2013 a73d6ea81c delete main.cpp 2014-02-11 18:16:46 +08:00
chuanweizhang2013 fcc78f39a1 add mac Simulator 2014-02-11 18:07:20 +08:00
chuanweizhang2013 c0d3ce2b75 issue #3498: commit jsruntime 2014-02-11 11:26:47 +08:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
James Chen f96bb6fd5e Merge pull request #5292 from azmeuk/typo 
Minor typo in template
 2014-02-08 14:17:16 +08:00
James Chen d1a0dd395c Merge pull request #5300 from dumganhar/iss3900-sp-v27 
closed #3900: Upgrades spidermonkey to Firefox v27.
 2014-02-08 14:04:53 +08:00
samuele3hu 49fbfcbbe8 issue #3907:The project that lua or js template generated crash on the iOS platform 2014-02-07 18:11:26 +08:00
James Chen c25787e575 issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG . 2014-02-07 16:01:57 +08:00
James Chen 5714552458 issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows. 2014-02-07 15:29:44 +08:00
James Chen 4c2da5d286 issue #3900: mozjs-25 -> mozjs-27 for windows. 2014-02-07 15:16:14 +08:00
samuele3hu 4fa29862b6 fix:Compile error of the project that js template generate on the iOS platform 2014-02-07 12:05:38 +08:00
samuele3hu 445b0e49b8 fix:Compile error of the project that lua template generate on the iOS platform 2014-02-07 11:46:59 +08:00
Éloi Rivard 9e565a0e02 Typo fixed 2014-02-06 22:29:21 +01:00
Ricardo Quesada 71c53ef0fd ios template compiles OK 2014-02-03 11:32:00 -08:00
Ricardo Quesada d0f963e655 Template fixes 2014-01-30 21:17:55 -08:00
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements 
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
 2014-01-27 10:52:35 -08:00
samuele3hu 9ddce1b4ba issue #3837:Update the comment 2014-01-27 15:00:11 +08:00
samuele3hu 73f272ec7c issue #3837:Update the comment 2014-01-27 14:10:34 +08:00
samuele3hu 8e8e229888 issue #3837:Update the comment 2014-01-27 14:02:11 +08:00
samuele3hu 13d2f2b97b issue #3837:Update the “HelloLua” test case to support on-device debugging 2014-01-27 11:59:17 +08:00
samuele3hu 6a927c3f18 issue #3837:Add debug support for lua template 2014-01-26 15:14:12 +08:00
Dhilan007 f3331feac6 fix get_num_of_cpu on win32. 2014-01-24 18:30:37 +08:00
andyque ecdd742f57 change include header file Application.h to cocos2d.h 2014-01-24 14:26:34 +08:00
minggo a74cdeebfd Merge pull request #5198 from minggo/bug-fix 
remove unneeded codes to fix running error
 2014-01-23 22:15:33 -08:00
minggo dffad2acd8 remove unneeded codes to fix running error 2014-01-24 14:13:17 +08:00
Ricardo Quesada 2b92ba75b4 more fixes for new GLView API 2014-01-23 16:04:11 -08:00
James Chen d8b2f7615d Fixes couldn't find CCEGLView.h in main.cpp of template. 2014-01-23 18:15:02 +08:00
James Chen a3813ca294 closed #3823: Reverts a line in lua template. 2014-01-23 17:24:03 +08:00
James Chen e97dd396ba issue #3823: Removes glfw, curl include and library path. They are installed to system. 2014-01-23 01:05:48 -08:00
James Chen 5dfcb76398 Updates template CMakeLists.txt. 2014-01-23 11:07:54 +08:00
liang8305 ac50e3f792 When android project build native, using multiple concurrent job processes; 
android项目编译时,默认利用"-j"参数,启用跟cpu数相同的多进程编译
 2014-01-18 15:27:59 +08:00
zhangbin e7b584908e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs 2014-01-16 11:58:49 +08:00
James Chen f62c041886 Compilation fix: Updates cocos_files.json and removes unused in template. 2014-01-16 10:27:35 +08:00
zhangbin 536eaca24d closed #3714, Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects. 2014-01-15 17:27:53 +08:00
samuele3hu ca562fb405 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-07 16:45:31 +08:00
samuele3hu 11a5945bd3 Fix:Resolve the android template projects’s errors 2014-01-07 16:45:03 +08:00
James Chen 1be11f8a82 Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR for template. 2014-01-06 23:55:57 -08:00
James Chen 2512c15cb9 Renames title names for cpp and lua templates. 2014-01-06 19:35:33 -08:00
James Chen 9183a69873 Simplifies linux template, build.sh is not needed now. 2014-01-06 19:34:48 -08:00
samuele3hu ac46932c06 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 
Conflicts:
	tools/project-creator/module/cocos_files.json
 2014-01-06 20:07:39 +08:00
samuele3hu f36d4a9236 Fix:Resolve the lua android template errors 2014-01-06 19:59:31 +08:00
chuanweizhang 07e51e2c86 test template lua 2014-01-06 14:24:33 +08:00