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

391 Commits

Author SHA1 Message Date
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08: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
Ricardo Quesada 3cbeabc777 Icons for test projects 2013-10-16 11:55:14 -07:00
James Chen f6275667bf Removing unused ios projects. 2013-10-12 15:02:28 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +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
samuele3hu b5ee16399c issue #2768:Modify the linux make files of the liblua 、the testlua and hellolua projects 2013-10-10 11:09:09 +08:00
samuele3hu 508654738a issue #2768:Modify armature test sample and skip some functions to lua 2013-10-08 15:45:13 +08:00
samuele3hu 4c1bd825af Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-08 10:17:58 +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
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
samuele3hu 54e0fd9a63 Modify Accelerometer Test sample 2013-09-20 22:05:37 +08:00
minggo 1878fa6041 Merge pull request #3694 from dabingnn/release30_bug_hot_fix 
rename test case to correct name
 2013-09-18 03:33:46 -07:00
Huabing.Xu 19e37d284e rename test case to correct name 2013-09-18 18:26:03 +08:00
minggo ff3fcf5eb7 Merge pull request #3690 from dabingnn/release30_bug_hot_fix 
glfw EGLView alloc on the stack to prevent memory leak
 2013-09-18 02:44:34 -07:00
samuele3hu d4669f3ad4 replace tabs with spaces 2013-09-18 17:19:34 +08:00
Huabing.Xu a2dee37b0e glfw EGLView set alloc on the stack to prevent memory leak 2013-09-18 17:00:21 +08:00
samuele3hu 567dd00710 Modify Accelerometer lua test sample 2013-09-18 16:44:05 +08:00
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00
samuele3hu 3809a6feed Repair some lua test samples bug and del tool/tolua++ folders 2013-09-17 13:59:48 +08:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename 
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
 2013-09-15 20:13:51 -07:00
samuele3hu 6efe3e7eeb issue #2794:Add a newline 2013-09-16 10:04:58 +08:00
samuele3hu 1e093868c8 issue #2768:Modify testlua and hellolua sample's linux mayflies. 2013-09-15 09:53:08 +08:00
samuele3hu 95831eb70f issue #2768:Add a newline 2013-09-14 20:00:26 +08:00
samuele3hu 85ca0136f0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Bridge 2013-09-14 19:53:08 +08:00
samuele3hu aa4c90e97a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	extensions/cocos-ext.h
 2013-09-14 19:29:36 +08:00
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 2013-09-13 19:06:09 +08:00
Dhilan007 18f2f831b4 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:07:02 +08:00
James Chen da1101beeb [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
samuele3hu 29f0909714 issue #2768:Add LuaObjectBridge and LuaJavaBridge 2013-09-11 09:48:24 +08:00
samuele3hu 357466bab2 issue #2768:Add Armature lua binding and releated test samples 2013-09-09 10:20:32 +08:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
samuele3hu 32d056df18 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TableView 2013-09-04 14:03:21 +08:00
samuele3hu 6815e01f84 issue #2764:Add TableView lua binding and releated test sample 2013-09-04 14:02:22 +08:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
samuele3hu 5ee2a7e58e issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator 2013-08-30 17:15:16 +08:00
samuele3hu f184d7cd8f issue #2433:Replace ccDraw** in DrawPrimitives with draw** 2013-08-30 15:06:00 +08:00
samuele3hu f56c6f7087 issue #2433:Modify platform config and some test samples 2013-08-30 11:56:35 +08:00
James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 
Conflicts:
	scripting/auto-generated
 2013-08-27 16:59:59 +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
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes 
Remove unneeded codes
 2013-08-26 23:23:41 -07:00
minggo e567b6c54b fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
samuele3hu e557b6b7c2 issue #2433:Add lua deprecated fiel and modify some test samples 2013-08-23 16:12:59 +08:00
samuele3hu 5f6d9815ca issue #2433:Modify platform config and some test samples 2013-08-22 15:06:34 +08:00
samuele3hu bea62800b4 issue #2433:Modify TestLua samples and add some manual binding code 2013-08-22 10:16:57 +08:00
samuele3hu 39686ea503 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-20 13:46:26 +08:00
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
samuele3hu de3335a4a9 issue #2433:Update lua manual binding and modify some samples 2013-08-16 10:12:46 +08:00
samuele3hu 7f8099ce69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	tools/bindings-generator
 2013-08-15 16:21:32 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
folecr cbd7796438 Update nojava.txt with readme. 2013-08-07 12:29:58 -07:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
folecr 1721e90e3d Update TestLua 2013-08-05 16:41:34 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
Lee, Jae-Hong 4beeda2294 [Tizen] Fix compile error. 2013-07-30 15:43:05 +09:00
James Chen 5aab0cab7b [Android] Fixing build errors for ndk-r9. 2013-07-29 14:54:00 +08:00
samuele3hu a6d2ab40f0 Modify ActionTest sample of lua to add draw functions 2013-07-29 11:44:56 +08:00
samuele3hu af9f6fbe3a issue #2404:Add more deprecated function and modify some test sample 2013-07-27 17:20:22 +08:00
samuele3hu faa0b46f57 issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample 2013-07-27 10:42:22 +08:00
samuele3hu a6e514f3d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 00:36:20 +08:00
samuele3hu 016593bd0e issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample 2013-07-27 00:28:06 +08:00
samuele3hu bc83304e23 issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function 2013-07-26 22:50:45 +08:00
samuele3hu 70fcf47a3e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-26 21:39:34 +08:00
James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 19:56:04 +08:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
samuele3hu 273bdc8fbd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator 2013-07-26 14:35:40 +08:00
James Chen d345ac7f3f [Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache(); 2013-07-26 14:00:10 +08:00
samuele3hu 2288280b2d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator 2013-07-26 13:57:11 +08:00
samuele3hu f49277d367 issue #2404:replace deprecated functions in testlua and hellolua sample 2013-07-26 13:43:28 +08:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +08:00
samuele3hu 11d7c9c653 issue #2404:Add more functions to Deprecated.lua and modify some .pkg files 2013-07-25 19:58:59 +08:00
samuele3hu 8e0a3b16a1 issue #2429:LuaWebSocket supports sending binary string passed by lua 2013-07-24 15:42:32 +08:00
samuele3hu 5b888d44e4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-24 15:34:32 +08:00
samuele3hu ff980477d7 issue #2429:LuaWebSocket supports passing binary string buffer to c++ 2013-07-24 15:33:37 +08:00
minggo ff0cbb9d0b Merge pull request #3232 from samuele3hu/TestSample 
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
 2013-07-23 23:33:28 -07:00
samuele3hu a52bab7a66 issue #2426:Modify coding style 2013-07-24 11:51:24 +08:00
samuele3hu 4f1a46136a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-24 10:15:39 +08:00
samuele3hu e9df175e9a issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample 2013-07-24 10:15:16 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07: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
James Chen 2228614748 issue #2344: JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now. 2013-07-22 17:12:53 +08:00
Ricardo Quesada 89d210bdb3 CCAssert -> CCASSERT 
and other best pracitces like:

capacity and "index" are ints and not unsigned int (google's recomendation).
 It is easier to detect underflow bugs like this

plus other minor improvements
 2013-07-19 22:01:27 -07: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
Ricardo Quesada ba6ab126c6 More best practices fixes 
- class order fixes
  - static methods (creators) at the beginning
  - then constructors / destructors
  - then init
- more `const` fixes
  - adds some const getters
  - some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
 2013-07-18 16:30:19 -07:00
samuele3hu 847b87b297 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-17 14:45:02 +08:00
James Chen d3bf9935cd Merge pull request #3166 from dumganhar/iss2410-blackscreen-android 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
 2013-07-16 23:25:01 -07:00