James Chen
32406efec2
Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog
...
Conflicts:
cocos2dx/proj.linux/cocos2dx.mk
2013-04-10 14:17:23 +08:00
James Chen
68867b8798
Merge pull request #2212 from rogerzanoni/linux_link
...
fixed #2044 : Fix linux build, libpthread and libGL libraries need to be linked on linux.
2013-04-09 21:50:54 -07:00
yodesoft
e193dbc4cf
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 11:45:55 +08:00
minggo
a0dc39ca38
fixed #2034:use previous path to get UserDefault.xml
2013-04-10 11:39:01 +08:00
yodesoft
d03b95ca46
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/linux/CCFileUtilsLinux.cpp
2013-04-10 11:16:04 +08:00
yodesoft
ba591b0980
Linux: Set writable path to "<user's home>/.config/<app name>"
2013-04-10 10:55:50 +08:00
minggo
df888eef65
fixed #2042 : remove libxml2
2013-04-10 09:56:31 +08:00
minggo
5d2c67ee8a
fixed #1904:strip libcurl.a on x86 architecture
2013-04-10 09:40:44 +08:00
minggo
3c8b26813e
delete libxml2
2013-04-10 09:39:48 +08:00
James Chen
b8ea3dfe99
Merge pull request #2332 from dumganhar/master
...
cxx-generator ~> bindings-generator.
2013-04-08 22:58:04 -07:00
James Chen
0d5d2e54fd
cxx-generator ~> bindings-generator.
2013-04-09 13:47:12 +08:00
folecr
e91ec3ede5
Clean up linked libraries
...
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
* Remove unused -lEGL
2013-04-08 22:46:25 -07:00
James Chen
55ec9de216
Merge pull request #2326 from harikrishnar/master
...
fixed #2037 : Major problem with initWithObjects method of CCArray.
2013-04-08 21:50:33 -07:00
James Chen
8e4848b243
Merge pull request #2328 from elmiro/readlink
...
fixed #2036 : Correction of passed buffer size to readlink ...
2013-04-08 20:46:08 -07:00
minggo
ac43ff7584
Merge pull request #2325 from minggo/userdefault-hotfix
...
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
2013-04-08 18:34:20 -07:00
elMiro
0f6e2daf31
Correction of passed buffer size to readlink and verification of result return by readlink.
2013-04-09 00:25:31 +02:00
hkrishna
38cb350d39
Problem with initWithObjects of CCArray
...
A new unused array was created instead of using the instance on which
the method was called
2013-04-09 00:08:41 +05:30
James Chen
5e2f1e0bd6
Merge pull request #2272 from Weeds/saxparser-fix
...
fixed #2035 : fixed potential crash in CCSaxParser
2013-04-08 07:49:36 -07:00
minggo
d3aa718b22
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
2013-04-08 21:35:43 +08:00
James Chen
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08:00
James Chen
401b3dca4d
Merge pull request #2282 from DarraghCoy/ccfileutils_create_with_contents_of_file_fix
...
fixed #2031 : Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
2013-04-08 02:33:23 -07:00
James Chen
c3a177e5e6
Merge pull request #2268 from Weeds/ccscheduler-fix
...
fixed #2003 : Fixed potential crash in CCScheduler::removeHashElement.
2013-04-08 02:00:22 -07:00
James Chen
d3eed7fd1f
Merge pull request #2279 from sjchao/master
...
fixed #2030 : Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
2013-04-07 23:55:55 -07:00
James Chen
7a45e1ddd1
Merge pull request #2322 from dumganhar/iss1592-update-uthash
...
fixed #1592 : Updating uthash to v1.9.8.
2013-04-07 23:31:31 -07:00
James Chen
4e2819e86d
Fixing a warning.
2013-04-08 13:51:24 +08:00
James Chen
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
James Chen
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
James Chen
7c6cb8c8cd
commit latest uthash.h utlist.h
2013-04-08 10:59:41 +08:00
minggo
ad68b3d5ed
Merge pull request #2288 from mchinen/master
...
Android: fix emulator for OpenGL ES 2.0
2013-04-07 19:08:00 -07:00
yodesoft
4d5dff6172
Reduce function call in nativeInitBitmapDC to improve performance.
2013-04-07 17:17:19 +08:00
minggo
2436d87cb3
Merge pull request #2256 from waiter/master
...
Add CCRemoveSelf Action
2013-04-06 19:09:17 -07:00
James Chen
038720a1b2
Merge pull request #2290 from Yodesoft/master
...
fixed #2000 : Improve font rendering performance for linux platform.
2013-04-03 18:59:37 -07:00
Romain Tisserand
15d4e75cdb
JNI fixes, added missing JNIEXPORT / JNICALL declarations
...
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
2013-04-02 22:15:12 +02:00
minggo
3d0a5e52c6
Merge pull request #2267 from nickveri/master
...
Added some missing function for setting integer shader uniforms in CCGLProgram
2013-04-01 19:52:11 -07:00
yodesoft
fa9339916d
Improve font rendering performance
2013-04-02 10:16:51 +08:00
Michael Chinen
6f5173f448
android:Add emulator detection and config change to allow running OpenGL ES 2.0 projects in the emulator
...
Code taken from forum post by Romain TISSERAND
http://www.cocos2d-x.org/boards/6/topics/12563?r=25446#message-25446
2013-04-01 20:41:33 +09:00
Darragh Coy
7f565bb2fa
Fix CCUserDefault.cpp compiling on Android.
...
CCUserDefault.cpp shouldn't compile on Android.
2013-03-31 22:24:10 -07:00
Michael Chinen
227d2cf60b
Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator
2013-03-31 20:47:43 +09:00
Darragh Coy
d0f8aaad9e
Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue
...
When calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' and 'CCFileUtils::createCCArrayWithContentsOfFile' on iOS/OSX these functions call upon 'CCFileUtils::fullPathForFilename' to resolve the path given into a full path which can be used with system file IO functions. This matches the convention found throughout the cocos2dx library and is expected behaviour. However, on Android and other platforms it appears calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' or 'CCFileUtils:: createCCArrayWithContentsOfFile' does not do the same resolution using 'CCFileUtils::fullPathForFilename' - resulting in file paths which are correctly specified (and which worked on iOS/OSX) to fail to load on these platforms.
Fix this issue by performing a lookup/resolve of the file path using 'CCFileUtils::fullPathForFilename' before doing the low level loading work itself. This brings the behaviour of other platforms in line with iOS and OSX.
2013-03-29 22:51:25 -07:00
sjchao
cd3a2be720
change comment type
2013-03-29 17:21:29 +08:00
sjchao
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
sjchao
18c43e29b2
change method name from getIsScissorEnable() to isScissorEnable()
2013-03-29 15:32:30 +08:00
chao
253ebe49e4
add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal
2013-03-29 01:28:26 +08:00
Marcel Bloemendaal
6d6a0f23eb
Added support for secureTextEntry (passwords)
...
Added a secureTextEntry property. Enabling this property causes the
TextField to display the entered text as bullets.
2013-03-28 15:08:33 +01:00
Éloi Rivard
8c013fe619
* Basic Linux OpenAL support.
2013-03-28 12:07:09 +01:00
Andre Rudlaff
5372363365
fixed potential crash in CCSaxParser
...
The character array which given to CCSAXParser::parse() may not be NULL
terminated.
Therefore we must also add the size of the data array to the parameter list
of the tinyxml2::XMLDocument::parse() call
2013-03-28 01:07:54 +01:00
Andre Rudlaff
89f08bb441
[Linux] fixed font rendering crash for certain fonts
...
face->size->metrics->ascender seems to be unreliable for some fonts,
additionally the freetype documentation says that it may be used
differently for different fonts.
Therefore it may happen that the ascender of a font face is less then
the glyphs bounding box resulting in accessing invalid memory.
The fix is to use the bbox attribute instead of the ascender
2013-03-28 00:54:11 +01:00
Andre Rudlaff
8ab1f3c6d2
fixed potential crash in CCScheduler::removeHashElement
...
If the scheduler is the last object to have retained the pElements target and
the targets desctructor calls CCScheduler::unschedule() invalid memory is
accessed as pElement->timers is already freed, but the pElement is not removed
yet.
Therefore the call to target->release() should be made after pElement has been
removed from the hash table
2013-03-26 22:55:26 +01:00
nickveri
fd35ebd4d4
Added support for setting integer uniforms
2013-03-26 18:20:38 +00:00
waiter
af9e3442c6
Add CCRemoveSelf Action
2013-03-25 18:18:38 +08:00
James Chen
f7b2ca2125
Fixing compilation errors when enable CC_ENABLE_PROFILERS.
2013-03-25 11:47:27 +08:00
James Chen
92f278657e
Merge branch 'fix_profiler_compile_error_android' of https://github.com/gelldur/cocos2d-x
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-25 11:46:02 +08:00
waiter
f6742c3bcd
Add RemoveSelf Action
2013-03-25 11:14:19 +08:00
waiter
80c9e2f714
Add RemoveSelf Action
...
Add RemoveSelf Action, so we can simple call CCRemoveSelf to remove the
node from parent.
2013-03-25 11:10:51 +08:00
billy1380
cdfe693583
- changed cocos2d mac project to support universal build and x86
...
- fixed issues associated with that
2013-03-23 16:04:51 +00:00
James Chen
636f07a43f
Merge pull request #2243 from sbc100/fix_linux_build
...
Fix linux compilation of CCTexturePVR.cpp
2013-03-22 19:07:24 -07:00
Sam Clegg
fe86b9d6df
Fix linux compilation of CCTexturePVR.cpp
...
On linux (and possibly other platforms)
GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG is simply not defined since we don't
include GLES/gl2ext.h.
2013-03-22 10:40:35 -07:00
minggo
71659f4aa9
Merge pull request #2247 from hailongiPhone/master
...
release && set nil
2013-03-22 04:09:47 -07:00
minggo
1538c72581
Merge pull request #2197 from dumganhar/ios-default-font
...
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-22 00:10:09 -07:00
hailong
2ea447dbfd
Update CCDirectorCaller.mm
...
First destroy CCDirector instance with cocos2d::CCDirector::sharedDirector()->end()
Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();
APP will crash at
CCApplication::setAnimationInterval
[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
2013-03-22 15:02:46 +08:00
Dawid Drozd
21cab34029
Fixing profiling compile error
2013-03-22 07:58:57 +01:00
minggo
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
James Chen
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
minggo
406ea3f69d
Merge https://github.com/cocos2d/cocos2d-x into test-before-release
2013-03-20 15:19:19 +08:00
James Chen
9336ab710f
fix a logic error and a memory leak in CCLabelBMFont.
2013-03-20 13:55:43 +08:00
minggo
9afc6729dc
fix build error caused by libcurl on android x86
2013-03-20 11:53:19 +08: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
James Chen
ac509f70db
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-19 13:11:33 +08: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
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
ac2a52e71b
modify version
2013-03-18 11:25:27 +08: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
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
Andre Rudlaff
d3ecb09c9b
Merge branch 'master' into feature-linux-fontcache
2013-03-15 08:54:15 +01: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
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
minggo
3bef9cc749
Merge pull request #2159 from DarraghCoy/add_ccset_create
...
Add CCSet::create() function
2013-03-14 03:21:17 -07: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
James Chen
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +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
minggo
2bc703c3f0
Merge pull request #2069 from jxhgzs/cocos2dx_getDeltaTime
...
add m_fDeltaTime getter function
2013-03-12 19:38: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
James Chen
ae1c64573e
Merge pull request #2046 from rohankuruvilla/eclipse
...
fixed #1827 : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
Paras Mendiratta
94a5cdad29
Added Method to create a CCMenuItemToggle from a CCArray with a target selector.
2013-03-12 12:41:41 +05:30
minggo
1d51f9a3d7
issue #1529:CCUserDefault work ok on Android
2013-03-11 16:45:20 +08:00
minggo
ac888fee01
issue #1529:CCUserDefault supports default value on iOS
2013-03-11 14:45:07 +08:00
James Chen
3f709c3edb
Merge pull request #2134 from AsadR/remove-all-notifications-for-target
...
fixed #1822 : Added CCNotificationCenter::removeAllObservers(CCObject *target).
2013-03-10 22:41:59 -07:00
James Chen
30e304961f
Merge pull request #2126 from sbc100/make_run_for_linux
...
fixed #1820 : Adding 'make run' target for linux projects.
2013-03-10 20:04:40 -07:00
Asad ur Rehman
c1a8059998
Added CCNotificationCenter::removeAllObservers
...
This is a helper method that removes all observers with a particular
target. It can be used in destuctors to ensure no observers trigger
callbacks on objects that no longer exist.
2013-03-10 19:34:01 +05:00
James Chen
a889322a47
Fixed compilation error for MAC port.
2013-03-10 16:34:41 +08:00
Sam Clegg
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
James Chen
2c7b178d7f
fixed #1812 : Minor fix.
2013-03-08 16:00:14 +08:00
James Chen
aa53211f86
fixed #1812 : A warning of getStringWithEllipsisJni function when compiling it with clang.
2013-03-08 15:56:17 +08:00
minggo
e8d4b17a23
issue #1529:modify CCUserDefault.cpp path in linux makefile
2013-03-08 11:18:34 +08:00
Rohan Kuruvilla
7149f0598d
Adding missing eclipse project files
2013-03-07 12:13:50 -08:00
minggo
dd8681b18b
Merge pull request #2113 from minggo/refactor-ccuserdefault
...
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
minggo
a691df2251
Merge pull request #2100 from fins/master
...
getStartLocationInView() and getStartLocation() methods in CCTouch
2013-03-06 22:40:12 -08:00
minggo
2842719e35
issue #1529:add user_default into vs2010 project
2013-03-07 10:31:01 +08:00
minggo
e85989f76e
issue #1529:modify marmalade and native client project configuration
2013-03-07 09:51:26 +08:00
Sam Clegg
ce247a6304
[NaCl] Fix warnings in ARM build
2013-03-06 13:02:55 -08:00
Sam Clegg
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
minggo
648e9a7bf1
issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault
2013-03-06 16:36:44 +08:00
minggo
7969224bf3
Merge pull request #2106 from waiter/master
...
Update unload effect function (android normal)
2013-03-05 22:45:10 -08:00
minggo
43dff78f4b
Merge pull request #2102 from DarraghCoy/ios_custom_font_loading_fix
...
Fix for loading custom fonts on iOS when referenced from a CCB file
2013-03-05 22:42:13 -08:00
waiter
e2119e1323
Merge pull request #1 from cocos2d/master
...
update cocos2d/cocos2d-x
2013-03-05 18:43:21 -08:00
minggo
3ce5a99c8d
Merge pull request #2092 from sbc100/fix_all_warnings
...
Fix all compiler warnings produced by gcc.
2013-03-05 17:59:35 -08:00
waiter
7699c83bd8
update Cocos2dxSound.java for unload effect
...
when unload effect, sounID maybe null so the app will creash because of NPE.
2013-03-06 09:21:49 +08:00
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
minggo
a9fa61af34
issue #1529:CCUserDefault -> user_default
2013-03-05 14:55:26 +08:00
minggo
f37b1525b4
issue #1529:use NSUserDefault to implement CCUserDefault on iOS
2013-03-05 14:53:37 +08:00
Darragh Coy
f84a4e2e08
Code review changes for pull request #2102
...
We should only load the 'MarkerFelt-Wide' fallback font in 'CCImage.mm, _initWithString()' if the user is attempting to load a custom font, not when the user is attempting to load a system font. If the user is trying to load a system font then give back the default system font instead.
2013-03-04 22:24:28 -08:00
minggo
ae3c104fba
issue #1686:disable depth test by default
2013-03-05 10:36:32 +08:00
Darragh Coy
df3c449b4f
Fix for loading custom fonts on iOS when referenced from a CocosBuilder CCB file
...
Fix up how fonts are loaded in Cocos2dx for iOS to work transparently with custom font filenames/paths such as 'MyCustomFont.ttf' or 'fonts/MyCustomFont.ttf'. Referring to fonts by these paths would be OK on Android but can't be used on iOS since fonts must be referred to by family name on iOS; we must use 'MyCustomFont' when referring to that particular font in both examples on iOS. Hence add the code to strip out the folder path and extension on iOS so that the font path 'MyCustomFont.ttf' and 'fonts/MyCustomFont.ttf' can be used transparently across all platforms. This is required especially in the case where we have custom fonts being referenced from CCB files, since CCB files store the font names with the .ttf extension included.
2013-03-04 15:32:24 -08:00
fins
e8e229cc93
add getStartLocation() and getStartLocationInView() to CCTouch to access the start point of a touch
2013-03-04 13:08:19 +01:00
minggo
96c5be91e3
Merge pull request #2076 from sbc100/cocos_nacl
...
Native Client port
2013-03-03 18:24:04 -08:00
James Chen
71589e68ee
fixed #1760 : Redefinition of cpufeatures module.
2013-03-04 10:08:02 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
Bite
85fd30aacf
fix compile error when run xcode on case-sensive file system.
2013-03-02 18:15:05 +08:00
jiang xiaohua
a959986e5e
add cpp function
2013-03-02 16:31:19 +08:00
minggo
370fe7d937
issue #1686:fixed a logical error in CCLabelBMFont
2013-03-01 18:15:20 +08:00
minggo
0dfab6744a
issue #1686:use correct values to initialize CCNodeRGBA member variables
2013-03-01 16:14:10 +08:00
minggo
df56a2e3ec
issue #1686 : invoke sceneOrder() in CCTransitionScene::initWithDuration()
2013-03-01 15:30:40 +08:00
minggo
3e7e9ead5d
issue #1686:add getInnerAction to CCEaseAction
2013-03-01 14:08:23 +08:00
jiang xiaohua
5feeaf024e
add m_fDeltaTime getter function
2013-03-01 13:40:38 +08:00
James Chen
65f19f5c53
Removing some deprecated functions.
2013-03-01 10:57:52 +08:00
James Chen
7093807f3f
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
2013-03-01 10:41:06 +08:00
minggo
7d0eafa42c
Merge pull request #2065 from minggo/iss1686-synchronize
...
issue #1686:fix some compiling error
2013-02-28 17:52:45 -08:00
minggo
7c8bb82c67
issue #1686:fix some compiling error
2013-03-01 09:51:42 +08:00
minggo
514799db73
Merge pull request #2063 from minggo/iss1686-synchronize
...
Synchronize to cocos2d-iphone v2.1rc0a
2013-02-28 17:28:28 -08:00
Jozef Prídavok
b7ca4656b6
Flush log messages.
2013-02-28 16:17:49 +01:00
minggo
70a70d38fc
Merge pull request #9 from dumganhar/iss1686-synchronize
...
issue #1686 : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
James Chen
3b3adc3eea
issue #1686 : Synchronizing LayerTest.
2013-02-28 16:45:59 +08:00
minggo
c75e440e22
issue #1686:synchronized RenderTexture
2013-02-28 16:35:42 +08:00
James Chen
8ba46c574a
fix for conflict of project.pbxproj.
2013-02-28 13:37:45 +08:00
James Chen
56340f9555
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
2013-02-28 13:01:45 +08:00
minggo
63e4091bfa
fixed #1686:finish updating
2013-02-28 11:55:36 +08:00
minggo
0070371045
issue #1686:synchronize CCLabelBMFont.cpp
2013-02-28 10:37:47 +08:00
minggo
14a35cff11
issue #1686:synchronize CCMenu.cpp
2013-02-28 10:15:09 +08:00
James Chen
3f74cd8190
fixed #1753 : Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port.
2013-02-28 09:44:37 +08:00
minggo
cd4f18c48f
issue #1686:synchronize CCLayer.cpp
2013-02-27 18:21:35 +08:00
minggo
8dc431425c
issue #1686:synchronize CCMenuItem.cpp
2013-02-27 17:23:39 +08:00
James Chen
537abaec42
fixed #1753 : Android works ok now.
2013-02-27 16:57:36 +08:00
minggo
7eb93128c2
issue #1686:synchronize CCMotionStreak.cpp
2013-02-27 16:52:19 +08:00
minggo
00e978bbe9
issue #1686:synchronize CCParticleExample.cpp
2013-02-27 16:46:05 +08:00
minggo
2b0ff4ec62
issue #1686:synchronize CCParticleSystem.cpp
2013-02-27 16:26:42 +08:00
minggo
24e8664700
issue #1686:synchronize CCParticleSystemQuad.cpp
2013-02-27 16:24:33 +08:00
minggo
4b8708b762
issue #1686:synchronize CCProgressTimer.cpp
2013-02-27 15:52:14 +08:00
James Chen
0d70e6f92f
issue #1753 : Win32 works ok.
2013-02-27 15:45:23 +08:00
minggo
088bc959f6
issue #1686:synchronize CCRenderTexture.cpp
2013-02-27 15:44:36 +08:00
minggo
94076a5b9c
issue #1686:synchronize CCSprite.cpp
2013-02-27 15:30:49 +08:00
James Chen
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
minggo
f571d66ed7
issue #1686:synchronize CCNode.cpp
2013-02-27 14:48:19 +08:00
minggo
8ed8def97f
Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize
2013-02-27 14:25:24 +08:00
minggo
8288e2124e
issue #1686:synchronize CCTextureCache.cpp
2013-02-27 11:35:38 +08:00
minggo
28388deee3
Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize
2013-02-27 11:23:29 +08:00
minggo
81b349d9ce
fixed #1637:fix mac retina display and labelttf
2013-02-27 11:10:42 +08:00
minggo
d983dd505c
fixed #1752:use unstripped version to resolve link error
2013-02-27 10:44:34 +08:00
James Chen
7dc64fc9a6
issue #1686 : sync to CCLayer
2013-02-27 09:38:30 +08:00
minggo
0ffb506607
issue #1686:synchronize CCTexturePVR.cpp
2013-02-26 18:08:51 +08:00
minggo
9d07778bb0
issue #1686:synchronize CCTMXXMLParser.cpp
2013-02-26 17:42:18 +08:00
minggo
98249b4754
issue #1686:synchronize CCTransition.cpp
2013-02-26 17:12:57 +08:00
minggo
25fd256dbd
issue #1686:format codes
2013-02-26 17:03:29 +08:00
minggo
4fc6e1070b
issue #1686:synchronize cocos2d.cpp
2013-02-26 16:55:23 +08:00
minggo
7941d70a04
fix a bug of CCUserDefault
2013-02-26 12:44:20 +08:00
James Chen
5f645cefba
issue #1489 : ZEXPORT -> CC_DLL for unzip.h.
2013-02-25 18:35:18 +08:00
James Chen
2eab8f75d4
Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager
2013-02-25 18:09:05 +08:00
James Chen
a6b24cd40b
Merge pull request #9 from minggo/iss1489-AssetsManager
...
issue #1489 : Updates with upstream.
2013-02-25 02:08:03 -08:00
James Chen
17d9837b45
Adds AssetsManager support for win32.
2013-02-25 18:03:38 +08:00
minggo
442e8ea0cc
issue #1489:android works ok
2013-02-25 16:58:10 +08:00
James Chen
e3daa6c9af
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into minggo-iss1489-AssetsManager
2013-02-25 16:23:02 +08:00
James Chen
8e819ac32c
Updates libcurl with ssl support for win32.
2013-02-25 16:16:57 +08:00
minggo
c8baa94753
issue #1489 : update ios libcurl and add android project
2013-02-25 14:33:04 +08:00
minggo
1ae332ac0b
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
2013-02-25 10:25:24 +08:00
James Chen
fdf8595353
tab -> 4 space.
2013-02-22 16:16:16 +08:00
James Chen
476e3801eb
tab -> 4 space.
2013-02-22 16:15:17 +08:00
James Chen
b54b924923
fixed #1743 : Adding an additional transform for CCNode.
2013-02-22 16:01:49 +08:00
James Chen
46ee771e1c
Merge branch 'master' of https://github.com/jxhgzs/cocos2d-x into jianghua-patch
2013-02-22 13:46:00 +08:00
James Chen
8921d92143
Removed some unused codes.
2013-02-22 11:58:52 +08:00
minggo
ed1cbb94c2
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
2013-02-22 11:04:40 +08:00
James Chen
b50515c5bc
Merge pull request #1873 from ThePickleMan/master
...
fixed #1742 : Added 'rotationIsDir' property to ParticleSystem.
2013-02-21 19:02:39 -08:00
minggo
1df0095993
fix a bug of CCUserDefault
2013-02-22 11:01:57 +08:00
minggo
33b857c3f7
Merge pull request #1984 from billy1380/master
...
CCLens3d can be concave
2013-02-21 18:08:47 -08:00
folecr
f26f254daa
Use CCLOG instead of CCMessageBox to report file system errors
2013-02-21 17:05:17 -08:00
folecr
8408fc6d1b
Remove unused access to Android application's external asset path.
2013-02-21 17:05:17 -08:00
folecr
82ae5f62fd
Remove unused access to Android application's cache directory
2013-02-21 17:05:17 -08:00
jiang xiaohua
d875edbd74
Additional a transformation matrix, Used in is not parent-child relationship but we still need to maintain transformation parent-child
Example:
GameObject_Parent(CCNode; create from CCNode)
GameObject_sub1(CCNode; Create from the same CCSpriteBatchNode,the node's parent is CCLayer )
RenderComponents1( Create form the same CCSpriteBatchNode)
Components2
....
GameObject_sub2 (CCNode; Create from the CCNode,the node's parent is GameObject_Parent )
RenderComponents1( not used batchNode)
Now, GameObject_sub1 not GameObject_Parent node, but I want it to simulate the change of the son is GameObject_Parent;
I Need additional the father's matrix in child Node ;
2013-02-20 22:33:28 +08:00
James Chen
fa90ae320b
issue #1733 : Updated cocos2dx/proj.linux/Makefile.
2013-02-19 18:08:58 +08:00
James Chen
1415c90bd4
webp lib depends on the module of cpufeatures when compiling with "APP_ABI := armeabi-v7a".
2013-02-18 17:52:13 +08:00
James Chen
3452d44329
issue #1712 : Removed importing some unused packages in Cocos2dxActivity.
2013-02-18 14:00:57 +08:00
James Chen
6b5a5c5317
issue #1712 : Moving getDPI from Cocos2dxActivity to Cocos2dxHelper.
2013-02-18 13:51:16 +08:00
James Chen
505577239c
jfloat --> jint.
2013-02-17 17:21:11 +08:00
James Chen
f219f480cc
issue #1712 : DPI return integer on android.
2013-02-17 17:18:38 +08:00
James Chen
cda7da3d43
fixed #1712 : Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms.
2013-02-17 17:13:06 +08:00