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
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
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
James Chen 56419b9e90 issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 
Reset the order of reloading shaders and textures in main.cpp.
 2013-07-17 12:53:30 +08:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
James Chen 33c37f5f9d issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance. 2013-07-12 14:44:24 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 1f8e852020 issue #2397: Shader::sharedShaderCache() --> Shader::getInstance(). 2013-07-12 13:40:01 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
Jaroslaw Lewandowski 626ba2686f Solving 'black screen' on android 2013-07-09 21:21:43 +01:00
James Chen cd2fae36f1 issue #2371: Updating multi-platform-template for iOS and Mac 2013-07-05 10:31:20 +08:00
Keiran Tai dde6250159 Regenerated xcode4 templates plist files due to missing few important files and causes compile error 2013-07-04 11:13:15 +08:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 88a0dbec5e Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 21:29:25 +08:00
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
loong0 1e6d5da5ac merge the conflict copy_files.sh 2013-06-21 07:24:01 +08:00
James Chen d1bd34fd08 issue #2129: Removing CC prefix for template. 2013-06-20 22:18:43 +08:00
loong0 202c44a108 not copy the java lib 2013-06-19 23:40:36 +08:00
James Chen 247dcb7a4c [win32] multi-platform-xxx template only support vs2012 now. 2013-06-19 15:23:09 +08:00
James Chen 74e9be0a85 Removing blackberry template, please use tools/project-creator instead. 2013-06-19 15:23:09 +08:00
James Chen 2c0cc603d1 Merge branch 'master' into develop 
Conflicts:
	extensions/cocos-ext.h
 2013-06-18 10:46:25 +08:00
James Chen a828d5f1a6 [Windows] multi-platform-lua fix. 2013-06-17 15:55:37 +08:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
loong0 c1137c991d debug script modified 2013-06-16 19:25:20 +08:00
loong0 a69d8ee43e add copying of the java library 2013-06-15 14:20:43 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
minggo e8fb1f4da0 copy lua script when creating a project by create-android-project.sh 2013-06-10 22:35:05 +08:00
James Chen be0efac2d7 [Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj. 2013-06-10 14:57:18 +08:00
James Chen b9e0be8d10 [Template] Updating multi-platform-lua/proj.marmalade/HelloLua.mkb. 2013-06-10 14:55:26 +08:00
James Chen 1e527c1d52 [Template] Updating iOS template project of multi-platform-lua. Using AudioEngine module. 2013-06-10 14:20:53 +08:00
James Chen 47b2a65faf [Template] Updating iOS template project of multi-platform-cpp. 2013-06-10 14:18:24 +08:00
James Chen cd40b42761 [Android] Updating multi-platform-lua/proj.android/.project 2013-06-10 13:19:16 +08:00
James Chen 6986acf8a4 [Win32] Deleting vs template, please use 'tools/project-creator' to create multi-platform project instead. 2013-06-10 12:26:54 +08:00
James Chen 328282f88f CCScriptEngineManager::sharedManager()->purgeSharedManager(); --> CCScriptEngineManager::purgeSharedManager(); 2013-06-10 11:54:23 +08:00
minggo bd660e708d issue #2103: copy lua script in lua multi-platform project 2013-06-09 11:39:18 +08:00
minggo 0e66dc8712 issue #2103: add lua files for lua multi-template project 2013-06-09 11:06:30 +08:00
James Chen 7c650d7f28 [BB] Updating project configuration. 2013-06-07 18:45:58 +08:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
James Chen ec8ab8bd8b Updating multi-platform-xxx template for win32. 2013-06-07 12:57:28 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
James Chen d5bbcce165 [iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp. 2013-06-06 18:09:44 +08:00
James Chen 6f52d72b82 [iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp. 2013-06-06 18:07:11 +08:00
James Chen d32eaedd59 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 
Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
 2013-06-06 15:05:54 +08:00
James Chen f22d320797 Removing CODE_SIGN_IDETITY section in prom.pbxproj. 2013-06-06 14:24:58 +08:00
minggo d71e07db4e fixed conflict 2013-06-05 13:48:31 +08:00
minggo b0937a5a2d issue #2257:change copyright of template 2013-06-05 11:25:39 +08:00
minggo 6491ff75cf issue #2257: make ios template work 2013-06-05 11:21:04 +08:00
loong0 c23267834b smarter script for creating android project 2013-06-04 22:21:41 +08:00
James Chen bb635c280c Updating multi-platform-xxx template for iOS and Android after enabling c++ 11. 2013-06-04 20:52:29 +08:00
James Chen b88a222fc5 Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 20:37:24 +08:00
James Chen 3b673547cc Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 19:49:03 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
James Chen d402b349e2 issue #2092: Updating win32 project configuration. 2013-05-20 21:12:25 +08:00
James Chen f6297aeb33 Updating iOS template. 2013-05-20 21:06:37 +08:00
James Chen 78000c70fc [iOS] Template fix. 2013-05-19 18:12:14 +08:00
James Chen 3ce8de8904 [BB]Adding COCOS2D_DEBUG=1 . 2013-04-27 15:17:18 +08:00
James Chen 7f128cfd11 [BB] Updating project configuration of multi-platform-lua. 2013-04-27 15:16:29 +08:00
James Chen 02afbaaa53 Fixing errors in multi-platform-lua for BB. 2013-04-27 15:08:28 +08:00
James Chen cf53d264f9 [Blackberry] Adding .gitkeep, updating bb project for multi-platform-lua 2013-04-27 15:04:55 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
James Chen ec3d870231 [Linux]Updating template of multi-platform-cpp 2013-04-27 11:18:09 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
James Chen 5337234e22 Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted. 2013-04-25 21:31:52 +08:00
James Chen 2c69ce8d80 fixed #2075: Updating multi-platform template project settings. 2013-04-24 15:56:37 +08:00
James Chen f129b94e2d Removing unused file(uthash.h) in JSB projects. 2013-04-19 11:09:02 +08:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
James Chen c311085dea issue #1847: Updating multi-platform-lua/proj.ios/HelloLua.xcodeproj. 2013-04-17 10:00:56 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
James Chen 854944c272 Updating iOS template. 2013-04-09 15:30:37 +08:00
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
fape 9c6a65d898 Update template android projects README files 2013-03-21 19:06:58 +01:00
minggo ae9675c3bd fix some bugs when creating android project with multi-platform tool 2013-03-21 06:20:19 +08:00
minggo 2430f28ea1 Merge https://github.com/dumganhar/cocos2d-x into test-damganhar 2013-03-21 05:33:17 +08:00
James Chen daea6ed3ea Removing unused codes. 2013-03-20 23:19:55 +08:00
James Chen 3f43456072 Updating multi-platform templates. 2013-03-20 23:18:41 +08:00
James Chen f7d3a23a98 Updating the template of multi-platform-js for win32. 2013-03-20 22:45:41 +08:00
minggo 666279e30d don't modify .project file when creating a new android project 2013-03-20 20:54:31 +08:00
James Chen 6a98553633 Synchronizing the submodule reference of cocos2d-js-test to the latest one. 2013-03-18 18:24:37 +08:00
minggo 58618172e6 merge pull request and fix some conflicts 2013-03-18 16:15:48 +08:00
James Chen ae1c64573e Merge pull request #2046 from rohankuruvilla/eclipse 
fixed #1827: Eclipse Project import - Documentation Added and Tested.
 2013-03-12 01:36:17 -07:00
James Chen 32a8eb45f4 Updating the template of muti-platform-js. 2013-03-11 22:44:10 +08:00
Sam Clegg 9eb9524659 Add 'make run' target for linux projects. 
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
  build system.
- Remove redundant main.h files.
 2013-03-08 10:01:03 -08:00
Rohan Kuruvilla 360519dad5 Removing /bin/bash for executing build command, and keep only bash 2013-03-07 12:09:17 -08:00
minggo 3cb4ab8f31 issue #1529:update xcode template 2013-03-07 10:41:45 +08:00
Rohan Kuruvilla 297f46c69e Adding README files to project creation template 2013-03-04 11:50:39 -08:00
Rohan Kuruvilla 4e7c0a8213 Adding updated .project file in templates 2013-03-04 11:50:39 -08:00
Rohan Kuruvilla 8035562dfa Adding Eclipse Project files in template directory for new Javascript projects 2013-03-04 11:50:38 -08:00
Rohan Kuruvilla 53be6102f4 Adding Eclipse Project files for C++ projects 2013-03-04 11:50:38 -08:00
Nika Mamulashvili 1cabb1c9cd Corrected Missing ccUTF8.h & ccUTF8.cpp File Links 2013-02-28 17:00:22 +04:00
James Chen 831ec120ff Merge pull request #2033 from xyhl515/master 
fixed #1746: Added VS2012 Express template installing support.
 2013-02-24 18:13:28 -08:00
walzer 37779a2e1a don't need to remove assets/Images/test_*.pvr.gz files in multi-platform-cpp template 2013-02-24 16:15:05 +08:00
xyhl515 1eed0b5663 Add VS2012 Express For Windows Desktop support in install-templiates-msvc.bat 2013-02-23 21:21:58 +08:00
James Chen 7f7f44c05c issue #1733: Updated template/multi-platform-lua/proj.win32/HelloLua.sln. 2013-02-21 17:53:01 +08:00
James Chen 98f5ac3d0b Merge pull request #2020 from walzer/project-creator 
tools/project-creator works for lua and cpp templates.
 2013-02-21 01:50:37 -08:00