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

26156 Commits

Author SHA1 Message Date
minggo 8f3e9d9fb1 Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers 
Update that avoid crash during load resource which serialize by flat buffers.
 2014-12-19 09:58:26 +08:00
minggo 851e8e9669 [ci skip] Update CHANGELOG 2014-12-19 09:55:41 +08:00
minggo 6f0a4191cb Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha 
fix webp format premultipliedAlpha error
 2014-12-19 09:53:44 +08:00
minggo 2a72efa3e2 Merge pull request #9539 from CocosRobot/update_lua_bindings_1418812554 
[AUTO]: updating luabinding automatically
 2014-12-19 09:52:05 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
tangziwen 591edd8bad update test 2014-12-19 09:05:53 +08:00
mannewalis 467a5e9c12 minor changes for linux build 2014-12-18 18:21:49 -05:00
mannewalis c05a6c877d adding files to cmake files 2014-12-18 18:10:13 -05:00
yangxiao f54f8a4826 remove return value of enque 2014-12-18 16:16:04 +08:00
tangziwen 086bca399f add three samples -- toonshader fakeshadow lightmap 2014-12-18 16:09:29 +08:00
yangxiao 6e99698c59 Merge branch 'newcode' into sync_load 2014-12-18 14:03:07 +08:00
tjunxin 561350c2bc comment line 83 
As known,  _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
 2014-12-18 13:49:54 +08:00
mannewalis 6b1f994c40 turn off global new delete 2014-12-17 13:55:14 -05:00
mannewalis a6eab3c496 Merge branch 'v3' into mem_alloc_again 2014-12-17 11:59:24 -05:00
mannewalis 34a2f6f640 minor tweak 2014-12-17 11:56:19 -05:00
mannewalis fd22242fb2 added locking semantics to fixed block allocator 
pool allocator uses lockless semantics by default
 2014-12-17 11:54:06 -05:00
pipu 79acf80fb1 Update that avoid crash during load resource which serialize by flat buffers 2014-12-17 19:00:24 +08:00
CocosRobot 9ffacb3f78 [AUTO]: updating luabinding automatically 2014-12-17 10:38:03 +00:00
minggo 9da1317f10 Merge pull request #9453 from sxd1140/v3 
add stopActionByName()
 2014-12-17 18:32:04 +08:00
andyque b11e3d74cc restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar 2014-12-17 16:46:48 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00
tangziwen 73014e8be3 asdasd 2014-12-17 13:31:35 +08:00
minggo e7fc2a5607 Merge pull request #9531 from samuele3hu/v3_4_bug 
Synchronize the KeyCode Enum to Lua
 2014-12-17 11:32:20 +08:00
samuele3hu 5c20885ad1 Synchronize the KeyCode Enum to Lua 2014-12-17 11:27:01 +08:00
yangxiao ae0888ba8d merge cocos 2014-12-17 10:06:07 +08:00
minggo d9953d4aac Merge pull request #9519 from andyque/addNewRequirements 
refactor Button restrict capInsetSize logic and cleanup ui coding style
 2014-12-17 09:53:31 +08:00
minggo f2eb185470 Merge pull request #9526 from CocosRobot/update_lua_bindings_1418726510 
[AUTO]: updating luabinding automatically
 2014-12-17 09:52:40 +08:00
CocosRobot 189e386846 [AUTO]: updating luabinding automatically 2014-12-16 10:44:15 +00:00
minggo 6ce24b05af Merge pull request #9525 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2014-12-16 18:37:42 +08:00
minggo cd7e8a6dac [ci skip] Update CHANGELOG 2014-12-16 18:32:43 +08:00
minggo 116ff0de63 Merge pull request #9439 from andyque/addcreateMethodToLoadingBar 
add TextureResType to LoadingBar's create method
 2014-12-16 18:31:20 +08:00
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +08:00
minggo 048fc500c9 Merge pull request #9505 from CocosRobot/update_lua_bindings_1418695925 
[AUTO]: updating luabinding automatically
 2014-12-16 18:28:05 +08:00
zhangbin bc81065220 Merge branch 'v3' of github.com:natural-law/cocos2d-x; branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-12-16 17:24:51 +08:00
zhangbin f7a6472748 Update the reference of submodule cocos2d-console. 2014-12-16 17:19:06 +08:00
andyque 16cf396ed7 refactor Button restrict capInsetSize logic and cleanup ui coding style 2014-12-16 16:44:04 +08:00
CocosRobot 3d327deb6d [AUTO]: updating luabinding automatically 2014-12-16 02:14:01 +00:00
minggo 5a4c4c61af Merge pull request #9458 from natural-law/v3 
Solve the environment conflict with Cocos.
 2014-12-16 10:09:03 +08:00
minggo b3731fa06a Merge pull request #9486 from 2youyouo2/v3_EventFrame 
fixed frame event
 2014-12-16 09:53:43 +08:00
minggo 26d555cd0b [ci skip] Update CHANGELOG 2014-12-16 09:50:37 +08:00
minggo 6b18305550 Merge pull request #9497 from Dhilan007/v3-game 
Fixed content size of Label is incorrect after sets empty string.
 2014-12-16 09:48:36 +08:00
minggo 392d8ece98 Merge pull request #9495 from vovkasm/pull/fix-tinyxml-usage 
Fix usage of tinyxml2 in cocostudio code
 2014-12-16 09:47:31 +08:00
mannewalis 640695c21c reverting android properties change 2014-12-15 16:31:22 -08:00
mannewalis 9be9c09a9f fixes to cpp-tests for android allocator tests 2014-12-15 16:21:39 -08:00
mannewalis a095635459 android fixes 2014-12-15 16:21:12 -08:00
mannewalis b532ce74d8 diagnostics track allocator enable 2014-12-15 16:16:35 -08:00
mannewalis c50bf94c59 removing Allocator<T> and inheriting base directly. 2014-12-15 09:34:25 -08:00
joewanchen 7b23e3ab1d remove useless function call. 2014-12-15 19:47:25 +08:00
joewanchen 713d19c830 initialize _contentSizeDirty. 2014-12-15 19:43:54 +08:00
joewanchen 0cc4b58383 initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00