James Chen
|
f2a7814769
|
Merge pull request #6936 from Dhilan007/v3
fix faults of load project on Win 32.
|
2014-05-29 17:36:08 +08:00 |
Dhilan007
|
0739f40726
|
fix faults of load project on Win 32.
|
2014-05-29 17:30:55 +08:00 |
minggo
|
50fcb9a52b
|
Merge pull request #6935 from heliclei/config-proxies
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 17:19:19 +08:00 |
minggo
|
944f85de04
|
Merge pull request #6934 from lmskater/add-rebuild-job-to-watchdog
[Jenkins][ci skip] Add rebuild jobs to watchdog.py
|
2014-05-29 17:17:14 +08:00 |
heliclei
|
7d547cf9d2
|
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 16:55:22 +08:00 |
lm
|
f93a40ebde
|
[Jenkins][ci skip] Add rebuild jobs to watchdog.py
|
2014-05-29 15:50:24 +08:00 |
minggo
|
05df2a4db1
|
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
Fixing cmake project for win32
|
2014-05-29 15:25:58 +08:00 |
minggo
|
b68525ac1f
|
Merge pull request #6916 from John-He-928/mingw-build
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
|
2014-05-29 15:17:07 +08:00 |
minggo
|
e5cbe5439b
|
Merge pull request #6922 from zawasp/android_flicker
prevent flickering when opening another activity
|
2014-05-29 15:15:15 +08:00 |
minggo
|
b579fa3720
|
[ci skip]
|
2014-05-29 15:07:57 +08:00 |
minggo
|
dd693b1981
|
Merge pull request #6930 from CocosRobot/update_cocosfiles_1401343139
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-29 14:54:40 +08:00 |
minggo
|
bfb3567131
|
Merge pull request #6924 from minggo/remove-test-case
Remove test case
|
2014-05-29 14:54:28 +08:00 |
minggo
|
e48b14b55d
|
Merge pull request #6932 from Dhilan007/v3-labelfix
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:54:16 +08:00 |
minggo
|
4abf7bc749
|
[ci skip]
|
2014-05-29 14:48:47 +08:00 |
minggo
|
13415ffcd8
|
Merge pull request #6933 from CocosRobot/update_cocosfiles_1401343718
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-29 14:46:48 +08:00 |
CocosRobot
|
c441b869ec
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-29 06:08:40 +00:00 |
minggo
|
3182fd56b8
|
Merge pull request #6931 from VisualSJ/v3
Test case action name error
|
2014-05-29 14:07:23 +08:00 |
VisualSJ
|
dd2b7e036a
|
Test case action name error
|
2014-05-29 14:00:43 +08:00 |
Dhilan007
|
2a6158bae1
|
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:00:38 +08:00 |
CocosRobot
|
f393112ba6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-29 05:59:00 +00:00 |
minggo
|
209eb74691
|
Merge pull request #6929 from natural-law/v3
Update the reference of submodule plugin-x.
|
2014-05-29 13:57:53 +08:00 |
zhangbin
|
5dd0f6d14e
|
Update the reference of submodule plugin-x.
|
2014-05-29 13:56:36 +08:00 |
minggo
|
e5efb5931d
|
Merge pull request #6926 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-29 13:39:37 +08:00 |
zhangbin
|
db66cd866a
|
Update the reference of submodule cocos2d-console.
|
2014-05-29 13:37:26 +08:00 |
minggo
|
975f393a74
|
Merge pull request #6925 from Dhilan007/v3
[hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font.
|
2014-05-29 11:23:59 +08:00 |
Dhilan007
|
e1bb1c62c0
|
[hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font.
|
2014-05-29 10:26:07 +08:00 |
John_He
|
299e93bca7
|
Merge branch 'mingw-build' of github.com:John-He-928/cocos2d-x into mingw-build
|
2014-05-29 01:33:44 +08:00 |
John_He
|
44950a57f1
|
fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones.
|
2014-05-29 01:30:14 +08:00 |
Mircea Rila
|
23b7d76797
|
prevent flickering when opening another activity
|
2014-05-28 16:33:35 +03:00 |
minggo
|
d7cca2a044
|
closed #4819: remove KeyboardTest
|
2014-05-28 18:31:00 +08:00 |
minggo
|
0acc4cd961
|
issue #4819: remove KeyPadTest
|
2014-05-28 18:17:22 +08:00 |
minggo
|
0ad0f9c405
|
issue #4819: remove AccelerometerTest
|
2014-05-28 18:10:37 +08:00 |
minggo
|
120aa0f24e
|
Merge pull request #6921 from minggo/code-fix
coding style fix
|
2014-05-28 17:55:32 +08:00 |
minggo
|
2e7865a4f6
|
coding style fix
|
2014-05-28 17:41:34 +08:00 |
minggo
|
d4d2bbfdfd
|
[ci skip]
|
2014-05-28 15:26:29 +08:00 |
minggo
|
8f274e5a99
|
Merge pull request #6918 from minggo/fix-object-leak
Fix NSNotificationCenter and NSTimer leaks
|
2014-05-28 15:23:37 +08:00 |
minggo
|
2e70380dd9
|
invalidate NSTimer instance in destroy to prevent memory leak
|
2014-05-28 15:19:07 +08:00 |
minggo
|
013b3a328f
|
remove keyboard notifications from NSNotificationCenter
|
2014-05-28 15:17:26 +08:00 |
minggo
|
c88ecb0a43
|
Merge pull request #6917 from CocosRobot/update_cocosfiles_1401256188
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-28 14:37:30 +08:00 |
CocosRobot
|
73f3361b0e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-28 05:49:49 +00:00 |
minggo
|
3d3fb6ad7e
|
Merge pull request #6914 from andyque/refactorLayoutExecutant
refactor: rename UILayoutExecutant to UILayoutManager
|
2014-05-28 13:47:54 +08:00 |
John_He
|
2aa4b9936c
|
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform.
|
2014-05-28 12:37:35 +08:00 |
minggo
|
a5fe9be8a2
|
Merge pull request #6915 from samuele3hu/v3_fix
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:37:33 +08:00 |
samuele3hu
|
36ef9d7dd7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-28 10:28:38 +08:00 |
samuele3hu
|
90cac02de6
|
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:27:03 +08:00 |
andyque
|
769300d25e
|
rename UILayout
Executant.h to UILayoutManager.h
|
2014-05-28 10:17:34 +08:00 |
andyque
|
c5a118ee1b
|
refactor UILayoutExecutant to LayoutManager
|
2014-05-28 10:11:49 +08:00 |
minggo
|
592831b8fb
|
Merge pull request #6913 from samuele3hu/v3_fix
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:10:13 +08:00 |
samuele3hu
|
c52132179a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-28 10:05:41 +08:00 |
samuele3hu
|
04d2d4a22e
|
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:04:29 +08:00 |