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

7786 Commits

Author SHA1 Message Date
James Chen 27d84daab3 Merge pull request #2292 from CocosRobot/updategeneratedsubmodule_1364875303 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-01 21:04:12 -07:00
CocosRobot 1462c2a570 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-02 12:01:52 +08:00
minggo ee1365c13f Update AUTHORS 2013-04-02 10:59:48 +08:00
minggo 3d0a5e52c6 Merge pull request #2267 from nickveri/master 
Added some missing function for setting integer shader uniforms in CCGLProgram
 2013-04-01 19:52:11 -07:00
James Chen 90a0eccb09 Merge pull request #2286 from dumganhar/lua-test 
fixed #1941: Adding TileMapTest for TestLua.
 2013-04-01 02:45:05 -07:00
James Chen a7f1fba762 TileMapTest.lua is ok. 2013-04-01 17:39:27 +08:00
James Chen 57a76a3a86 Using universal config for TestLua. 2013-04-01 17:39:27 +08:00
James Chen be4d15fbba Updating LabelTest.lua 2013-04-01 17:39:26 +08:00
James Chen 9ea35977db new tile map tests 2013-04-01 17:39:26 +08:00
James Chen 4a1eab5101 CCLOG -> cclog 2013-04-01 17:39:26 +08:00
James Chen 205123f661 Adding TileMapTest.lua 2013-04-01 17:39:26 +08:00
James Chen 5fd2acca47 Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding. 2013-04-01 17:39:26 +08:00
James Chen d401fb3771 labeltest.lua finish. 2013-04-01 17:39:25 +08:00
James Chen 8854fc046f BitmapFontMultiLineAlignment is ok. 2013-04-01 17:39:25 +08:00
James Chen 5a623b9b07 Some tests in LabelTest.lua are ok. 2013-04-01 17:39:25 +08:00
James Chen a388f401bf Updating LabelTest.lua. 2013-04-01 17:39:25 +08:00
James Chen 65720983d8 Update AUTHORS 2013-04-01 13:52:42 +08:00
James Chen 42aafa7519 Merge pull request #2285 from DarraghCoy/ccuserdefault_android_fix 
Fix CCUserDefault.cpp compiling on Android.
 2013-03-31 22:45:18 -07:00
Darragh Coy 7f565bb2fa Fix CCUserDefault.cpp compiling on Android. 
CCUserDefault.cpp shouldn't compile on Android.
 2013-03-31 22:24:10 -07:00
James Chen 8d5ff2b911 Update AUTHORS 2013-03-29 17:16:03 +08:00
James Chen 869f30ddfa Merge pull request #2280 from CocosRobot/updategeneratedsubmodule_1364547743 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-29 02:14:02 -07:00
CocosRobot 9f50cb71e2 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 17:02:38 +08:00
James Chen c50743b0ab Merge pull request #2251 from tiantian20007/master 
fixed #1937: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
 2013-03-29 02:00:17 -07:00
tianTian 053efa0537 m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default. 2013-03-29 16:19:34 +08:00
James Chen 6db4358584 Merge pull request #2278 from CocosRobot/updategeneratedsubmodule_1364529763 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-28 21:05:13 -07:00
CocosRobot 7b37a9aaef cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 12:02:51 +08:00
James Chen 8380eec235 Update AUTHORS 2013-03-29 11:59:21 +08:00
James Chen d052f6a752 Merge pull request #2275 from dumganhar/rohankuruvilla-ccbreader 
fixed #1936: Merging Pull Request #2273: Adding OpenGL Bindings to Javascript.
 2013-03-28 20:58:09 -07:00
James Chen 92d132ae19 Updating Android.mk to add OpenGL jsb support. 2013-03-29 11:43:25 +08:00
James Chen fd1b056d6a define JSB_INCLUDE_OPENGL in js_bindings_config.h 2013-03-29 11:41:32 +08:00
James Chen b7a86c601a fixing compilation errors for TestJavascript on windows. 2013-03-29 11:16:14 +08:00
James Chen 374024cefd Updating JS Test. OpenGLTest works ok now. 2013-03-28 16:58:36 +08:00
James Chen 54edf8cafd Don't require 'jsb_opengl_constants.js' in 'jsb_opengl.js'. It will break js obscure 2013-03-28 16:58:02 +08:00
James Chen 4220fd4ca5 fixed #1936: Updating project configuration for TestJavascript. 2013-03-28 16:55:23 +08:00
James Chen 201dc74ecb fixed #1936: Updating obfuscate.xml. 2013-03-28 16:54:49 +08:00
James Chen b6556bd41f fixed #1936: Updating the obfuscated file, game.js in TestJavascript. 2013-03-28 16:54:18 +08:00
James Chen 771ffb4368 fixer #1936: Updating "obfuscate_exclude_cocos2d.js". 2013-03-28 16:53:35 +08:00
James Chen 65bcc6035e Fixing a type: "FiniteTimeAction" --> "GLNode". 2013-03-28 16:51:11 +08:00
Rohan Kuruvilla f945f4efd6 Adding the generator config file. Includes CCGLProgram, CCShaderCache classes 2013-03-27 23:59:30 -07:00
Rohan Kuruvilla 1d89b137ed Adding new Javascript bindings for OpenGL to cocos2d-x. Modifying bindings generated in cocos2d-iphone 2013-03-27 23:59:29 -07:00
Rohan Kuruvilla 57fd3cdb9c Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template 2013-03-27 23:59:29 -07:00
James Chen 4e37161c7a Update AUTHORS 2013-03-28 10:10:01 +08:00
James Chen 32cee20feb Merge pull request #2271 from Weeds/fontdimension-fix 
fixed #1932: [Linux] fixed font rendering crash for certain fonts.
 2013-03-27 19:08:54 -07:00
Andre Rudlaff 89f08bb441 [Linux] fixed font rendering crash for certain fonts 
face->size->metrics->ascender seems to be unreliable for some fonts,
additionally the freetype documentation says that it may be used
differently for different fonts.
Therefore it may happen that the ascender of a font face is less then
the glyphs bounding box resulting in accessing invalid memory.

The fix is to use the bbox attribute instead of the ascender
 2013-03-28 00:54:11 +01:00
nickveri fd35ebd4d4 Added support for setting integer uniforms 2013-03-26 18:20:38 +00:00
James Chen dccaedd20d Merge pull request #2265 from dumganhar/master 
Adding LabelTest.lua. Three tests in LabelTest works ok.
 2013-03-26 03:19:28 -07:00
James Chen 8c5f278d06 Updating mainMenu.lua 2013-03-26 18:18:37 +08:00
James Chen 567e1fa15f Adding LabelTest.lua. Three tests in LabelTest works ok. 2013-03-26 18:14:14 +08:00
James Chen 166ffbd218 Update AUTHORS 2013-03-26 10:12:44 +08:00
James Chen b9de14c8c7 Merge pull request #2261 from flaming0/gles20 
Null pointer check in order to prevent crashes.
 2013-03-25 19:11:07 -07:00