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

18080 Commits

Author SHA1 Message Date
Dale Stammen 0999df368f added .user to Visual Studio ignores 2014-03-28 15:32:23 -07:00
Dale Stammen 31150ce189 added wp8 support files and projects 2014-03-28 12:55:40 -07:00
Dale Stammen 97bdaad41b added wp8 and winrt support files and projects 2014-03-28 12:53:35 -07:00
Dale Stammen afe561cccc added wp8 and winrt support files and projects 2014-03-28 12:52:16 -07:00
Dale Stammen aa0ef00de3 added external libs for wp8 2014-03-28 12:02:27 -07:00
Dale Stammen 7b25ffeb4e added wp8 build files 2014-03-28 11:33:09 -07:00
Dale Stammen 8bd5497ac6 use ResolutionPolicy::SHOW_ALL on WP8 2014-03-28 11:28:48 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
Dale Stammen db8efd32f7 fixed reserved word DELETE in wp8 compiler 2014-03-28 11:26:41 -07:00
Dale Stammen 77efd401a7 intialize _hasMipmaps to false in constructor 2014-03-28 11:25:57 -07:00
Dale Stammen 6ad8ec00ed added missing variadicCreate for wp8 2014-03-28 11:25:39 -07:00
Maks Naumov 9644d68259 fix cmake win32 project generation 2014-03-28 19:06:13 +02:00
samuele3hu a387f60f80 Update the font size for new label test display 2014-03-28 23:32:11 +08:00
zhangbin 77e0694883 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 20:55:12 +08:00
zhangbin 6a1974a78a Solve the error effect of BlurSpriteTest in Shader Sprite. 2014-03-28 20:53:14 +08:00
pipu 733b364b51 Fixed bugs for Editor 2014-03-28 18:54:06 +08:00
minggo c7fb226f11 Merge pull request #5929 from shujunqiao/cocos-console-test 
Cocos console test
 2014-03-28 18:34:21 +08:00
James Chen 1c5cff089e Merge pull request #6050 from CocosRobot/update_lua_bindings_1396001378 
[AUTO]: updating luabinding automatically
 2014-03-28 18:11:59 +08:00
CocosRobot 494321a674 [AUTO]: updating luabinding automatically 2014-03-28 10:11:08 +00:00
James Chen c43b0f6cb0 Merge pull request #6043 from andyque/fix4590 
closed #4590, fixed rewind problems
 2014-03-28 18:04:43 +08:00
James Chen 581ef454eb Merge pull request #6047 from samuele3hu/develop_test 
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that  ControlSwitch:create raised.
 2014-03-28 18:04:12 +08:00
James Chen 15e584a83c Merge pull request #6048 from pandamicro/ConstructorAccess2 
Issue #3897: Add missed constructors
 2014-03-28 18:03:35 +08:00
pandamicro 74a4aa793d Issue #3897: Move OrbitCamera constructor into cpp 2014-03-28 18:00:25 +08:00
shujunqiao 9ffb26fdc9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-28 17:50:29 +08:00
shujunqiao 27f1ded3cd add android part in cocos-console-test. 2014-03-28 17:50:07 +08:00
minggo 3e0e2da6b4 Merge pull request #6049 from natural-law/develop 
Solve the error effect of clipping in cpp-tests & lua-tests.
 2014-03-28 17:49:27 +08:00
zhangbin 62183923e8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 17:46:56 +08:00
pandamicro 26f5107381 Reverse CONSTRUCTOR_ACCESS to protected 2014-03-28 17:45:35 +08:00
zhangbin 338fd43beb Solve the error effect of clipping in cpp-tests & lua-tests. 2014-03-28 17:45:28 +08:00
pandamicro 5fc8050d9e Issue #3897: Add missed constructors 2014-03-28 17:45:06 +08:00
James Chen 5d2c0eef78 Update CHANGELOG [ci skip] 2014-03-28 17:24:15 +08:00
James Chen 9836f11543 Merge pull request #6046 from Dhilan007/develop_label 
Fixed possible crash if invoking FontAtlasCache::purgeCachedData.
 2014-03-28 17:23:24 +08:00
James Chen 8cdd946662 Merge pull request #6045 from CocosRobot/update_lua_bindings_1395994765 
[AUTO]: updating luabinding automatically
 2014-03-28 17:21:03 +08:00
samuele3hu 7ca207f993 Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised. 2014-03-28 17:18:41 +08:00
Dhilan007 cb50741f5d Fixed possible crash if invoking FontAtlasCache::purgeCachedData. 2014-03-28 16:52:48 +08:00
andyque 5a9af407dc closed #4590, remove -> property access 2014-03-28 16:41:33 +08:00
CocosRobot 07d1a54a92 [AUTO]: updating luabinding automatically 2014-03-28 08:20:29 +00:00
James Chen 5b4d9a4f5a Update CHANGELOG [ci skip] 2014-03-28 16:17:10 +08:00
James Chen 79d1bc5e88 Merge pull request #6044 from Dhilan007/develop_label 
fixed getting wrong Rect by LabelTTF(LabelBMFont)::getBoundingBox.
 2014-03-28 16:16:03 +08:00
andyque 97883acfb1 closed #4590, fixed rewind problems 2014-03-28 15:59:04 +08:00
Dhilan007 8ab057550f fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox. 2014-03-28 15:58:28 +08:00
James Chen 736362cc22 Merge pull request #6042 from dumganhar/develop 
Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011.
 2014-03-28 14:56:55 +08:00
James Chen ecad5ea3ce Fixed `ExtensionTest/CocoStudioComponentsTest` crash after applying PR #6011. 2014-03-28 14:55:15 +08:00
James Chen fd9ab5c4d1 Merge pull request #6039 from Dhilan007/develop_label 
LabelTTF and LabelBMFont tagged as deprecated
 2014-03-28 14:31:11 +08:00
Dhilan007 dd73be16e0 fixed indention. 2014-03-28 14:22:51 +08:00
Dhilan007 898e2136b1 LabelTTF and LabelBMFont tagged as deprecated 2014-03-28 14:18:01 +08:00
James Chen 2fcc141bc3 Merge pull request #6041 from CocosRobot/update_lua_bindings_1395987370 
[AUTO]: updating luabinding automatically
 2014-03-28 14:17:42 +08:00
CocosRobot bb1b6f96fb [AUTO]: updating luabinding automatically 2014-03-28 06:17:06 +00:00
James Chen 9090e2015c Merge pull request #6040 from dumganhar/develop 
Two fixes: 1) ParticleSystem should also override onExit to unschedule update since in onEnter, it will be scheduled again. Otherwise, it'll trigger an assert.
2) User object has to be released before others, since userObject may have a weak reference of this node. It may invoke node->stopAllAction(); while _actionManager is null if the next line is after CC_SAFE_RELEASE_NULL(_actionManager).
 2014-03-28 14:13:02 +08:00
James Chen e87f6991cf User object has to be released before others, since userObject may have a weak reference of this node. 
It may invoke `node->stopAllAction();` while `_actionManager` is null if the next line is after `CC_SAFE_RELEASE_NULL(_actionManager)`.
 2014-03-28 14:09:51 +08:00