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

35679 Commits

Author SHA1 Message Date
Xpol Wan cb0e768f32 Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'. 2016-04-14 17:09:37 +08:00
minggo 009c7926f6 update changelog (#15424) 2016-04-14 15:09:58 +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
zilongshanren e987f13d56 Merge pull request #15422 from CocosRobot/update_cocosfiles_1460599040 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-13 21:02:18 -05:00
CocosRobot d1ced49baa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-14 01:57:22 +00:00
zilongshanren 637d5f5362 Merge pull request #15421 from zilongshanren/update-3rd-party-libs-311 
upgrade deps to 90
 2016-04-13 20:53:20 -05:00
zilongshanren 2b4f3cf898 upgrade deps to 90 2016-04-14 09:16:51 +08:00
Dale Stammen fe84af5dbd added zlib.dll 2016-04-12 17:18:47 -07:00
Dale Stammen acb38c9f16 ignore VS 2015 .VC.db files 2016-04-12 16:19:03 -07:00
Бесшапошников Никита 32e9f9eb15 Add js-tests for page view indicator tune. 2016-04-11 13:44:25 +03: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
Бесшапошников Никита 2246495cc3 Add test for page view indicator tune 2016-04-11 12:29:02 +03:00
Бесшапошников Никита 23d074ea34 Make PageView indicator more tunable: 
-add possibility to change texture of index nodes
-add possibility to change color of index nodes
-add possibility to change scale of index nodes
 2016-04-11 12:28:47 +03:00
minggo 61a83aca2e Merge pull request #15407 from minggo/sync-to-v3.11 
Sync to v3.11
 2016-04-11 12:53:52 +08:00
minggo 3b5c1eb0f2 update web submodule 2016-04-11 11:55:45 +08:00
James Chen f3e6e8331a Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-11 11:54:15 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
minggo d2519b9342 Merge pull request #15406 from pandamicro/v3.11 
Sync necessary changes to v3.11 and update web engine
 2016-04-11 11:36:34 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Бесшапошников Никита 32b64831da Fixed ccui.ListView Test 2016-04-11 11:28:46 +08:00
Бесшапошников Никита cf32f8a2f0 Add PageView js tests 2016-04-11 11:27:50 +08:00
Бесшапошников Никита 273281ecce Add ListView js tests 2016-04-11 11:27:38 +08:00
Бесшапошников Никита 8ae6d68640 Add scroll view bar js test 2016-04-11 11:27:25 +08:00
pandamicro e2baba2d7b Update web engine ref 2016-04-11 11:18:55 +08:00
Ricardo Quesada fea84b8af3 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-11 11:12:34 +08:00
pandamicro 79cfe8ac0e Fix a issue in cc.CallFunc JSB implementation 2016-04-11 11:12:13 +08:00
CocosRobot 150ec2e7ce [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 11:11:54 +08:00
pandamicro f9f9551645 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-11 11:11:34 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
pandamicro f450405d4e Fix AssetsManagerEx issue with failed asset 2016-04-11 11:11:00 +08:00
pandamicro 4bd6834ad6 Merge pull request #15405 from CocosRobot/update_cocosfiles_1460338764 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-11 10:17:22 +08:00
CocosRobot 02e3fca1fa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-11 01:39:26 +00:00
minggo ef7f38b6a9 compile v3.11 2016-04-11 09:36:44 +08: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
minggo 5c0efd7b2e Merge pull request #15400 from MSOpenTech/v3.11-winrt-websockets 
v3.11 updated version and filesize to get latest winrt websockets builds
 2016-04-09 09:07:32 +08:00
Dale Stammen acf6dbc77c updated version and filesize 2016-04-08 08:26:18 -07: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