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

20344 Commits

Author SHA1 Message Date
samuele3hu a4cb0c183a Update Linux CMakeLists for xxtea 2014-06-05 10:54:05 +08:00
samuele3hu c785d64ba1 Adjust the xxtea directory structure and modify configs files for platforms 2014-06-04 11:50:04 +08:00
samuele3hu 3fddb798ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-04 10:00:52 +08:00
samuele3hu e1310e2660 Adjust the xxtea directory structure and modify some grammar expressions 2014-06-04 09:59:29 +08:00
minggo 2d866de146 Merge pull request #6961 from minggo/treat-warning-as-error 
not treat warnings as error
 2014-06-04 09:46:30 +08:00
minggo cb10fb560a not treat warnings as error 2014-06-04 09:44:34 +08:00
minggo 8a6a0968ef [ci skip] 2014-06-03 18:20:01 +08:00
minggo a6a686bef1 [ci skip] 2014-06-03 18:17:37 +08:00
minggo e33871db9a Merge pull request #6958 from Dhilan007/v3 
fixed EVENT_COME_TO_BACKGROUND has not been sent on android.
 2014-06-03 18:16:04 +08:00
Dhilan007 9e6304d84c fixed EVENT_COME_TO_BACKGROUND has not been sent on android. 2014-06-03 18:10:22 +08:00
minggo 3d576d8068 [ci skip] 2014-06-03 18:02:37 +08:00
minggo 7817b27844 Merge pull request #6957 from andyque/fixScale9Sprite 
fix scale9Sprite can't culling problem
 2014-06-03 18:00:47 +08:00
andyque 1d5d1f011e fix scale9Sprite can't culling problem 2014-06-03 17:52:41 +08:00
samuele3hu 404db49538 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-03 17:17:11 +08:00
samuele3hu 55bb9a7d09 Update setting for different platform 2014-06-03 17:15:28 +08:00
minggo c1bb5d8803 [ci skip] 2014-06-03 16:58:53 +08:00
minggo 96d697a670 [ci skip] 2014-06-03 14:40:20 +08:00
minggo 691a77b148 Merge pull request #6928 from boyu0/bug5392_scheduleUpdate 
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
 2014-06-03 14:38:07 +08:00
minggo 90136b2634 [ci skip] 2014-06-03 14:36:15 +08:00
minggo 7b4ae98098 Merge pull request #6944 from minggo/treat-warning-as-error 
Treat warning as error on iOS and Mac
 2014-06-03 14:31:18 +08:00
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
samuele3hu 5b3f3da428 update console submodule 2014-06-03 10:13:23 +08:00
samuele3hu 691e606b34 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 
Conflicts:
	tools/cocos2d-console
 2014-06-03 09:58:57 +08:00
samuele3hu b91d8255bd Add xxtea encrypt support for lua and update the console submodule 2014-06-03 09:55:57 +08:00
boyu0 56590f09eb change comment. 2014-05-30 17:40:35 +08:00
boyu0 dd0771852f change comment. 2014-05-30 17:36:54 +08:00
minggo 4b979d67db issue #5429: treat warning as error on Mac 2014-05-30 16:46:01 +08:00
minggo 70f3510a27 issue #5429: treat warning as eror on iOS 2014-05-30 16:21:31 +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