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

8029 Commits

Author SHA1 Message Date
minggo 14f2599bf8 Merge pull request #2173 from rogerzanoni/master 
Quick fix on make-all-linux-project script
 2013-03-17 19:08:31 -07:00
minggo 19cf6665c4 Merge pull request #2176 from folecr/easierandroidbuild 
Improvements to android build setup and samples' build scripts
 2013-03-17 18:58:11 -07:00
minggo 1382f7efc0 Merge pull request #2175 from ricardoquesada/eclipse_readme_fixes 
README.md eclipse improvements
 2013-03-17 18:52:39 -07:00
James Chen 62d7dd5002 Merge pull request #2182 from dumganhar/master 
fixed #1642: Cxx-generator now works ok on windows, it uses the same config file as unix. For details, please refer to README file.
 2013-03-16 23:50:10 -07:00
James Chen 3ffd531648 Fixing bugs of genbindings-win32.bat on windows xp. 2013-03-17 14:48:00 +08:00
James Chen 831f001f54 Adding ._.XXX files to ignore file. 2013-03-17 14:36:11 +08:00
James Chen ec0ded0766 Adding dos2unix.exe 2013-03-17 14:34:29 +08:00
James Chen 77469346cf fixed #1642: Renaming `extra_flag` to `extra_flags`. 2013-03-17 14:11:15 +08:00
James Chen 5c30675455 fixed #1642: Updating genbindings.sh, adding empty variable `extra_flags`. 2013-03-17 14:10:20 +08:00
James Chen 6bc5c3b0a8 fixed #1642: Cxx-generator now works ok on windows, it uses the same config file as unix. For details, please refer to README file. 2013-03-17 14:07:41 +08:00
James Chen 133872c78b Merge pull request #2181 from dumganhar/master 
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
 2013-03-16 19:45:53 -07:00
James Chen d9c19ab26b [WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe. 2013-03-17 10:43:56 +08:00
minggo 5f3edd66b9 Merge pull request #2180 from fins/master 
fix crash in CCBReader::readFloat()
 2013-03-16 19:37:08 -07:00
fins 3b6c46b478 fix crash in CCBReader::readFloat() 2013-03-16 23:47:58 +01:00
Sam Clegg 8b6d23538d Fix linux library path. 
linux libraries were being built to "cocos2dx/lib/linux" rather
than just lib/linux.

Always used absolute path for -rpath linker argument.
 2013-03-16 09:01:21 -07:00
Sam Clegg 04c1a863a0 Remove tailing newlines from CCLog messaages. 
Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
 2013-03-16 09:01:21 -07:00
James Chen b5d3de0104 Merge pull request #2177 from dumganhar/iss1836-jsb-scheduler 
fixed #1836: JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass.
 2013-03-16 06:35:34 -07:00
James Chen 3aeb22292b Reverting ccarray_to_jsval. 2013-03-16 21:23:33 +08:00
James Chen 09757428e7 fixed #1836: JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass. 2013-03-16 21:14:39 +08:00
folecr 6dba49f25b Android build_native.sh now reads local.properties for environment variables 2013-03-15 16:44:16 -07:00
folecr ef9de9286c Setup user environment for building Android port. 2013-03-15 16:44:09 -07:00
Ricardo Quesada 59ca1e198a README.md eclipse improvements 
Includes screenshots, fixes instructions, looks better
 2013-03-15 15:20:39 -07:00
Roger Zanoni 83d9dd33c2 Add an environment variable to give the developer an option to disable apt-get usage 
After the introduction of the "set -e" option, the build script fails on non debian/ubuntu linux distributions.

This is a quick fix to allow the users of distros other than debian/ubuntu to build the library, not a definitive solution.
The COCOS2DX_USEAPT environment variable can be set in the user shell config or used directly in
the command line: COCOS2DX_USEAPT=false ./make-all-linux-project.sh
 2013-03-15 12:54:42 -04:00
Andre Rudlaff a1602a992b fontcache map is now static, as we do not need external linkage for it. 2013-03-15 17:54:24 +01:00
James Chen 2fbd09fe27 Merge pull request #2172 from dumganhar/master 
Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions.
 2013-03-15 07:25:17 -07:00
James Chen 529e65787a Fix the crash CrystalCraze, we should check whether the arr parameter is valid for ccarray_to_jsval. 2013-03-15 22:22:44 +08:00
James Chen ce26f2329d Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions. 2013-03-15 22:17:38 +08:00
Andre Rudlaff d3ecb09c9b Merge branch 'master' into feature-linux-fontcache 2013-03-15 08:54:15 +01:00
James Chen be5791a0ec Merge pull request #2170 from CocosRobot/updategeneratedsubmodule_1363319835 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-14 20:59:07 -07:00
CocosRobot da16e7d2ff cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-15 11:57:26 +08:00
James Chen e7379bf99f Merge pull request #2169 from dumganhar/master 
Updating the submodule of cxx-generator to the latest one.
 2013-03-14 20:55:55 -07:00
James Chen 92d0e1c983 Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one. 2013-03-15 11:53:56 +08:00
James Chen ba71432dea Merge pull request #2168 from CocosRobot/updategeneratedsubmodule_1363318521 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-14 20:42:06 -07:00
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