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

19442 Commits

Author SHA1 Message Date
Ricardo Quesada 63c7c6a05c Updates template files 2014-05-09 18:41:12 -07:00
Ricardo Quesada b62f4e51a4 Updates Linux project 2014-05-09 18:40:53 -07:00
Ricardo Quesada 764a7b5108 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 18:40:08 -07:00
Ricardo Quesada 77c03fcf11 ShaderCache -> GLProgramCache 2014-05-09 18:39:25 -07:00
Huabing.Xu c16d072491 added conversion script for convert yCoordFlipped 2014-05-09 17:28:12 -07:00
Ricardo Quesada b5fdbf2d49 it is v3.1-alpha1 2014-05-09 17:03:34 -07:00
Ricardo Quesada faf617bc37 fixes for Linux 2014-05-09 16:57:11 -07:00
Ricardo Quesada f511b1f8a1 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 16:46:35 -07:00
Ricardo Quesada fec1b82c0a Shader files use STRINGIFY 2014-05-09 16:45:42 -07:00
yangxiao 1be6ba961c Merge branch 'newcode' into improved_glprogram 2014-05-09 16:05:42 -07:00
yangxiao 877d8dd771 android works!! 2014-05-09 15:59:49 -07:00
Ricardo Quesada 808561705a new files for template 2014-05-09 15:40:48 -07:00
Ricardo Quesada 9cad6cf027 removes some unused directories from the propery sheet 
... for Visual Studio
 2014-05-09 15:35:53 -07:00
Ricardo Quesada 4c623f1f5e compiles and runs on Windows Phone 8 
What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
 2014-05-09 15:14:50 -07:00
Ricardo Quesada da0c581d44 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 14:43:36 -07:00
Ricardo Quesada 47f6f8871f compiles on windows 2014-05-09 14:43:20 -07:00
yangxiao 879958855b UniformValue use union array 2014-05-09 14:38:36 -07:00
Ricardo Quesada 9538c20a3e Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 13:25:27 -07:00
Ricardo Quesada 739af170ad compiles and runs on Windows!!! 2014-05-09 13:24:56 -07:00
Trace 4c4a974287 use STRINGGIFY(A) instead R"" 2014-05-09 12:03:09 -07:00
Trace 4bcdccd302 Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-09 12:01:18 -07:00
Ricardo Quesada 9ffaeec515 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 12:00:33 -07:00
Ricardo Quesada 16c6b2163d More VisualStudio fixes 2014-05-09 11:59:52 -07:00
Huabing.Xu e72633c066 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram 2014-05-09 11:53:22 -07:00
Trace 0b8aed3536 Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-09 11:51:00 -07:00
Huabing.Xu a8b27de799 fix bug for y flipped coord (particle system) 2014-05-09 11:50:37 -07:00
Huabing.Xu 168ff78e18 add test case for y flipped coord 2014-05-09 11:49:51 -07:00
Trace 88f1d8ac4e Add ShaderTest sample and shader code 2014-05-09 11:48:11 -07:00
Ricardo Quesada 6727c6d19c Adds missing files to xcode 2014-05-09 11:45:12 -07:00
Ricardo Quesada 78dd92a7ef Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-09 11:40:13 -07:00
Ricardo Quesada 8565e899f9 adds missing files to VisualStudio 2014-05-09 11:38:43 -07:00
Ricardo Quesada dec753f0c4 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-09 11:36:02 -07:00
Ricardo Quesada 34a87f8332 Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram 2014-05-09 11:28:16 -07:00
Ricardo Quesada 00834b1d6e adds missing files for Windows 2014-05-09 11:28:06 -07:00
yangxiao a986455e63 store useCache in GLProgramState 2014-05-09 10:23:24 -07:00
minggo 369719481f Merge pull request #6652 from zawasp/external_vs2013 
add VS2013 support for box2d, chipmunk
 2014-05-09 17:42:23 +08:00
Mircea Rila ebfbf0eba3 fix box2d win32 project 2014-05-09 11:10:08 +03:00
Mircea Rila 70d7d5b493 add VS2013 support for box2d, chipmunk 2014-05-09 10:53:44 +03:00
James Chen a0fbe9e737 Merge pull request #6649 from CocosRobot/update_cocosfiles_1399614149 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-09 13:45:10 +08:00
CocosRobot 224b0910c9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-09 05:42:30 +00:00
minggo df894931b5 Merge pull request #6644 from Dhilan007/v3_video 
rename VideoWidget to VideoPlayer.
 2014-05-09 13:41:06 +08:00
yangxiao 95e036dd1b GLProgramStateCache 2014-05-08 21:54:49 -07:00
James Chen 1a5a29b863 Merge pull request #6645 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-09 11:52:11 +08:00
zhangbin 7d270cd1a1 Update the reference of submodule cocos2d-console. 2014-05-09 11:48:43 +08:00
Dhilan007 c904fff9eb update XCode project.pbxproj 2014-05-09 11:37:14 +08:00
Dhilan007 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
Ricardo Quesada 7fee9cc266 Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-08 18:02:27 -07:00
Ricardo Quesada 62d9c24518 moves shaders files from 2d/ to renderer/ 2014-05-08 18:01:48 -07:00
James Chen 1308ad53df Merge pull request #6639 from MSOpenTech/wp8-v3-fix 
Added missing files to WP8 projects
 2014-05-09 08:29:15 +08:00
Huabing.Xu 1d5bfb5a10 roll back _yCoordFlipped changes 2014-05-08 16:45:08 -07:00