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

35964 Commits

Author SHA1 Message Date
minggo c4d0d56f3a check pointer before using (#17215) 2017-01-19 09:32:58 +08:00
minggo 00b9dcd62e Lua custom handler (#17211) 
* avoid crash if custom handler vector is empty

* simplify codes
 2017-01-18 17:05:08 +08:00
Nakhyun Choi 42c77247cc Fixed Scheduler bug occured when unschedule target during update. (#17203) 2017-01-18 16:32:36 +08:00
mogemimi 8b9c89f6a9 Fix typos in comments and strings (#17201) 2017-01-18 15:41:18 +08:00
mogemimi efc3e5979b Fix typo in function name (#17202) 2017-01-18 15:40:46 +08:00
Aleksey Zolotov 0de81de721 fix #14936 (#17190) 
* fix #14936

* #14936 testcases
 2017-01-17 09:48:30 +08:00
minggo d9637f30b0 remove scheduler in time (#17198) 
* remove scheduler in time

* fix compiling error

* add test case

* fix logic error
 2017-01-16 17:37:59 +08:00
mogemimi 888b985e0e Fix variable name typo (#17195) 2017-01-16 11:21:34 +08:00
CocosRobot 21d57bfd39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17185) 2017-01-16 11:20:39 +08:00
mogemimi bebd11f853 Correct spelling of "intersect" (#17194) 2017-01-16 11:20:07 +08:00
Ricardo Quesada 88a1cd73fa improves fix for issue #17119 (v3) (#17188) 2017-01-16 09:30:08 +08:00
newnon 59403ad40d Propagate onTouchCancelled (#17174) 2017-01-13 18:09:01 +08:00
newnon 61c856679e getLetter function for Text (#17178) 2017-01-13 18:06:01 +08:00
newnon 7b430ce7c2 fix child removing from ListView (#17177) 2017-01-13 14:38:28 +08:00
newnon 15e56c06a4 outline to float (#17176) 2017-01-13 14:31:12 +08:00
CocosRobot f2114f36f8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183) 2017-01-13 14:04:11 +08:00
minggo 1b6c8cc5c1 bind FileUtils:getDataFromFile() to lua (#17182) 2017-01-13 13:39:58 +08:00
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