James Chen
|
d7f15a971a
|
Merge pull request #3692 from dumganhar/iss2087-new-event-dispatcher
issue #2087: Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener.
|
2013-09-18 02:49:52 -07:00 |
James Chen
|
f7fa92aea9
|
issue #2087: Sorts listeners only when flag is dirty. setPriority is only valid in fixed priority listener.
|
2013-09-18 17:46:00 +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 |
James Chen
|
40a6f84585
|
Merge pull request #3680 from Dhilan007/develop
1.android platform:handle key event and fix Accelerometer value error [ci skip]
|
2013-09-18 00:01:32 -07:00 |
minggo
|
c1d7cc0f29
|
Merge pull request #3684 from minggo/develop
upstream to js tests
|
2013-09-17 23:25:00 -07:00 |
minggo
|
6f196e1470
|
upstream to js tests
|
2013-09-18 14:24:21 +08:00 |
minggo
|
801b7831df
|
Merge pull request #3671 from chengstory/#4684
Remove unused files from mk files.
|
2013-09-17 22:08:38 -07:00 |
Dhilan007
|
fd3a03a6ee
|
1.android platform:handle key event
2.android platform:fix Accelerometer value error
|
2013-09-18 12:04:35 +08:00 |
zhangcheng
|
820b8630dc
|
1. fixes failed to build linux.
|
2013-09-18 11:51:14 +08:00 |
minggo
|
40d91f0afa
|
disable compressing png when deploying for iOS device
|
2013-09-18 11:16:28 +08:00 |
James Chen
|
f403f7d683
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test
Conflicts:
samples/samples.xcodeproj/project.pbxproj
|
2013-09-17 23:24:14 +08:00 |
James Chen
|
e563c27994
|
Keypad event fix for js and lua bindings.
|
2013-09-17 23:21:45 +08:00 |
minggo
|
c2e53d5673
|
Merge pull request #3665 from minggo/merge-physics
Merge physics
|
2013-09-17 08:18:55 -07:00 |
James Chen
|
513237d5f6
|
Fixing armature test crash.
|
2013-09-17 23:03:33 +08:00 |
zhangcheng
|
c065dd2920
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 22:41:42 +08:00 |
James Chen
|
7d94878173
|
[win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32.
|
2013-09-17 22:34:20 +08:00 |
CaiWenzhi
|
1f45bad5e7
|
Modify guy example
|
2013-09-17 21:19:04 +08:00 |
zhangcheng
|
ec401d1148
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684
|
2013-09-17 21:15:36 +08:00 |
zhangcheng
|
b86a8271d9
|
1. Upload Cocostudio Action.
|
2013-09-17 21:14:45 +08:00 |
CaiWenzhi
|
f42797bc0d
|
Merge branch 'develop' into Merge_GUI_to_Develop
|
2013-09-17 20:43:16 +08:00 |
CaiWenzhi
|
9d07b2c1d2
|
Temp commit
|
2013-09-17 20:13:23 +08:00 |
minggo
|
ba820790ec
|
Merge https://github.com/cocos2d/cocos2d-x into merge-physics
|
2013-09-17 20:06:33 +08:00 |
James Chen
|
81df48b264
|
Updating submodule of JS-Test.
|
2013-09-17 19:32:15 +08:00 |
minggo
|
ddaff9cce6
|
make cocos2dx depend chipmunk
|
2013-09-17 19:24:30 +08:00 |
minggo
|
d488796896
|
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics
|
2013-09-17 18:14:12 +08:00 |
James Chen
|
43e98be8b7
|
Adding resources of CocoStudio GUI Test.
|
2013-09-17 17:46:40 +08:00 |
James Chen
|
beb8fa0b34
|
Merge branch 'develop' into box2d_test_bed_fix
|
2013-09-17 17:21:54 +08:00 |
James Chen
|
3fa539081f
|
Merge pull request #3644 from samuele3hu/developTest
Modify some lua test samples bug and delete tool/tolua++ folder[ci skip]
|
2013-09-17 01:41:50 -07:00 |
boyu0
|
acbb50b543
|
issue #2771: edit Xcode project setting.
|
2013-09-17 16:28:32 +08:00 |
boyu0
|
5040ae33a1
|
issue #2771: add comments
|
2013-09-17 16:27:43 +08:00 |
boyu0
|
270bd997cc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 14:46:36 +08:00 |
boyu0
|
0a53a12f51
|
issue #2771: update project setting
|
2013-09-17 14:31:43 +08:00 |
samuele3hu
|
3809a6feed
|
Repair some lua test samples bug and del tool/tolua++ folders
|
2013-09-17 13:59:48 +08:00 |
zhangcheng
|
a25c2cabf8
|
1. Fixes failed to build windows.
2. Upload CocoGUI Resources.
|
2013-09-17 13:25:15 +08:00 |
James Chen
|
9cd99f4c66
|
[Android] ArmatureTest compilation fix.
|
2013-09-17 11:56:00 +08:00 |
James Chen
|
fe1b11a814
|
Fixing wrong include.
|
2013-09-17 11:28:33 +08:00 |
boyu0
|
9f7bf4349c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-17 11:19:47 +08:00 |
boyu0
|
54f7146d5f
|
issue #2771: update vs project setting
|
2013-09-17 11:18:53 +08:00 |
James Chen
|
480b2dd1d8
|
[Linux] Updating Makefile for TestCpp.
|
2013-09-17 10:52:42 +08:00 |
James Chen
|
28b266bc5e
|
[Android] Android.mk fixes after adding GUI test.
|
2013-09-17 10:49:59 +08:00 |
James Chen
|
650e6ad6fc
|
issue #2087: [dispatcher] Updating MenuTest.
|
2013-09-17 10:46:31 +08:00 |
boyu0
|
481ad7ef12
|
issue #2771: update project setting
|
2013-09-17 10:41:08 +08:00 |
James Chen
|
365419a8b2
|
issue #2087: [dispatcher] Fix box2d_test crash.
|
2013-09-16 23:35:16 +08:00 |
boyu0
|
f96bc2355a
|
issue #2771: update android.mk
|
2013-09-16 22:56:20 +08:00 |
James Chen
|
157ffa9299
|
Merge pull request #3627 from nutty898/Merge_GUI_to_Develop
Merge gui to develop 3.0 branch
|
2013-09-16 07:45:23 -07:00 |
CaiWenzhi
|
f983155d7c
|
Modify scene sample
|
2013-09-16 22:29:53 +08:00 |
boyu0
|
a48fee881d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-16 22:16:50 +08:00 |