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

30648 Commits

Author SHA1 Message Date
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
pandamicro 032f231ed4 Add bindings for AutoPolygon and PolygonInfo 2015-06-13 11:14:57 +08: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
Hao Wu 069367bb3d Merge pull request #14 from fusijie/fix_spritepolygon2 
fix conflicts.
 2015-06-12 16:32:31 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-12 16:28:41 +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
pandamicro 19ef0e0983 Fix indent 2015-06-12 13:01:13 +08:00
pandamicro c3aba0392d Update auto conversion for sprite polygon 2015-06-12 13:00:49 +08:00
pandamicro df1219c92d Update manual conversion for sprite polygon 2015-06-12 12:56:37 +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
子龙山人 86b8d87902 Merge pull request #12303 from CocosRobot/update_lua_bindings_1434015619 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-12 09:54:18 +08:00
子龙山人 463198b3ad Merge pull request #12307 from MSOpenTech/v3-winrt-viewport 
V3: Removed obsolete winrt override of setViewPortInPoints
 2015-06-12 09:53:59 +08:00
子龙山人 ed99b0869e Merge pull request #12306 from CocosRobot/update_cocosfiles_1434022774 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-12 09:53:06 +08:00
子龙山人 4c01130ecd Merge pull request #12308 from oscr/fix_download_deps 
Fix two issues with download-deps.py
 2015-06-12 09:52:44 +08:00
pandamicro b1b9c808eb Merge pull request #12074 from samuele3hu/v3_material 
Issue #10570: Make getItemForTouch of Menu virtual.
 2015-06-12 08:21:18 +08:00
pandamicro 9acc51a5eb Merge pull request #12301 from jianglong0156/webviewCrash 
fix webview crash in android
 2015-06-12 08:12:14 +08:00
Oscar Utbult 853058102d Fix two issues with download-deps.py 
- No extra leading space while downloading.
- Clears the line before printing the download completed message.
 2015-06-11 23:48:20 +02:00
Oscar Utbult 90f9506a23 Remove incorrect README.md instruction 2015-06-11 22:22:38 +02:00
Dale Stammen 0f64a2d192 removed obsolete override of setViewPortInPoints 2015-06-11 07:59:52 -07:00
CocosRobot cef0c0412d [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-11 11:39:36 +00:00
pandamicro 1a9056cf14 Merge pull request #12300 from jianglong0156/textFieldShowString 
[ci skip]add textfield show textString
 2015-06-11 19:33:21 +08:00
CocosRobot b2c5c69816 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 09:46:08 +00:00
pandamicro 12de53726d Merge pull request #12182 from VisualSJ/v3-jsb 
[ci skip] Synchronization studio parser
 2015-06-11 17:35:15 +08:00
jianglong0156 c317eb428a fix webview crash in android 2015-06-11 17:28:02 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
pandamicro 902f1696e8 Merge pull request #12290 from jianglong0156/issue#2928texture2d 
[ci skip]add pr#2928 test case, load same remote img. can callback the function
 2015-06-11 16:51:59 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix 
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
 2015-06-11 16:34:45 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
Hao Wu 8d99a7b842 Merge pull request #13 from samuele3hu/v3_update_spritepolygon 
Update the Lua binding about the Polygon and update the test case.
 2015-06-11 15:18:06 +08:00