Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,296 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

24296 Commits

Author SHA1 Message Date
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
XiaoYang d419fd64c2 Merge pull request #133 from songchengjiang/light_new 
Modified Light Shader
 2014-09-25 09:59:50 +08:00
minggo efa1c86fc5 Merge pull request #8103 from cpascal/fix_no_physics 
Fixed compile error when I turned off physics definitions.
 2014-09-25 09:56:45 +08:00
honghui 8079722aff Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-25 09:55:00 +08:00
minggo cebde4181b [ci skip] 2014-09-25 09:43:11 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
toma d1faf75b58 [CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty 2014-09-25 01:46:17 +09:00
Dale Stammen 1146f1a8db use CCGLViewImpl.h 2014-09-24 08:38:48 -07:00
andyque 3c434ec354 remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp 2014-09-24 17:47:38 +08:00
minggo 14f92759a4 Merge pull request #8135 from CocosRobot/update_cocosfiles_1411549411 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-24 17:21:52 +08:00
Huabing.Xu cc39ed288a android can link with neon(neon code has some bugs) 2014-09-24 17:21:38 +08:00
CocosRobot 02d343fefc [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 09:03:33 +00:00
minggo f50bc7a481 Merge pull request #8134 from andyque/removeDeplicatedFile 
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
 2014-09-24 17:01:29 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
Huabing.Xu 2a75b7192a enable neon on IOS and refactor code 2014-09-24 16:12:47 +08:00
yestein b19b2c5786 replace tab to 4 spaces 2014-09-24 15:14:47 +08:00
minggo 79446999bb Merge pull request #8116 from Dhilan007/v3-labelfix 
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
 2014-09-24 15:03:40 +08:00
minggo dd3c295caa Merge pull request #8125 from cpascal/fix_invalid_windows_definition 
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
 2014-09-24 15:02:30 +08:00
minggo f88685be8e [ci skip] 2014-09-24 15:02:03 +08:00
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
minggo 20c0ec7301 Merge pull request #8132 from CocosRobot/update_cocosfiles_1411537404 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-24 13:50:55 +08:00
CocosRobot 78b51b3ffd [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 05:43:25 +00:00
minggo 0dd889683e Merge pull request #8129 from andyque/fixSubmodule 
remove submodule, use download.py instead
 2014-09-24 13:41:33 +08:00
andyque a158b79fb6 add more prompt to debug 2014-09-24 12:57:47 +08:00
andyque d066d02be5 add downloading prompt 2014-09-24 12:53:30 +08:00
andyque f8a05c9e1e recheck download.py 2014-09-24 12:42:53 +08:00
andyque 972c5f8ab2 adjust config 2014-09-24 12:03:17 +08:00
andyque a0d6bbbf9a add back config.json 2014-09-24 12:01:34 +08:00
honghui b513dbafb5 read config.json may failed caused by syntax error 2014-09-24 11:43:21 +08:00
yestein 72c5d77273 Add Cocostudio Armature getOffsetPoints API for Lua 2014-09-24 11:20:36 +08:00
minggo 2f3e64ab0c Merge pull request #8128 from CocosRobot/update_cocosfiles_1411527466 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-24 11:16:32 +08:00
Huabing.Xu e1d11ae5c3 move sse code to mathUtil.cpp 2014-09-24 11:06:07 +08:00
minggo 8ce2b152c2 [ci skip] 2014-09-24 10:58:06 +08:00
CocosRobot 671739e9a8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 02:57:48 +00:00
minggo 5d59890455 Merge pull request #8127 from newnon/v3_precompiled_headers 
Precompiled headers improvements
 2014-09-24 10:55:45 +08:00
Huabing.Xu b18e0501fc move code to mathUtil.cp 2014-09-24 10:32:29 +08:00
andyque ceb4932fd1 remove submodule 2014-09-24 10:27:53 +08:00
andyque 7e9ede728f revert download.py and delete submodule 2014-09-24 10:26:56 +08:00
Sergey Perepelitsa 0a46a83794 fix missing includes 2014-09-23 23:19:25 +04:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dale Stammen b9c57f7e28 changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist 2014-09-23 10:39:17 -07:00
Dale Stammen 2226aa5c8a need to reset the accelerometer before trying to enable it again 2014-09-23 10:01:42 -07:00
Huabing.Xu e74b2f3164 add macro to enable neon on IOS 2014-09-23 18:15:26 +08:00
minggo a5724a5be4 Merge pull request #8126 from minggo/v3 
update submodule
 2014-09-23 17:22:22 +08:00
songchengjiang d956148a94 Tab Format 2014-09-23 17:19:27 +08:00
minggo a711ca1b3d update submodule 2014-09-23 17:14:52 +08:00
minggo a51254decf Merge pull request #8124 from Dhilan007/v3-res 
Add audio resource.
 2014-09-23 17:10:50 +08:00
songchengjiang b51dc584d5 Light optimization 2014-09-23 17:08:28 +08:00