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
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 6e871e8803 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	template/multi-platform-js/Classes/AppDelegate.cpp
 2013-12-25 18:12:16 +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
James Chen cafebe7295 Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-23 20:28:51 +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
byeonggee.seo f3e4d9277e spine android build phase moved 2013-12-20 19:16:16 +09:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09: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
samuele3 0dadddfb3d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 23:14:08 +08:00
samuele3 9bc3a10aa7 Hot fix:Repair js template copy resource error 2013-11-18 23:08:37 +08:00
minggo 2028cde015 fix compiling error of js template 2013-11-18 22:32:13 +08:00
minggo 425ce40a67 Merge pull request #4274 from Dhilan007/helloLuaConf 
[ci skip]fix Incomplete helloLua project configuration.
 2013-11-15 00:06:49 -08:00
Dhilan007 6db31508cc fix Incomplete helloLua project configuration. 2013-11-15 16:01:03 +08:00
minggo 5870a69bb7 Merge pull request #4269 from Dhilan007/di2854 
[ci skip]issue #2854:Disable CDT Builder on Eclipse
 2013-11-14 23:45:13 -08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +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 04bb4033fd Merge pull request #4128 from Dhilan007/m_c_jsb 
[ci skip]rename jsb boot file.
 2013-11-07 18:48:30 -08:00
Dhilan007 006d32f883 rename jsb boot file. 2013-11-07 23:51:01 +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
James Chen 69b0206018 issue #2826: Updating vs project to link mozjs-25.lib 2013-10-31 11:24:43 +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
James Chen ca3cbec858 [Template] Hello JavaScript --> HelloJavascript. It's for replacement. 2013-10-18 11:06:17 +08:00
minggo 4d28d0ab8b issue #2509:make lua android template build ok 2013-10-17 17:46:09 +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 6e62be5443 issue #2905: modify makefile to include correct header files 2013-10-10 17:39:53 +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 3696703db4 forces 64-bit arch 2013-09-19 18:46:07 -07:00
Ricardo Quesada 51834e5291 Xcode template projects fixes 
Updats the xcode project with recommended fixes from Xcode 5.0
 2013-09-19 18:27:11 -07:00
Ricardo Quesada 7ecb9778a3 Product Name is the project name 2013-09-19 18:12:02 -07:00
Ricardo Quesada 2ab1b2ff04 Lua template: ios and mac projects in one Xcode file 
Merged iOS and Mac projects into one single Xcode.proj file
 2013-09-19 17:05:00 -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 38b618bc4f Merge pull request #3661 from samuele3hu/developTest 
Modify AppDelegate.cpp file of multi-platform-lua for Design Resolution Size
 2013-09-17 18:36:21 -07:00
minggo c2e53d5673 Merge pull request #3665 from minggo/merge-physics 
Merge physics
 2013-09-17 08:18:55 -07:00
samuele3hu 0428cbbade Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 21:02:29 +08:00
samuele3hu 423e7adf93 Modify AppDelegate.cpp file of multi-platform-lua 2013-09-17 21:01:43 +08: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
samuele3hu cf5e04ad63 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 
Conflicts:
	samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
 2013-09-16 16:58:30 +08:00
samuele3hu b563c52e10 Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for the android projects 2013-09-16 16:55:16 +08:00
minggo 27381fc83f Merge pull request #3562 from bassarisse/develop 
Win32 icons on template
 2013-09-15 23:44:11 -07:00
Dhilan007 b827162113 issue #2800:Can not hide status bar on iOS 7 
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
 2013-09-13 16:18:58 +08:00
LinWenhai 368d668e7b Update RootViewController.mm 
fix not hide status on ios7
 2013-09-13 09:42:26 +08:00
LinWenhai 644c3ebff5 Update RootViewController.h 
Fix not hide status bar on iOS 7
 2013-09-13 09:40:43 +08:00
Bruno Assarisse 71c1e10fd8 Win32 icons on template 
Added icon to HelloCpp template, renamed the icon resource (so GLFW can
read it and put on window and taskbar), and removed unnecessary files
from projects.
 2013-09-09 00:42:36 -03:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
Huabing.Xu 4c12f4029a issue #2460: project template for glfw 2013-09-02 13:48:39 +08:00
samuele3hu 564a77edf6 issue #2433:Modify template/multi_platform_lua/Resources/hello.lua 2013-08-30 17:18:47 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
James Chen 0e1770ca82 issue #2732: [iOS] Adding 'Cocos2d.lua". 2013-08-27 16:57:10 +08:00
James Chen 64ab842a74 issue #2732: [iOS]Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:53:41 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
James Chen 6ed43811fe issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib). 2013-08-23 11:26:16 +08:00
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
folecr 5295b85d8e Update templates for Android 2013-08-05 19:14:47 -07:00
minggo 1d2b1c79c2 closed #2438:remove mac 32-bit support 2013-07-30 18:02:35 +08:00
samuele3hu 38a23890ff Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop 2013-07-30 09:55:28 +08:00
samuele3hu 3499aafd27 issue #2435:Lua template supports mac port 2013-07-30 09:51:15 +08:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
samuele3hu 3c953a934e issue #2404:Add more deprecated function and Modify template vs11 solution 2013-07-28 00:16:16 +08:00
minggo b6b56a252c make iOS template work ok on armv7s devices 
build only active architecture only
 2013-07-27 21:20:25 +08:00
James Chen 8721951cee Lua Template Fix. 2013-07-27 15:16:09 +08:00
James Chen 7839f769f2 Merge pull request #3265 from dumganhar/constants_fixes 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
 2013-07-25 23:21:29 -07:00
James Chen d345ac7f3f [Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache(); 2013-07-26 14:00:10 +08:00
minggo 5479dbe0b9 remove xcode template 2013-07-26 10:54:20 +08:00
minggo 7f3627ea00 remove android template 2013-07-26 10:52:39 +08:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +08:00
minggo 99949331b1 fix error and compilings error in templates 2013-07-24 17:27:29 +08:00
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
James Chen 1db847ad7c issue #2344: ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance 2013-07-22 17:24:54 +08:00