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

20056 Commits

Author SHA1 Message Date
bofeng-song 6dd7f2d630 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-05-16 17:19:36 +08:00
boyu0 74335a92f7 Roll back lua PhysicsTest. 2014-05-16 17:19:02 +08:00
minggo 64002e5a2a [ci skip] 2014-05-16 17:14:33 +08:00
minggo 39c76d8a9e [ci skip] 2014-05-16 17:13:17 +08:00
James Chen cd402ea6c7 Merge pull request #6776 from CocosRobot/update_cocosfiles_1400229820 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-16 17:11:40 +08:00
minggo eb38809630 Merge pull request #6756 from zifter/FixTwiceCallingOnExit 
Fix twice calling on exit
 2014-05-16 17:10:42 +08:00
cocoscodeide b520c8faa5 Merge pull request #15 from chuanweizhang2013/v3luaruntime 
fixed repo
 2014-05-16 17:09:54 +08:00
cw aa2aa4bcdf fixed repo 2014-05-16 17:08:33 +08:00
bofeng-song 662d8454f7 remove inner function from header file 2014-05-16 16:46:35 +08:00
CocosRobot c2ace4c56e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-16 08:43:41 +00:00
minggo ff7f832033 Merge pull request #6772 from natural-law/v3 
Update the reference of submodule plugin-x.
 2014-05-16 16:37:07 +08:00
minggo 3caae63a03 Merge pull request #6775 from xhcnb/native-lib 
[ci skip] update Cocos2dxHelper and AndroidManifest.xml template
 2014-05-16 16:35:52 +08:00
bofeng-song 5cf961912b fix potential problem 2014-05-16 16:24:26 +08:00
bofeng-song 8a407cd0ba show uploading file in play scene 2014-05-16 15:59:09 +08:00
Jason Xu 67a558c83d for 93562d6aa6 
update Cocos2dxHelper and AndroidManifest.xml template.
 2014-05-16 15:55:00 +08:00
Mazyad Alabduljaleel cbe1c39fe6 Oops, removed CC_SYNTHESIZE_READONLY_PURE_REF, which is something I added for myself. 2014-05-16 11:37:37 +04:00
Mazyad Alabduljaleel 9fa30f2c61 Added Secure input for CCEditBox on Mac 
[NEW]: Implemented NSSecureTextField when CCEditBox inputFlag is set to Password
[FIX]: Cleanup CCEditBoxMac. CCCustomNSTextField class is not needed.
 2014-05-16 11:21:56 +04:00
Mazyad Alabduljaleel 111df3474c Merge branch 'maz-changes' into v3 
* maz-changes:
  [NEW]: added pure reference synthesizer
 2014-05-16 11:15:22 +04:00
James Chen f07e7ae869 Update README.md: readme for download-deps.py 2014-05-16 15:15:06 +08:00
minggo d3853e3f8b [ci skip] 2014-05-16 14:11:26 +08:00
zhangbin a0d5fdc622 Update the reference of submodule plugin-x. 2014-05-16 14:07:00 +08:00
minggo 93562d6aa6 Merge pull request #6771 from dumganhar/load-native-lib 
[android] Adds a virtual method for loading native libraries.
 2014-05-16 14:05:39 +08:00
cocoscodeide f1bd396140 Merge pull request #13 from chuanweizhang2013/v3luaruntime 
add prebuiltruntime
 2014-05-16 12:03:57 +08:00
cw ceeba9a081 mofiy size 2014-05-16 12:02:59 +08:00
cw 48e437801f add prebuiltruntime 2014-05-16 11:57:03 +08:00
andyque b434840bc9 issue #5183, add layout parameter type to widget for convenient access 2014-05-16 10:33:28 +08:00
andyque 1b3c28ea90 Merge branch 'v3' into refactorLayout 
Conflicts:
	cocos/ui/UILayout.cpp
 2014-05-16 10:22:53 +08:00
James Chen d6007a395c Adds a virtual method for loading native libraries. 2014-05-16 10:20:49 +08:00
James Chen 81e1e0c23d Merge pull request #6750 from shujunqiao/pull-build-merge 
modify /merge to /head in pull-request-build.[ci skip]
 2014-05-16 10:00:23 +08:00
Ricardo Quesada 0689a47c3e Merge pull request #6770 from ricardoquesada/label_fixes 
Does not crash on Mac if the .ttf file is not found
 2014-05-15 17:23:24 -07:00
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