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 51f498fc94 fixed deprecation warnings 2014-05-08 16:42:36 -07:00
Ricardo Quesada 2e669c1d28 GLProgram::create() returns a linked GLProgram 2014-05-08 16:04:59 -07:00
Ricardo Quesada 580ebf939f working Ok with new API 2014-05-08 15:43:12 -07:00
Ricardo Quesada 453b670ad2 Removes CCVertexAttribBind 2014-05-08 14:01:26 -07:00
Ricardo Quesada 9ea4aa1e16 Simplified VertexAttrib 2014-05-08 14:01:03 -07:00
Ricardo Quesada 8f2ba467ff Yeahhhhhh 
it is working
 2014-05-08 12:34:26 -07:00
Ricardo Quesada a2361b30de Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram 2014-05-08 10:16:49 -07:00
Ricardo Quesada 087378926f Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-08 10:16:09 -07:00
yangxiao 815f0b7bd9 useCallback to false 2014-05-08 10:12:12 -07:00
Dale Stammen eea1ba6946 added missing files to projects 2014-05-08 10:11:42 -07:00
James Chen 59e1fc39b3 Merge pull request #6638 from Dhilan007/v3_video 
fixed compilation fails on android.
 2014-05-08 21:43:21 +08:00
Dhilan007 24452cada1 fixed compilation fails on android. 2014-05-08 21:39:53 +08:00
James Chen dfd302a8ab Merge pull request #6637 from dumganhar/vs-user-file 
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which was set in '.user' file
 2014-05-08 21:22:37 +08:00
James Chen 0ed33cacf4 Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which 
was set in '.user' file
 2014-05-08 21:19:54 +08:00
James Chen b550622d90 Merge pull request #6636 from CocosRobot/update_cocosfiles_1399545311 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 19:13:25 +08:00
minggo 8a74f83ad0 [ci skip] 2014-05-08 18:46:34 +08:00
CocosRobot 7ef529b1c4 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 10:35:12 +00:00
minggo 56622dc765 Merge pull request #6555 from Dhilan007/v3_video 
issue #4859:Add a widget to play video
 2014-05-08 18:33:51 +08:00
Dhilan007 52d7d804f7 Update XCode project.pbxproj for add files related to VideoWidget. 2014-05-08 18:28:28 +08:00
Dhilan007 972f9447dd issue #4876:Add test case to play video 2014-05-08 18:14:32 +08:00
Dhilan007 af26fb9b07 issue #4870:Add a ui widget of playing video 2014-05-08 18:13:50 +08:00
Dhilan007 bda73bc7b3 issue #4868:Use system widget to play video on iOS 2014-05-08 18:12:53 +08:00
Dhilan007 bda8a73ae5 issue #4867:Use system widget to play video on Android 2014-05-08 18:12:03 +08:00
minggo f12bdeca9a Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug 
Fixed bug of guireader
 2014-05-08 18:06:21 +08:00
minggo 0ae859e3e1 [ci skip] 2014-05-08 18:00:01 +08:00
minggo 56f749f273 Merge pull request #6575 from twhittock/lua-main-error-no-launch 
Lua template should fail to launch on lua error
 2014-05-08 17:58:48 +08:00
minggo 5291bbc377 [ci skip] 2014-05-08 17:25:41 +08:00
minggo c886bf21a8 Merge pull request #6631 from Dhilan007/v3_labelhotfixed 
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
 2014-05-08 17:24:08 +08:00
minggo 2571767907 [ci skip] 2014-05-08 17:13:21 +08:00
minggo d84e26c7b4 Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background 
sounds pause automatically when switching background
 2014-05-08 17:11:29 +08:00
minggo 9f0e25d808 Merge pull request #6628 from andyque/refactor5056 
refactor 5056. pull gui tests from ExtensionTest to UITest
 2014-05-08 17:00:38 +08:00
Ryeeeeee 80103487fe rename variable 2014-05-08 16:53:24 +08:00
andyque 97ee5cb456 closed #5056. fix windows compile error 2014-05-08 16:18:46 +08:00
CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:56:34 +08:00
Dhilan007 966e7e2b20 closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT. 2014-05-08 15:47:37 +08:00
minggo b22fe211de [ci skip] 2014-05-08 15:42:05 +08:00
minggo a8d728ffc9 Merge pull request #6610 from zawasp/vs2013project 
upgrade win32 projects for Visual Studio 2013
 2014-05-08 15:40:02 +08:00
CaiWenzhi 64f8feb50c Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:38:28 +08:00
James Chen 366540902c Merge pull request #6630 from CocosRobot/update_cocosfiles_1399534246 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 15:34:29 +08:00
CocosRobot fb0094e0b7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 07:30:48 +00:00
James Chen 5c38c04b1b Merge pull request #6629 from dumganhar/v3 
Adds missing 'fps_images.png', our test case needs them and Lua xcode project fix
 2014-05-08 15:28:29 +08:00
andyque e48e26cfdc issue #5056. fix linux & android compile error 2014-05-08 15:20:24 +08:00
CaiWenzhi a562f19880 Fixed bug of guireader 2014-05-08 15:15:09 +08:00
James Chen bea98a1416 Lua xcode project fix 2014-05-08 15:09:02 +08:00
James Chen 88b0eb3baa Adds missing 'fps_images.png', our test case needs them 2014-05-08 15:09:02 +08:00
Ryeeeeee eec96e9e96 sounds pause automatically when switching background 2014-05-08 14:44:47 +08:00
andyque 898a66131a issue #5056. move gui test from ExtensionsTest to the outside 2014-05-08 14:35:45 +08:00
James Chen 2473422a2f Merge pull request #6622 from CocosRobot/update_cocosfiles_1399528834 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 14:30:10 +08:00
James Chen 32438a88cd Merge pull request #6623 from CocosRobot/update_lua_bindings_1399528933 
[AUTO]: updating luabinding automatically
 2014-05-08 14:29:54 +08:00
CocosRobot 119ef29a87 [AUTO]: updating luabinding automatically 2014-05-08 06:03:37 +00:00