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

34444 Commits

Author SHA1 Message Date
minggo 9c40277e48 Merge pull request #14980 from catinred2/dev 
fix typo
 2016-04-18 17:21:40 +08:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. (#15236) 2016-04-18 17:15:56 +08:00
minggo 37655ea271 Merge pull request #15091 from mogemimi/fix-null-conversion 
Fix return value of VertexAttribBinding::init()
 2016-04-18 16:52:15 +08:00
minggo 6cc80f28fc Merge pull request #15096 from fnz/volume_control 
Set music volume control as default
 2016-04-18 16:48:55 +08:00
minggo 7749ba6de8 Merge pull request #15444 from xpol/fixes-warings-unused-static-consts-in-cpp 
Fixes warning about unused static constants.
 2016-04-18 16:37:10 +08:00
xpol 24db45e925 Fixes some warnings in Lua manual bindings. (#15443) 
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
 2016-04-18 16:35:50 +08:00
minggo a667b4bf00 Merge pull request #15445 from CocosRobot/update_cocosfiles_1460965737 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-18 16:09:23 +08:00
CocosRobot 121e784484 [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 07:48:59 +00:00
minggo 3e183f7206 Merge pull request #15442 from minggo/cmake-refactor 
refactor cmake
 2016-04-18 15:45:54 +08:00
zilongshanren 001a0ee812 remove useless warning log of stencil buffer. (#15396) 
1. disable GC for Native object

2. improve js tests of label
 2016-04-18 15:43:54 +08:00
Xpol Wan 8c3137b07f Fixes warning about unused static constants. 2016-04-18 15:38:51 +08:00
minggo b88dc87b0a Merge pull request #15428 from mogemimi/fix-indent 
Fix indentation for readability
 2016-04-18 15:20:54 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
minggo c26eb228b2 refactor cmake 2016-04-18 15:03:06 +08:00
zilongshanren 7029df89cc Merge pull request #15434 from scphillips/layout-clipping-fix 
Fixed typo in UILayout using clipping rect x instead of y coordinate.
 2016-04-17 22:43:03 -05:00
zilongshanren 5730f024d1 Merge pull request #15440 from CocosRobot/update_cocosfiles_1460943818 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-17 22:12:24 -05:00
CocosRobot f136e9d94e [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-18 01:43:40 +00:00
zilongshanren b0b2d8a5e8 Merge pull request #15344 from xpol/withespaces-does-matter 
Withespaces does matter
 2016-04-17 20:41:26 -05:00
Stephen Phillips 7b35f31016 Fixed typo in UILayout using clipping rect x instead of y coordinate. 2016-04-15 13:45:21 +01:00
mogemimi 0825b1cc96 Fix indentation for readability 2016-04-15 04:31:19 +09:00
minggo f07b6a6804 Merge pull request #15425 from xpol/fixes-warning-reorder 
Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'
 2016-04-14 18:08:28 +08:00
Xpol Wan cb0e768f32 Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'. 2016-04-14 17:09:37 +08:00
xpol 3780064a82 Allow inherit form platform fileutils (#15304) 
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.

* Removed objc from CCFileUtils-apple.h

define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.

* Smart pointers heal us all.

* Add config macro in ccConfig.h and prefix with CC_.

* enabled by default.
* use #if rather than #ifndef.

* Do not deprecate setBundle.
 2016-04-14 11:59:24 +08:00
minggo 6e7ab0fb46 Merge pull request #15395 from Sai628/v3 
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
 2016-04-14 11:58:19 +08:00
minggo 81fa98272f Merge pull request #15412 from mogemimi/fix-deprecation-warnings 
Fix deprecation warnings in tests
 2016-04-14 11:38:30 +08:00
mogemimi f51f9003bf Fix deprecation warnings in tests 2016-04-11 19:35:44 +09:00
zilongshanren c149da7a6c Merge pull request #15411 from CocosRobot/update_lua_bindings_1460368433 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-11 04:58:03 -05:00
CocosRobot 7d9946a9cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 09:56:18 +00:00
zilongshanren abfce2617e Merge pull request #15399 from geemedia/pageview-turning-time-configurable 
Make PageView page turning event time tweak configurable.
 2016-04-11 04:50:46 -05:00
mogemimi 4f32df255d Fix return value of VertexAttribBinding::init() 2016-04-10 08:05:19 +09:00
zilongshanren ac2b336eb6 Merge pull request #15397 from 1scaR1/fix_js_contsants 
Fixed ccui scroll widgets constants for JS bindings
 2016-04-09 15:08:37 +08:00
zilongshanren 78e9dd187b Merge pull request #15398 from 1scaR1/up_v3 
Added JS tests for scroll widgets
 2016-04-09 15:07:51 +08:00
Adrien de Sentenac 0030beca7a Make PageView page turning event time tweak configurable. 2016-04-08 11:06:36 -04:00
Бесшапошников Никита 9acde1bc06 Fixed ccui scroll widgets constants for JS bindings 2016-04-08 15:34:25 +03:00
Бесшапошников Никита 9459d2b67e Fixed ccui.ListView Test 2016-04-08 15:31:51 +03:00
Бесшапошников Никита c7bea705af Add PageView js tests 2016-04-08 14:01:20 +03:00
Бесшапошников Никита dbd2b5fd03 Add ListView js tests 2016-04-08 13:40:21 +03:00
Бесшапошников Никита c0dc8b0637 Add scroll view bar js test 2016-04-08 11:14:45 +03:00
Sai628 dfc12c8351 Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR 2016-04-08 14:11:39 +08:00
Wenhai Lin f3d824843b Refine 'CCActionXXXX' (#15319) 
add more check to be more stronger and simplify the codes
 2016-04-08 13:40:36 +08:00
minggo 959635db4f Merge pull request #15394 from ricardoquesada/web_submdole_with_chipmunk 
feat: use new web sumodule with chipmunk v7.0 fixes
 2016-04-08 12:45:55 +08:00
Ricardo Quesada 916a2967f6 feat: use new web sumodule with chipmunk v7.0 fixes 2016-04-07 21:05:13 -07:00
pandamicro f18763033d Merge pull request #15390 from pandamicro/v3 
Fix a issue in cc.CallFunc JSB implementation
 2016-04-08 09:54:13 +08:00
zilongshanren 36c5ae4d9c Merge pull request #15389 from CocosRobot/update_lua_bindings_1460042601 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-08 09:30:58 +08:00
Ricardo Quesada c4230f839e Merge pull request #15392 from ricardoquesada/chipmunk_js_fix 
Chipmunk js fix
 2016-04-07 16:24:28 -07:00
Ricardo Quesada f243cc4ce3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-07 16:22:49 -07:00
pandamicro f1108bfbe3 Fix a issue in cc.CallFunc JSB implementation 2016-04-07 23:49:57 +08:00
CocosRobot 416d2531fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 15:25:41 +00:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3 
Issue fixes and update engine version
 2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-07 22:40:32 +08:00