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

25190 Commits

Author SHA1 Message Date
Sven Steinbauer c9f5eacc2e Add greater than operator to Vec2 2014-10-24 20:27:06 +01:00
Ahlwong dfcdf10898 Fix Label Additional Kerning All Strings 2014-10-24 08:57:37 -07:00
Dhilan007 788c793147 Fix CPP template on Window 2014-10-24 23:18:35 +08:00
Dale Stammen 042976265c updated precompiled shaders for WP8 2014-10-24 07:20:16 -07:00
Dale Stammen 40e49cdc12 Merge branch 'v3' into wp8.1-universal 2014-10-24 07:08:55 -07:00
minggo 1c72b4fba8 Merge pull request #8924 from CocosRobot/update_lua_bindings_1414158758 
[AUTO]: updating luabinding automatically
 2014-10-24 22:04:20 +08:00
CocosRobot 0ef3887497 [AUTO]: updating luabinding automatically 2014-10-24 13:55:25 +00:00
minggo ab365b9498 Merge pull request #8892 from dumganhar/rm-uthash 
Removes uthash in CCGLProgram,uses std::unordered_map instead
 2014-10-24 21:50:47 +08:00
minggo d4bcbf9519 [ci skip] Update CHANGELOG 2014-10-24 21:49:03 +08:00
minggo a2eeea1d87 Merge pull request #8920 from super626/fixsprite 
Fix sprite
 2014-10-24 21:48:30 +08:00
minggo afd2d139ed Merge pull request #8904 from Dhilan007/v3-labelfix 
Fixed Label shifting when outline feature enabled
 2014-10-24 21:47:13 +08:00
Dale Stammen 3b8537b7e4 updated template files 2014-10-24 06:08:38 -07:00
Dale Stammen d4b4452bae copy pch files to template folder 2014-10-24 06:08:20 -07:00
teivaz bfe83e5624 * [WP8] Enabled GLProgramState restoring on render recreated 2014-10-24 16:00:08 +03:00
Dale Stammen fa6b70cbb8 disabled xaml functions for WP8 2014-10-24 05:59:59 -07:00
Timothy Zhang 0fb584ad92 release old program with the same key before adding glprogram 2014-10-24 18:31:00 +08:00
Liam 92bdfea638 update ui button size changed logic 2014-10-24 17:38:32 +08:00
yangxiao 4d08a08809 add getMeshCount method 2014-10-24 15:57:47 +08:00
yangxiao f878533f85 load attached sprite from cache 2014-10-24 15:52:24 +08:00
XiaoYang 01e2d62e90 Merge pull request #149 from lvlonggame/v3 
Fix bug: load sprite3D from cache, the attach node will be discarded.
 2014-10-24 15:43:37 +08:00
yangxiao 7cf5b50790 add getMeshCount method 2014-10-24 15:24:36 +08:00
Dale Stammen 6fcd0ebafd don't hide flyout when keyboard is hidden 2014-10-23 22:23:42 -07:00
Dale Stammen 5df4278e36 fixed reentrancy when closing flyout 2014-10-23 22:17:25 -07:00
Dale Stammen b77e7a5a97 fixed reentrancy when closing flyout 2014-10-23 22:01:35 -07:00
Ahlwong 012683bf6e Fix kerning on signle characters 2014-10-23 21:18:51 -07:00
James Chen 13b51f7c73 Small fixes in Sprite3DTest 2014-10-24 12:03:42 +08:00
James Chen 603700179e closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points. 2014-10-24 12:03:11 +08:00
lvlong 799f375802 Fix bug: load sprite3D from cache, the attach node will be discarded. 2014-10-24 12:02:55 +08:00
Dale Stammen afa052c5c7 added critical section 2014-10-23 20:49:10 -07:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen 3290d75ab7 removed unused pch files 2014-10-23 19:34:55 -07:00
Dale Stammen 6e92d169cd changed implementation to use xaml flyout for editbox 2014-10-23 19:30:32 -07:00
Dale Stammen c82a75d4f7 added xaml support functions 2014-10-23 19:29:38 -07:00
Dale Stammen 2ddb692628 added flyout xaml to support uieditbox on winrt 2014-10-23 19:29:18 -07:00
Dale Stammen 96054e9c29 updated headers for change in pch.h 2014-10-23 19:28:53 -07:00
Dale Stammen b6329c6c7b added correct options to compile c file 2014-10-23 13:27:24 -07:00
Dale Stammen b520e80e04 updated 2d and base file locations 2014-10-23 09:03:35 -07:00
Dale Stammen 0af2f30d61 fixed WP8_SHADER_COMPILER checks 2014-10-23 08:40:34 -07:00
Dale Stammen 71048fc906 fixed cclight and cccamera file locations 2014-10-23 08:39:36 -07:00
Dale Stammen 93cac681ab removed DirectX namespace 2014-10-23 08:39:06 -07:00
Dale Stammen 82aad4605e added missing Assets folder 2014-10-23 08:38:42 -07:00
Dale Stammen a4294c07c1 added check for WP8_SHADER_COMPILER 2014-10-23 08:32:31 -07:00
Dale Stammen f8a00c8605 added project files for windows 8.1 universal apps 2014-10-23 07:41:29 -07:00
Dale Stammen c38a37837a added cpp template for windows 8.1 universal apps 2014-10-23 07:40:42 -07:00
Dale Stammen d2f852c3cb added editbox support for universal apps 2014-10-23 07:39:38 -07:00
Dale Stammen b5fdf892b2 added text input from keyboard support for winrt 2014-10-23 07:38:46 -07:00
Dale Stammen cc3b784dd1 added windows 8.1 platform support files 2014-10-23 07:38:04 -07:00
Dale Stammen d88a2fb6f1 added windows 8.1 universal app solution 2014-10-23 07:37:25 -07:00
Dale Stammen a4f13a91ab added CC_NO_GL_POINTSIZE preprocessor define 2014-10-23 07:36:23 -07:00
Dale Stammen af98442e1f added projects Assets 2014-10-23 07:35:22 -07:00