James Chen
8b466f12a2
fixed #1838 : Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 16:33:23 +08:00
minggo
42b74758f5
change Android.Manifest.xml to unix style
2013-03-19 16:30:11 +08:00
minggo
6577279ff7
Merge pull request #2200 from minggo/test-before-release
...
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-18 23:26:45 -07:00
Rohan Kuruvilla
80a268baf6
Fixing couple of bugs in reader that was checked into different branch
2013-03-18 23:20:14 -07:00
minggo
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
James Chen
aa022b532d
Merge pull request #2198 from CocosRobot/updategeneratedsubmodule_1363671942
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 22:47:18 -07:00
CocosRobot
afccad27e1
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-19 13:45:54 +08:00
James Chen
ac509f70db
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-19 13:11:33 +08:00
James Chen
b6df232039
Merge pull request #2196 from dumganhar/fake-master
...
fixed #1838 : Updating iOS project setting for CocosDragonJS. Regenerating all resources with the latest CocosBuilder.
2013-03-18 22:09:30 -07:00
James Chen
7b5e2351c3
Updating jsb_cocosbuilder.js.
2013-03-19 13:08:34 +08:00
James Chen
b4c52f9c5a
Regenerating all resources with the latest CocosBuilder.
2013-03-19 13:05:17 +08:00
James Chen
3380c7cdca
fixed #1838 : Updating iOS project setting for CocosDragonJS.
2013-03-19 13:05:06 +08:00
James Chen
97a91c5294
Update AUTHORS
2013-03-19 13:00:10 +08:00
James Chen
deb739f13b
Merge pull request #2194 from rohankuruvilla/ccbreader
...
fixed #1838 : Latest CCBReader changes.
2013-03-18 21:56:13 -07:00
Rohan Kuruvilla
e4efa88d00
Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc
2013-03-18 20:54:48 -07:00
minggo
a3ea9b782a
Update AUTHORS
2013-03-19 10:00:39 +08:00
minggo
d9f47d2066
Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug
...
fix cc scale9 sprite bug
2013-03-18 18:37:17 -07:00
Rohan Kuruvilla
5ca6648e47
Updating CCBReader JS bootstrap file
2013-03-18 16:06:48 -07:00
Rohan Kuruvilla
f53b3633be
Updating generator for CCBAnimationManager bindings
2013-03-18 16:06:48 -07:00
Rohan Kuruvilla
c86e8376dc
Adding dependency on CocosDenshion for CocosBuilderReader in Android makefile
2013-03-18 16:06:47 -07:00
Rohan Kuruvilla
8680d4dbfc
Adding animation callback support for native classes
2013-03-18 16:06:47 -07:00
Rohan Kuruvilla
035c0d7eee
Modifyign CCBSequence to do proper copy of objects
2013-03-18 16:06:47 -07:00
Rohan Kuruvilla
9acaaa289a
Making the changes to support Sound, Callbacks and skew property in CCBReader
2013-03-18 16:06:46 -07:00
Andre Rudlaff
865a730ef5
added kResolutionFixedHeight and kResolutionFixedWidth resolution policy
...
These new resolution policies will either ignore the width or height of the
specified design resolution size, but scale the ignored dimension, so it
matches the aspect ratio of the device.
Example:
A device with 854x480 pixels and a design resolution size set to 480x320
and the kResolutionFixedHeight policy, will create an internal canvas of
the size of 570x320px
If the device original size is 800x480 its internal size will be
534x320px
The height for both examples stays the same, the width is adjusted to match
the aspect ratio
Benefits:
- no distortions
- full canvas is usable, the visibility origin is 0/0
- I can use getWinSize() to place objects which is more intuitive
- for objects that should be placed at 0/0 I can use CGPointZero or 0/0 instead
of the VisibilityRect methods, which is more readable
- using this method projects from the 1.x branch are probably much easier to
port
Disadvantages:
- it is the developers responsibility to create the game code so that it
supports multiple aspect ratios
2013-03-18 20:06:01 +01:00
James Chen
f0638245fd
Merge pull request #2191 from dumganhar/master
...
Fixing wrong display of CCEditbox on retina iOS device.
2013-03-18 08:18:29 -07:00
James Chen
1cbc796805
Fixing wrong display of CCEditbox on retina iOS device.
2013-03-18 23:14:20 +08:00
James Chen
234300ce18
Merge pull request #2189 from dumganhar/master
...
Synchronizing cocos2d-js-test to the latest one.
2013-03-18 03:26:33 -07:00
James Chen
6a98553633
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
2013-03-18 18:24:37 +08:00
minggo
15733e0089
Merge pull request #2187 from minggo/merge-fape-android-eclipse
...
merge pull request and fix some conflicts
2013-03-18 01:16:10 -07:00
minggo
58618172e6
merge pull request and fix some conflicts
2013-03-18 16:15:48 +08:00
minggo
49c57ad233
Merge pull request #2186 from minggo/test-before-release
...
make AssetsManager work on iOS
2013-03-18 00:58:55 -07:00
minggo
529a9bf394
make AssetsManager work on iOS
2013-03-18 15:57:30 +08:00
James Chen
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
CocosRobot
d098eb06aa
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 15:41:39 +08:00
James Chen
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
James Chen
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
minggo
819b7d753e
Merge pull request #2183 from minggo/iss1803-spritetest-lua
...
Iss1803 spritetest lua
2013-03-17 20:32:58 -07:00
minggo
1560bb2af8
don't require un-exist file in ActionsTest.lua
2013-03-18 11:26:38 +08:00
minggo
ac2a52e71b
modify version
2013-03-18 11:25:27 +08:00
minggo
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
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