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

20240 Commits

Author SHA1 Message Date
Ricardo Quesada 7e4597508c Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
Ricardo Quesada 0cfc7827de Merge pull request #6769 from ricardoquesada/interpolate_fix 
default value is 0.5 for interpolation
 2014-05-15 16:52:47 -07:00
Ricardo Quesada f9f0142842 default value is 0.5 for interpolation 2014-05-15 16:52:15 -07:00
Ricardo Quesada 83617c8c38 Merge pull request #6768 from ricardoquesada/uniform_texture_0 
uniform sampler CC_Texture0 MUST NOT be defined on shaders
 2014-05-15 16:48:18 -07:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
Ricardo Quesada 760ee57c14 Merge pull request #6767 from ricardoquesada/sprite_multiple_pass 
multiple pass sprite
 2014-05-15 13:14:14 -07:00
Ricardo Quesada e5494cd9e5 multiple pass sprite 
on ShaderSprite2.cpp
 2014-05-15 13:13:31 -07:00
Mazyad Alabduljaleel 71d3decbe2 [NEW]: added pure reference synthesizer 2014-05-15 20:49:20 +04:00
minggo a8c21dcf9f [ci skip] 2014-05-15 19:59:51 +08:00
minggo 6dea951ac6 Merge pull request #6744 from NatWeiss/patch-8 
Fix compilation error using arch i386
 2014-05-15 19:57:40 +08:00
James Chen 150c78378b Merge pull request #6765 from CocosRobot/update_cocosfiles_1400149858 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-15 18:37:06 +08:00
CocosRobot b9562e5dbf [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-15 10:30:59 +00:00
James Chen 14639d812e Update config.gitingore 2014-05-15 18:29:54 +08:00
minggo 9f67e74878 Merge pull request #6764 from minggo/monkey-test 
EditBox: Check text content before being sent to cpp
 2014-05-15 18:22:35 +08:00
cocoscodeide bad30e4b66 Merge pull request #12 from bofeng-song/v3 
add support for reverse orientation for android
 2014-05-15 18:07:14 +08:00
bofeng-song c0297c6e5f add support for reverse orientation for android 2014-05-15 17:58:23 +08:00
James Chen 0cd7ea0ea2 Merge pull request #6761 from samuele3hu/v3_fix 
Update some GuiConstants and resubmission pr#6361.
 2014-05-15 17:56:51 +08:00
James Chen 942560f012 Merge pull request #6760 from shujunqiao/watchdog 
[ci skip], modify build-job termination time.
 2014-05-15 17:51:45 +08:00
shujunqiao 2a93fdaaa6 modify build terminal time in watchdog.py.[ci skip] 2014-05-15 17:27:23 +08:00
cocoscodeide eb00d7816c Merge pull request #11 from chuanweizhang2013/v3luaruntime 
set macox deployment target
 2014-05-15 17:13:13 +08:00
cw 82f08513b0 set macox deployment target 2014-05-15 17:07:14 +08:00
samuele3hu 6f6cfba21b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-15 16:57:08 +08:00
samuele3hu cde4e4811b Update some GuiConstants and resubmission pr#6361. 2014-05-15 16:54:55 +08:00
shujunqiao 96a9326026 [ci skip], modify build-job termination time. 2014-05-15 16:50:53 +08:00
James Chen ad838b752a Merge pull request #6759 from CocosRobot/update_lua_bindings_1400141832 
[AUTO]: updating luabinding automatically
 2014-05-15 16:22:24 +08:00
CocosRobot 44c6c4d542 [AUTO]: updating luabinding automatically 2014-05-15 08:18:44 +00:00
James Chen fed7f16fa5 Merge pull request #6758 from samuele3hu/v3_fix 
fix compile error and synchronizate the UI change for Lua
 2014-05-15 16:13:37 +08:00
minggo e6fe882963 [ci skip] 2014-05-15 15:50:12 +08:00
minggo 048a45489e [ci skip] 2014-05-15 15:42:39 +08:00
samuele3hu 95dfbf7dae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-15 15:40:28 +08:00
minggo 385b2507aa Merge pull request #6615 from xhcnb/fix_ActionObject 
FIx: correct TotalTime of ActionObject.
 2014-05-15 15:39:15 +08:00
samuele3hu 5a14b1d67b fix compile error and synchronizate the UI change for Lua 2014-05-15 15:39:15 +08:00
zifter c8a1004a4d Little refactor. 2014-05-15 09:43:18 +03:00
minggo 1135a15123 Merge pull request #18 from andyque/xxx 
issue #323, hehe
 2014-05-15 14:07:24 +08:00
andyque fc8d286fcb closed #5188, fixed android NULL pointer exception 2014-05-15 12:11:11 +08:00
cocoscodeide 53a7521c36 Merge pull request #10 from chuanweizhang2013/v3luaruntime 
fixed warnging
 2014-05-15 11:49:28 +08:00
cw a7c0a44792 fixed warnging 2014-05-15 11:34:17 +08:00
minggo 39d3d65157 Merge pull request #6754 from minggo/monkey-test 
Matrix -> Mat4
 2014-05-15 11:10:39 +08:00
minggo 67f809e223 Matrix -> Mat4 2014-05-15 11:09:17 +08:00
minggo e0e82555a1 Merge pull request #6707 from andyque/issue5005 
fix widget enable issue
 2014-05-15 11:08:39 +08:00
andyque cfa0342618 Merge branch 'v3' into issue5005 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-05-15 11:03:03 +08:00
andyque 3f08dd2758 issue #5183, remove no needed type 2014-05-15 10:48:33 +08:00
andyque b32ca246e7 issue #5183, done 2014-05-15 10:44:19 +08:00
James Chen 140560057b Merge pull request #6751 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-15 10:40:42 +08:00
zhangbin 2eafb3c39f Update the reference of submodule cocos2d-console. 2014-05-15 10:37:06 +08:00
shujunqiao 39e5619f3f modify /merge to /head in pull-request-build. 2014-05-15 10:36:01 +08:00
andyque 5697d2417a issue #5183, done 2014-05-15 10:23:25 +08:00
andyque 0639e49031 issue #5183, add LayoutProtocol 2014-05-15 10:07:42 +08:00
minggo 25ffb997f5 Merge pull request #6748 from minggo/template-fix 
use RGBA8 as default pixel format
 2014-05-15 10:01:36 +08:00
minggo 354566d782 use RGBA8 as default pixel format 2014-05-15 09:56:26 +08:00