49c57ad233
Merge pull request #2186 from minggo/test-before-release
...
make AssetsManager work on iOS
2013-03-18 00:58:55 -07:00
529a9bf394
make AssetsManager work on iOS
2013-03-18 15:57:30 +08:00
4269faa858
Merge pull request #2185 from CocosRobot/updategeneratedsubmodule_1363592486
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 00:46:57 -07:00
d098eb06aa
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 15:41:39 +08:00
f52e56be20
Merge pull request #2184 from dumganhar/iss1837-jsb-schedule
...
fixed #1837 : Refactoring schedule binding codes.
1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since schedules need to be associated with _schedFunc_target_ht and _schedObj_target_ht.
2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 00:35:33 -07:00
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
819b7d753e
Merge pull request #2183 from minggo/iss1803-spritetest-lua
...
Iss1803 spritetest lua
2013-03-17 20:32:58 -07:00
1560bb2af8
don't require un-exist file in ActionsTest.lua
2013-03-18 11:26:38 +08:00
ac2a52e71b
modify version
2013-03-18 11:25:27 +08:00
c404e03d26
Merge pull request #2150 from Weeds/feature-linux-fontcache
...
[Linux] add cache for font family -> font path mapping
2013-03-17 19:15:04 -07:00
14f2599bf8
Merge pull request #2173 from rogerzanoni/master
...
Quick fix on make-all-linux-project script
2013-03-17 19:08:31 -07:00
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
1382f7efc0
Merge pull request #2175 from ricardoquesada/eclipse_readme_fixes
...
README.md eclipse improvements
2013-03-17 18:52:39 -07:00
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
3ffd531648
Fixing bugs of genbindings-win32.bat on windows xp.
2013-03-17 14:48:00 +08:00
831f001f54
Adding ._.XXX files to ignore file.
2013-03-17 14:36:11 +08:00
ec0ded0766
Adding dos2unix.exe
2013-03-17 14:34:29 +08:00
77469346cf
fixed #1642 : Renaming `extra_flag` to `extra_flags`.
2013-03-17 14:11:15 +08:00
5c30675455
fixed #1642 : Updating genbindings.sh, adding empty variable `extra_flags`.
2013-03-17 14:10:20 +08:00
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
133872c78b
Merge pull request #2181 from dumganhar/master
...
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
2013-03-16 19:45:53 -07:00
d9c19ab26b
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
2013-03-17 10:43:56 +08:00
5f3edd66b9
Merge pull request #2180 from fins/master
...
fix crash in CCBReader::readFloat()
2013-03-16 19:37:08 -07:00
3b6c46b478
fix crash in CCBReader::readFloat()
2013-03-16 23:47:58 +01:00
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
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
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
3aeb22292b
Reverting ccarray_to_jsval.
2013-03-16 21:23:33 +08:00
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
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
ef9de9286c
Setup user environment for building Android port.
2013-03-15 16:44:09 -07:00
59ca1e198a
README.md eclipse improvements
...
Includes screenshots, fixes instructions, looks better
2013-03-15 15:20:39 -07:00
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
a1602a992b
fontcache map is now static, as we do not need external linkage for it.
2013-03-15 17:54:24 +01:00
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
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
ce26f2329d
Updating VS2012 solution, CystalCraze project depends on libJSBinding and libExtensions.
2013-03-15 22:17:38 +08:00
d3ecb09c9b
Merge branch 'master' into feature-linux-fontcache
2013-03-15 08:54:15 +01:00
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
da16e7d2ff
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:57:26 +08:00
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
92d0e1c983
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
2013-03-15 11:53:56 +08:00
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
5ee810c535
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:35:51 +08:00
d9ee848246
Update AUTHORS
2013-03-15 10:38:11 +08:00
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
8924eaf34e
Update AUTHORS
2013-03-15 10:09:24 +08:00
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
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
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
minggo