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

20315 Commits

Author SHA1 Message Date
minggo 04ddc00e3f Merge pull request #6953 from lmskater/fix-post-build 
[Jenkins][ci skip] Fix proxy address in post-build.py
 2014-06-03 13:46:35 +08:00
lm be3f88c4ce [Jenkins][ci skip] Fix proxy address in post-build.py 2014-06-03 11:48:52 +08:00
minggo 26a4eaaac7 Merge pull request #6939 from dabingnn/v3FixAndroid 
V3 fix android
 2014-06-03 10:26:01 +08:00
minggo a69a98776d Merge pull request #6943 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-30 15:36:52 +08:00
zhangbin 1d95d9a04b Update the reference of submodule cocos2d-console. 2014-05-30 15:35:25 +08:00
minggo e41f163483 [ci skip] 2014-05-30 15:25:37 +08:00
minggo 8b34550420 Merge pull request #6942 from minggo/memory-leak-sprite-frame-cache 
Memory leak sprite frame cache
 2014-05-30 15:23:04 +08:00
minggo e76feceada fix coding style 2014-05-30 15:13:59 +08:00
minggo 402dc9f9ce fix memory leak 2014-05-30 15:10:57 +08:00
minggo 20a9d3046a Merge pull request #6937 from wefiends/Mac-UserDefault 
CCUserDefault.cpp: Should not compile on Mac platform
 2014-05-30 14:48:09 +08:00
minggo 50fc1e23c5 Merge pull request #6940 from lmskater/fix-proxy 
[Jenkins][ci skip] Fix proxy address to jenkins config
 2014-05-30 13:47:08 +08:00
lm 3520e7da0b [Jenkins][ci skip] Fix proxy address to jenkins config 2014-05-30 12:51:54 +08:00
Huabing.Xu 2e42c77b9a fix typo 2014-05-30 11:13:53 +08:00
Huabing.Xu 95b6fb52de only use _backToForeGroundListner when on Android 2014-05-30 10:56:03 +08:00
Huabing.Xu 41d19007eb Merge branch 'v3.1hotfix' into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
 2014-05-30 10:19:56 +08:00
Nick Barrios 7bac05a497 CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation). 2014-05-29 10:36:15 -04:00
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
minggo f4d8e396e2 Merge pull request #6919 from dabingnn/v3.1hotfix 
V3.1hotfix
 2014-05-29 14:32:24 +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
Huabing.Xu 8633ab9c14 add background/foreground listener for EffectSprite/Effect framework test case 2014-05-29 12:43:04 +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
Huabing.Xu ad3b1cf827 add background/foreground listener for Effectsprite3d/Effect3d test case 2014-05-28 21:07:12 +08: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