folecr
d0f6a618a4
Readme with instructions on running the emulator correctly for developing cocos2d-x
2013-03-19 16:00:07 -07:00
Roger Zanoni
fdb1d69efe
Fix linux build
...
The cocos library uses libpthread and libGL on linux, so we need to link
with them.
2013-03-19 18:44:11 -04:00
whitegfx
6cb3f6bcc0
IOS, Added CCEditBoxImplIOS kEditBoxInputFlagSensitive settings.
...
Added case to hide IOS autocorrection in kEditBoxInputFlagSensitive
mode.
2013-03-19 20:00:35 +01:00
walzer
582e35014f
issue #1841 , improve tools/closure-compiler/obfuscate.py to general usage, with input params
2013-03-19 23:53:01 +08:00
James Chen
6c1867f363
Merge pull request #2206 from dumganhar/master
...
Fixing compilation errors for win32.
2013-03-19 04:52:13 -07:00
James Chen
a38fc50593
Fixing compilation errors for win32.
2013-03-19 19:51:07 +08:00
James Chen
5ac87ce9d4
Merge pull request #2205 from CocosRobot/updategeneratedsubmodule_1363687504
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-19 03:39:37 -07:00
CocosRobot
a115096bec
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-19 18:05:15 +08:00
minggo
cdd49ddba6
Merge pull request #2204 from minggo/test-before-release
...
add customer fonts information in Info.plist
2013-03-19 02:49:51 -07:00
James Chen
18f98a88e6
Merge pull request #2203 from dumganhar/master
...
Updating project configuration of TestCpp for all platform since CocosBuilderTest/TimelineCallback&Sound has been added.
2013-03-19 02:49:10 -07:00
James Chen
a09d94fb6b
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
2013-03-19 17:47:09 +08:00
James Chen
aa5f7ffb6a
Updating project setting of testcpp for Marmalade.
2013-03-19 17:46:49 +08:00
minggo
103de28a86
add customer fonts information in Info.plist
2013-03-19 17:46:28 +08:00
James Chen
4a9b07e0c4
Updating libExtensions.vcxproj.
2013-03-19 17:27:39 +08:00
walzer
0d73934f5c
issue #1841 , TestJavascript-ios is obfuscated successfully
2013-03-19 17:21:01 +08:00
James Chen
3ed479d7f4
Updating project configuration of TestCpp for win32.
2013-03-19 17:06:12 +08:00
James Chen
ef98d95e75
Updating project configuration of TestCpp for Android, Linux, Mac and nacl.
2013-03-19 16:59:39 +08:00
minggo
8f90a1cf5d
Merge pull request #2202 from minggo/test-before-release
...
add c project setting for lua samples on android
2013-03-19 01:51:35 -07:00
minggo
aa845b10c7
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
2013-03-19 16:49:45 +08:00
minggo
07eaf286fb
add c project setting for lua samples
2013-03-19 16:49:16 +08:00
James Chen
6110d5df74
Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader
...
fixed #1838 : Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
2013-03-19 01:35:26 -07:00
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