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

124 Commits

Author SHA1 Message Date
James Chen f62c041886 Compilation fix: Updates cocos_files.json and removes unused in template. 2014-01-16 10:27:35 +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
chuanweizhang 6b5b49bb0b solve linux can't build 2013-12-31 15:08:21 +08:00
chuanweizhang 2579573b7e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-31 14:58:37 +08:00
cw 89838e4c93 755 2013-12-30 18:45:20 +08:00
Dhilan007 4f2d7f47fc update describe for support translucency on android 2013-12-30 16:42:33 +08:00
Dhilan007 3fd9561df8 update describe for support translucency on android 2013-12-30 16:30:08 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +08:00
chuanweizhang 623e205256 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/auto-generated
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
	tools/bindings-generator
	tools/tolua/cocos2dx_studio.ini

reset modify
 2013-12-30 14:51:51 +08:00
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
chuanweizhang c9135eb6b9 modify linux template 2013-12-26 10:22:39 +08:00
chuanweizhang 23192a883c modify linux tempalte 2013-12-25 18:32:23 +08:00
chuanweizhang c53537e7c2 modify create_project 2013-12-25 15:53:47 +08:00
chuanweizhang 067d4fed0e modify template 2013-12-25 11:01:23 +08:00
chuanweizhang 2308e94c2f modify template 2013-12-24 09:42:37 +08:00
Dhilan007 d1972b3d17 support generate APK by script in template project and unify help message for usage. 2013-12-22 17:48:35 +08:00
James Chen ca1e1275ee issue #2171: Updates CMakeLists.txt. 2013-12-17 15:51:32 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
minggo cd22f5543b Merge pull request #3997 from ondesly/screen_size_change 
[ci skip]android & ios screen size change support
 2013-11-10 23:10:13 -08:00
James Chen eeedab78b2 [LINUX] Adding template CMake files for linux. 2013-11-08 18:13:24 +08:00
minggo b5838b800d use python script to build template android projects 2013-11-04 16:48:17 +08:00
minggo f6d82d21d2 closed #3108: add -fsigned-char to make char to signed as default 2013-11-04 10:48:45 +08:00
Michael Contento fe180078f0 Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
ondesly 969b464b9b android & ios screen size change support 2013-10-23 12:29:59 +04:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
James Chen 5ffe904a1b issue #2905: [iOS Mac] Updating template. 2013-10-16 22:54:55 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
minggo 866906fd58 issue #2905:modify project settings to include correct audio path 2013-10-10 15:40:06 +08:00
Dhilan007 8dc55b3773 issues #2677:Use CoreMotion's API to replace UIAccelerometer. 2013-10-08 11:08:45 +08:00
Dhilan007 9727436a5d issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin 2013-09-27 21:54:48 +08:00
Ricardo Quesada cd557a11bf Adds missing icons to templates and samples 2013-09-20 14:06:44 -07:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
Ricardo Quesada 7ecb9778a3 Product Name is the project name 2013-09-19 18:12:02 -07:00
Ricardo Quesada d3827e9933 Template: Adds JS template for Mac 
Mac and iOS templates share the same Xcode project
 2013-09-19 16:02:20 -07:00
Ricardo Quesada c9a1cd49fe unifies ios and mac templates into one. 
iOS and Mac templates unified into one Xcode project.

It is much easier to mantian an to develop games by having everything in one Xcode project
 2013-09-19 14:59:44 -07:00
Ricardo Quesada 3427ed71c4 Adds iOS7 icons to ios template 2013-09-19 11:51:33 -07:00
Ricardo Quesada 24df87265e Small fixes for Xcode templates 
Also, uses `auto` in the template code to be more c++11 friendly
 2013-09-18 16:50:26 -07:00
Huabing.Xu a2dee37b0e glfw EGLView set alloc on the stack to prevent memory leak 2013-09-18 17:00:21 +08:00
minggo 40d91f0afa disable compressing png when deploying for iOS device 2013-09-18 11:16:28 +08:00
minggo c2e53d5673 Merge pull request #3665 from minggo/merge-physics 
Merge physics
 2013-09-17 08:18:55 -07:00
Huabing.Xu c1599300f6 fix template cpp not compiled in ipad retina 2013-09-17 20:05:24 +08:00
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00