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 |
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 |