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

30169 Commits

Author SHA1 Message Date
Neo Kim 31bf9f714d Merge bouncing and non-bouncing logics as one. 2015-06-22 14:05:50 +09:00
Neo Kim 6a0609a687 Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH. 2015-06-22 14:05:49 +09:00
Neo Kim 368b5e8f12 Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions. 2015-06-22 14:05:49 +09:00
子龙山人 86b6ea702a Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix 
[ci skip]Android Studio projects:Fixed compile error.
 2015-06-15 14:48:42 +08:00
WenhaiLin 518de1ff57 [ci skip]Android Studio projects:Fixed compile error. 2015-06-15 14:42:45 +08:00
pandamicro bef7e7863e Merge pull request #12339 from pandamicro/v3 
[ci skip] Update html5 engine
 2015-06-15 13:47:56 +08:00
pandamicro b63973ffb8 Merge pull request #12338 from CocosRobot/update_lua_bindings_1434346950 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-15 13:47:22 +08:00
CocosRobot 8ec924c206 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-15 05:46:51 +00:00
pandamicro 8b21d5b219 Update html5 engine 2015-06-15 13:45:09 +08:00
pandamicro ce6b3d7e76 Merge pull request #12337 from CocosRobot/update_cocosfiles_1434346866 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-15 13:42:56 +08:00
CocosRobot f7ec4b2db5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-15 05:41:07 +00:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro c9c05ff982 Merge pull request #12314 from xiaofeng11/v3_xiaofeng 
Fix when button reader bug
 2015-06-15 13:13:39 +08:00
pandamicro 0c1347a6cf Merge pull request #12336 from jianglong0156/addResjs 
modify js special resource path
 2015-06-15 13:12:57 +08:00
yangxiao 16a0ddc74e rename CCNavMeshTool to CCNavMeshUtils 2015-06-15 12:52:55 +08:00
pandamicro d0db40c4a6 Merge pull request #12080 from linshun/v3 
issue #12078 added audio, network, physics, platform and storage group.
 2015-06-15 12:45:11 +08:00
yangxiao 97ef7974bb create agent in the onEnter 2015-06-15 11:57:05 +08:00
linshun c54d4bab31 issue #12078: renamed platform to platform specific. 2015-06-15 10:46:09 +08:00
linshun efed0da8bc issue #12078: added subgroup of physics 2d. 2015-06-15 10:28:37 +08:00
jianglong0156 10ed5e0b78 modify ios project 2015-06-15 10:03:58 +08:00
jianglong0156 5ff0825468 modify android res copy 2015-06-15 09:55:10 +08:00
jianglong0156 393ad49481 add win32 project resource copy 2015-06-15 09:55:05 +08:00
jianglong0156 6310f74533 modify resource to res/resjs 2015-06-15 09:54:00 +08:00
jianglong0156 f9df298401 modify copy resource to res/resjs 2015-06-15 09:53:53 +08:00
pandamicro 707e9d4d7b Merge pull request #12205 from ffskyfan/v3 
Update extension.h, amend a really  dangerous macros that may cause memory allocation error
 2015-06-14 20:09:57 +08:00
Ricardo Quesada 97c1d29af9 Merge pull request #12324 from ricardoquesada/state_buffer_fixes 
State buffer fixes
 2015-06-12 22:02:58 -07:00
Ricardo Quesada 5c419ff7bc compiles on windows 2015-06-12 20:49:20 -07:00
Ricardo Quesada 9b7c12aa38 updates invalidate documentation 2015-06-12 17:44:48 -07:00
Ricardo Quesada a8cf72dc43 pass bits to invalidate 2015-06-12 17:14:09 -07:00
Ricardo Quesada 4278bf51b1 Adds RenderState::StateBlock::invalidate(); 
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
 2015-06-12 16:47:08 -07:00
Ricardo Quesada 32aae46343 fixes 2015-06-12 15:37:29 -07:00
Ricardo Quesada d9b0b2ca38 more fixes 2015-06-12 15:28:29 -07:00
Ricardo Quesada 2a3347dd49 RenderState: default state fixes 
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
 2015-06-12 15:03:48 -07:00
子龙山人 38cd74933d Merge pull request #12320 from CocosRobot/update_lua_bindings_1434115258 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-12 22:42:40 +08:00
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped 
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
 2015-06-12 21:33:09 +08:00
CocosRobot 60d68ab4de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-12 13:27:20 +00:00
pandamicro 68649b9f57 Merge pull request #12318 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-12 21:11:03 +08:00
pandamicro f9057b3f32 Merge pull request #12284 from pandamicro/v3 
Fix template android compilation issue on physics3d
 2015-06-12 21:10:40 +08:00
Bin Zhang 2827e9fa6a Update the reference of submodule cocos2d-console. 2015-06-12 18:32:23 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key 
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
 2015-06-12 16:44:12 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
XiaoFeng 8d19ea7320 Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode 2015-06-12 15:47:34 +08:00
pandamicro e9d648f151 Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
WenhaiLin 4d97d5075b Add test case for issue12310. 2015-06-12 15:39:57 +08:00
WenhaiLin 9f5a36b817 Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner. 2015-06-12 11:03:32 +08:00
子龙山人 385f39ec47 Merge pull request #12309 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-12 10:43:10 +08:00
andyque 87f815871b update changelog 2015-06-12 10:42:12 +08:00
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage 
Optimize ui memory usage
 2015-06-12 10:11:21 +08:00
子龙山人 4d464999f4 Merge pull request #12286 from oscr/fix_readme 
Remove incorrect README.md instruction
 2015-06-12 09:56:11 +08:00
子龙山人 12ed274a8c Merge pull request #12285 from oscr/fix_cmake 
Add debug flag -Wextra
 2015-06-12 09:54:47 +08:00