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

36397 Commits

Author SHA1 Message Date
David DeSimone c258b03f13 Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140) 2017-01-13 10:05:46 +08:00
danut007ro 84a3f73ecb Particle set display frame (#17163) 
* Fix CCParticleSystemQuad::setDisplayFrame()

* Added tests
 2017-01-12 11:48:30 +08:00
minggo 8fbc905134 purge glfw3 before installing glfw3.2 (#17165) 
* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2
 2017-01-12 11:42:01 +08:00
mogemimi 91beb8db86 Fix incorrect function name for calculateBillboardTransform (#17164) 2017-01-12 10:14:04 +08:00
mogemimi 71a82f0f0d Correct spelling of function name `getAncestorWidget` (#17158) 2017-01-11 05:36:13 -08:00
mogemimi 6e8ced6c8c Fix minor typos in function parameters (#17157) 2017-01-11 05:34:57 -08:00
Ricardo Quesada 21795b71b4 sprite: doc fixes (#17154) 2017-01-11 05:33:41 -08:00
minggo 3bcf8fc48a use std::stable_sort to keep order (#17156) 2017-01-11 15:47:36 +08:00
minggo afb55253f1 fix dutch language value and add missing languages (#17160) 2017-01-11 14:04:45 +08:00
CocosRobot 90e0ab0c2e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17152) 2017-01-11 10:49:48 +08:00
mogemimi 1d2b73166e Fix typos in docs (#17132) 2017-01-11 09:31:45 +08:00
CocosRobot 91ae4b1c03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143) 2017-01-10 16:59:15 +08:00
Dale Stammen e9a947b02a updated location of openssl dlls (#17133) 2017-01-10 16:50:22 +08:00
minggo 733799f4a1 fix crash if physics3d camera is not set (#17139) 2017-01-10 15:37:29 +08:00
Ricardo Quesada e100d02dff Sprite fixes: color + polygon (#17135) 
* fixes issue #17119

and sanitizes the code a little bit

* more fixes

* fixes issue #17116

* restore xcode "none" sign profile

* code is cleaner

add more documentation in CCSprite.h

* missing assets

* anchor point works with batchnodes again
 2017-01-10 15:28:47 +08:00
minggo 5d41d3c65e add cocos/editor-support into search path (#17137) 2017-01-10 11:57:01 +08:00
minggo 9d3d869c9d make webview can clean cached data (#17130) 
* make webview can clean cached data

* add implementatoin
 2017-01-10 11:30:11 +08:00
minggo 0cb1e29323 update cocos console to fix compiling error with Android Studio projects (#17129) 2017-01-09 14:44:52 +08:00
Steve Tranby 3d4d56d83a Update BugsTest.cpp (#17125) 
comment out Bug #15776 because it currently crashes during autotest
 2017-01-09 09:36:00 +08:00
minggo 4574896dbb add some comments for key limitation (#17122) 2017-01-09 09:27:38 +08:00
子龙山人 eb730c10ec Merge pull request #17127 from DavidDeSimone/ios-edbox-improvements-v3 
Fix for issue #17114.
 2017-01-09 09:26:32 +08:00
DavidDeSimone 54c32fc669 Fix for issue #17114. Improves the ability to add placeholder color and font for single line text fields on iOS 2017-01-08 16:02:17 -08:00
dandan387 cb95ed5b18 English refinements (#17117) 
English refinements.
 2017-01-06 09:39:41 +08:00
Wilson E. Alvarez af503f4a65 Allow velocity to be applied to Chipmunk's kinematic bodies (#17094) 
* Allow velocity to be applied to Chipmunk's kinematic bodies

* Added check for CP_BODY_TYPE_STATIC

Thanks to @minggo for the code review
 2017-01-06 09:35:34 +08:00
kosmosR2 44fb4ba3bc To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. (#16989) 2017-01-05 16:12:03 +08:00
子龙山人 e50d967a26 Merge pull request #17113 from CocosRobot/update_lua_bindings_1483580435 
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2017-01-05 14:45:31 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
Slack-Moehrle 2dc382bdf0 English refinements (#17109) 
English refinements.
 2017-01-05 09:33:23 +08:00
Ricardo Quesada ff8e622b7a Slice9 Sprite with triangles, not quads (#17105) 
* sprites: use triangles instead of quads

uses less memory

* oops, color should be white by default

* works with flipped sprites

* none for xcode
 2017-01-05 09:27:13 +08:00
minggo 93d193dfcc Openssl adjust (#17106) 
* change openssl search path

* copy libopenssl from openssl folder

* update external version
 2017-01-05 09:22:38 +08:00
effolkronium f5a90765fc fix type conversion warnings (#17061) 
* Fix conversion warning

from unsigned int to float

* Fix type conversion warning

* Fix type conversion warning

* change the return type of getOutlineSize to float

* fix typo
 2017-01-04 12:01:07 +08:00
子龙山人 8e21738634 fix text input auto correction type (#17085) 2017-01-04 12:00:18 +08:00
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314 
Merge v314
 2017-01-04 11:48:31 +08:00
CocosRobot 61170c69ee [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17103) 2017-01-04 11:47:58 +08:00
minggo 79126ea72a make ListView::setGlobalZOrder() work (#17098) 
* make ListView::setGlobalZOrder() work

* revert modification of UIButton

* reset background color

* change global z order to test
 2017-01-04 11:06:44 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
minggo e5e431eeba update chinese release note 2017-01-03 09:54:16 +08:00
Ricardo Quesada b3279bafa7 implements issue #17069 (#17090) 
implemnts suggestion done by @three0s
 2017-01-03 09:49:22 +08:00
pandamicro e16828647c Fix web engine canvas mode issues (#17095) 
* Update web ref

* Fix custom event being discard during event emission

* Fix web engine canvas mode issues

* Revert "Fix custom event being discard during event emission"

This reverts commit 3f42273e1e86bc3c977abc61a45d30169d5c35ff.

* Update web ref
 2017-01-03 09:40:38 +08:00
Huabing.Xu 0564d43478 fix bug, do not add null bones (#16948) 2016-12-29 15:44:57 +08:00
James Chen e4e872a065 fixed #16849: Preload many audios may cause crash on devices those use Samsung Exynos CPU. (#17049) 
* fixed #16849: Preload many audios may cause crash on devices those use Samsung Exynos CPU.

* Adds comment for __SLPlayerMutex variable.

* Fixes wrong comments in AudioDecoder.cpp
 2016-12-29 15:41:47 +08:00
niu2x ce4685c64f vec4 operator < seems error (#17072) 
* bug fix

* Vec4 operator <
 2016-12-29 15:26:25 +08:00
子龙山人 4c5459660b Merge pull request #17038 from MrCapone/ui_touch_fixes 
CheckBox touch fix
 2016-12-29 14:20:15 +08:00
子龙山人 163e730849 Fix label disableeffect (#17075) 
* add toggle rendering type test

* fix label additional kerning

* only substract additionalKerning when bold is enabled
 2016-12-29 13:59:24 +08:00
子龙山人 e44b9d5f20 Merge pull request #17082 from CocosRobot/update_lua_bindings_1482978657 
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2016-12-29 13:51:52 +08:00
CocosRobot#Set 7950719e83 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-29 02:31:01 +00:00
James Chen 208d39151e Reverts create thread pool code, android doesn't need to create a thread pool in AudioEngine.cpp (#17081) 2016-12-29 10:22:45 +08:00
James Chen be43c4210f Fixes crash that playing long audio and then uncacheAll (#17079) 
* Fixes crash of playing long audio then uncacheAll.

* update

* Updates comments in MciPlayer.h

* tab -> 4spaces

* include path fix.
 2016-12-29 10:05:13 +08:00
minggo c15da89c5e use projection 2d (#17078) 2016-12-28 18:20:14 +08:00
pandamicro 1234e88046 Update web ref (#17073) 2016-12-28 10:47:42 +08:00