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

34426 Commits

Author SHA1 Message Date
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
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
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
pandamicro 817f4f4871 Update engine version 2016-04-07 22:36:29 +08:00
pandamicro 15d6a6a472 Fix AssetsManagerEx issue with failed asset 2016-04-07 22:30:52 +08:00
minggo 6ac9a42e6c Merge pull request #15383 from mogemimi/fix-implicit-conversion 
Fix implicit conversion issues with Xcode 7.3
 2016-04-07 17:58:30 +08:00
minggo d8764ab730 Merge pull request #15200 from perminovVS/v3-dev-wic-image-loader-bad-hresult 
WICImageLoader incorrect use S_FALSE constant
 2016-04-07 17:31:15 +08:00
pandamicro 9de585077a Merge pull request #15369 from ntrrgc/develop 
Make selectedSprite optional in JSB too
 2016-04-07 17:07:03 +08:00
minggo aa53e9d8eb Merge pull request #15381 from dumganhar/patch-removeAllEventlistener 
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
 2016-04-07 16:34:07 +08:00
minggo f2cf092037 Merge pull request #15380 from CocosRobot/update_lua_bindings_1460015052 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-07 16:31:18 +08:00
mogemimi c0e4780e77 Fix implicit conversion issues with Xcode 7.3 2016-04-07 17:01:17 +09:00
James Chen 514ac58bf3 Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-07 15:50:59 +08:00
CocosRobot dfe3dc5e14 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 07:46:49 +00:00
minggo 328331df4f Merge pull request #15179 from mogemimi/remove-const-from-return 
Remove unnecessary const from return types in PU and Lua
 2016-04-07 15:41:00 +08:00
minggo c4d43e7a29 Merge pull request #15197 from perminovVS/v3-dev-manifest-prepend-search-paths-check 
Update SearchPaths if real need
 2016-04-07 15:15:54 +08:00
James Chen 6dff5fdc13 std::shared_ptr<bool> -> std::shared_ptr<std::atomic<bool>> 
The reference count field in shared_ptr is threadsafe but the value field is not. So we need to wrap a std::atomic for preventing potential thread racing.
 2016-04-07 15:06:19 +08:00
Nam Hyeon Uk 7f2b0edc04 Vector iterator declaration & initializer list constructor 
* Vector iterator typedef -> alias declaration

* Vector constructor with initializer list

* fix indent
 2016-04-07 13:47:01 +08:00
JANG SUN HYUK 107cef0667 getRandomObject() in Vector, Map is changed 
* getRandomObject is changed

https://github.com/cocos2d/cocos2d-x/issues/15270

getRandomObject issue in Vector

* Update CCMap.h

* Update CCVector.h
 2016-04-07 11:46:54 +08:00
minggo 43a70f0a92 Merge pull request #15342 from xpol/allow-easy-decrypt-plist-files 
Allow plist and other ValueMap files be (easy) decrypted.
 2016-04-07 11:02:20 +08:00