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

7793 Commits

Author SHA1 Message Date
CocosRobot 5ee810c535 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-15 11:35:51 +08:00
James Chen d9ee848246 Update AUTHORS 2013-03-15 10:38:11 +08:00
James Chen 9a5116e406 Merge pull request #2167 from Weeds/feature-linux-fontdimensions 
fixed #1834: [Linux] fixed font rendering artifacts, added simple line break.
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
 2013-03-14 19:35:20 -07:00
James Chen 8924eaf34e Update AUTHORS 2013-03-15 10:09:24 +08:00
James Chen 7326df875e Merge pull request #2154 from jedy/fix_ccnode_doc 
fix: can't generate CCNode.h's document with doxygen 1.8.3
 2013-03-14 19:06:58 -07:00
Andre Rudlaff e8ee3a9b83 [Linux] fixed font rendering artifacts, added simple line break 
This patch fixed the size calculations for true type fonts (especially for
italic fonts)
Additinally a very simple greedy line break algorithm has been added for
true type labels.
 2013-03-15 00:24:25 +01:00
James Chen 3a2d78a72b Merge pull request #2166 from dumganhar/master 
Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now.
 2013-03-14 08:25:25 -07:00
James Chen ae2f2e2f0e Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now. 2013-03-14 23:23:52 +08:00
James Chen 8422a6ea17 Merge pull request #2165 from dumganhar/master 
fixed #1830: Casting `unsigned short*` to `jschar*` where invoking `cc_utf8_to_utf16`.
 2013-03-14 05:41:49 -07:00
James Chen 911f607484 Tabs ~> 4 spaces 2013-03-14 20:38:52 +08:00
James Chen 293e17494d fixed #1830: Force casting `unsigned short*` to `jschar*` for `cc_utf8_to_utf16`. 2013-03-14 20:34:54 +08:00
minggo 3bef9cc749 Merge pull request #2159 from DarraghCoy/add_ccset_create 
Add CCSet::create() function
 2013-03-14 03:21:17 -07:00
minggo 2cfcff0b1a Merge pull request #2157 from kevinxuewei/patch-1 
Update make-all-linux-project.sh
 2013-03-14 03:20:16 -07:00
James Chen d783715c18 Merge pull request #2164 from dumganhar/iss1824-editbox-js 
fixed #1824:  Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
 2013-03-14 03:19:45 -07:00
minggo f80318cc8d Merge pull request #2163 from minggo/iss1803-spritetest-lua 
add some lua test cases
 2013-03-14 03:18:41 -07:00
minggo ee846c3248 Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua 2013-03-14 18:14:57 +08:00
James Chen 3e33868a63 fixed #1824: Exposed cc.EditBox to js. 2013-03-14 18:14:16 +08:00
minggo 7c8de5aebe issue #1803:add SpriteOffsetAnchorFlip 2013-03-14 18:14:01 +08:00
minggo 5936f4db2c issue #1803:add SpriteBatchNodeOffsetAnchorRotationalSkewScale 2013-03-14 17:45:21 +08:00
minggo e47baa7984 issue #1803:add SpriteBatchNodeOffsetAnchorSkewScale 2013-03-14 15:49:20 +08:00
minggo 815733e0b7 issue #1803:add SpriteOffsetAnchorRotationalSkewScale 2013-03-14 15:11:55 +08:00
James Chen 384ec64a88 Update AUTHORS 2013-03-14 14:51:07 +08:00
James Chen 4d8fa8973e Merge pull request #2161 from dumganhar/iss1825-ios-editbox 
fixed #1825: Using CCLabelTTF to show text for CCEditBox of iOS port.
 2013-03-13 23:48:02 -07:00
James Chen 0a0796b572 fixed #1825: Fixing compilation errors for CCEditBox of win32 port. 2013-03-14 14:39:59 +08:00
minggo 0fe38f073c issue #1803:add SpriteOffsetAnchorSkewScale 2013-03-14 14:35:33 +08:00
James Chen edc02b5777 fixed #1825: The default color of text on CCEditBox is WHITE now. Fixed issues for CCEditBox of MAC port. 2013-03-14 14:29:22 +08:00
minggo d18a664e08 issue #1803:handle onExit event to release resources 2013-03-14 11:53:34 +08:00
James Chen cf999be928 Merge branch 'master' of https://github.com/neokim/cocos2d-x into ios-editbox 2013-03-14 11:30:41 +08:00
James Chen cce4733f31 Merge pull request #2160 from CocosRobot/updategeneratedsubmodule_1363231211 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-13 20:22:40 -07:00
CocosRobot 0b828a67c7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-14 11:20:23 +08:00
James Chen a57cc21d7a Merge pull request #2156 from dumganhar/iss1830-jsb-utf8 
fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script.
 2013-03-13 19:59:25 -07:00
Darragh Coy 55dd6a6129 Add CCSet::create() to create, autorelease and return a new empty set. 2013-03-13 10:58:24 -07:00
kevinxuewei 94bbd169c8 Update make-all-linux-project.sh 
fix bug for auto install 'MISSING' pkg
 2013-03-13 22:38:35 +08:00
James Chen 29aa62d923 fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script. 2013-03-13 18:10:54 +08:00
minggo 58117a6aaf Merge pull request #2155 from minggo/iss1803-spritetest-lua 
refactor lua test cases
 2013-03-13 02:49:46 -07:00
minggo 6507a7fd7f Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua 2013-03-13 17:47:04 +08:00
minggo e82074eb4f issue #1803:refactor lua codes 2013-03-13 17:45:09 +08:00
wu.hao 521fac290d fix: can't generate CCNode.h's document with doxygen 1.8.3 2013-03-13 14:56:17 +08:00
James Chen 0f3344387d Merge pull request #2152 from CocosRobot/updategeneratedsubmodule_1363147492 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-12 22:03:34 -07:00
CocosRobot 57b7a85dc8 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-13 12:05:05 +08:00
minggo 2bc703c3f0 Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime 
add m_fDeltaTime getter function
 2013-03-12 19:38:57 -07:00
minggo 85f39cee24 Merge pull request #2114 from linshun/master 
Added compatible function for multi secene resouces preloading.
 2013-03-12 19:38:09 -07:00
minggo a987c87844 Merge pull request #2151 from sbc100/fix_warning 
Fix warning in linux build.
 2013-03-12 19:30:51 -07:00
minggo 2a9cde6af6 Merge pull request #2149 from fape/jsb_update 
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AssetsManagerTest and CocosPlayer
 2013-03-12 19:28:16 -07:00
James Chen b77e5bc2cb Merge pull request #2147 from CocosRobot/updategeneratedsubmodule_1363104181 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-12 18:50:57 -07:00
Sam Clegg 863286b0b9 Fix warning in linux build. 
Also, define _DEBUG rather then DEBUG in linux and nacl makefiles
by default, and limit the command line definions that are used
when building Box2D.
 2013-03-12 16:59:22 -07:00
Andre Rudlaff 67ad11dbee [Linux] add cache for font family -> font path mapping 
As FcFontMach is quite an expensive call the results of getFontFile() are
now cached in an std::map if either a ttf file is packed with the app or
if a font file has been found by using fontconfig
 2013-03-13 00:11:35 +01:00
fape 75c68f178a Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp 2013-03-12 22:18:45 +01:00
CocosRobot bf31b7af26 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-13 00:03:13 +08:00
James Chen d19a631fbe Merge pull request #2146 from dumganhar/master 
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
 2013-03-12 07:05:32 -07:00