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
James Chen
541dd357fa
issue #1712 : Getting DPI support for Linux.
2013-02-17 16:54:45 +08:00
James Chen
edfe4c2a0c
issue #1712 : Adding empty CCDevice.cpp for linux, mac and marmalade.
2013-02-17 16:26:59 +08:00
James Chen
2626005d20
issue #1712 : Updating project setting for blackberry.
2013-02-17 16:26:08 +08:00
James Chen
2b8ea8145a
issue #1712 : Getting DPI support for Blackberry.
2013-02-17 16:25:15 +08:00
James Chen
3dd792475f
issue #1712 : Moved CCDevice.cpp to platform/win32.
2013-02-17 11:52:30 +08:00
James Chen
9f6df60be0
issue #1712 : Adding win32 support.
2013-02-17 11:34:55 +08:00
James Chen
ac17f67686
issue #1712 : Adding getting dpi support for iOS and Android.
2013-02-16 19:36:21 +08:00
James Chen
373706d3b3
Merge pull request #1977 from moadib/master
...
Added window_group creation to CCEGLView for blackberry.
2013-02-15 19:59:09 -08:00
billy1380
a1753113b5
CCLens3d can be concave
...
added boolean operator to enable the lens to be concave as well as
convex
2013-02-16 03:12:12 +00:00
James Chen
ad61fa3e9b
fixed #1703 : fixed compilation errors for BlackBerry.
2013-02-16 11:05:30 +08:00
moadib
fa1fee307a
Added window_group creation to CCEGLView for blackberry
2013-02-12 19:00:02 +04:00
Ben Ward
5f6ce9db92
Adding Portuguese and Arabic language support
2013-02-11 15:29:56 +00:00
minggo
ba8f26fed9
Merge pull request #1969 from minggo/iss1702-writablePath
...
modify writable path for iOS and Android
2013-02-06 22:16:46 -08:00
minggo
59c1f33ad5
fixed #1702:modify writable path to the return value of Context.getFilesDirectory()
2013-02-07 14:11:23 +08:00
James Chen
ca9cc14d5d
Merge pull request #1965 from fape/marmalade_tinyxml2
...
Marmalade tinyxml2 fixes
2013-02-06 19:24:33 -08:00
James Chen
3f0a5ab945
Merge pull request #1964 from fape/marmalade_webp
...
Marmalade webp fixes
2013-02-06 19:21:12 -08:00
ivzave
165faf49df
prevent unintentional tinyxml2.cpp deletion during make clean on linux
2013-02-07 05:17:46 +04:00
fape
1ed9d643c5
prevent WEBP_USE_SSE2
2013-02-06 17:44:06 +01:00
fape
7e19a5464a
Include missing header files to libwebp's marmalade project file.
2013-02-06 16:17:47 +01:00
fape
19c266ef47
include missing CCPlatformMacros.h
2013-02-06 16:16:40 +01:00
fape
05eb3a59f5
include missing CCPlatformMacros.h
2013-02-06 15:50:09 +01:00
fape
948732d617
marmalade tinyxml2 fixes
2013-02-06 14:49:04 +01:00
fape
b51102d234
marmalade webp fixes
2013-02-06 14:40:48 +01:00
minggo
404cdf1122
issue #1702:return documents for iOS
2013-02-06 18:11:27 +08:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
fb9ac31d08
fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.
2013-02-06 17:20:54 +08:00
James Chen
564939ee16
Merge pull request #1962 from dumganhar/iss1770-webp
...
fixed #1770 : Adding the library of webp for linux 32bit.
2013-02-06 00:49:03 -08:00
minggo
ed332770c3
fixed #1703:remove depence of libxml2 for vs project
2013-02-06 16:37:20 +08:00
James Chen
e547735730
fixed #1770 : Adding the library of webp for linux 32bit.
2013-02-06 16:33:54 +08:00
minggo
60d36ed3aa
issue #1703:fix conflicts when synchronized to latest codes
2013-02-06 16:18:37 +08:00
James Chen
561f6ca435
issue #1770 : Adding webp image format support for linux 64bit.
2013-02-06 15:47:23 +08:00
minggo
396230bb77
issue #1703:remove dependence of libxml2 for marmalade and linux
2013-02-06 14:16:06 +08:00
minggo
9a7cca5ed4
issue #1703:remove dependence of libxml2
2013-02-06 14:12:52 +08:00
minggo
fcc6ed89ae
add tinyxml2 to mac and marmalade project
2013-02-06 13:57:16 +08:00
minggo
3d9a0dc99d
issue #1703:add tinyxml2 codes into vs project
2013-02-06 13:49:35 +08:00
James Chen
c7fdb1e637
Merge branch 'iss1770-webp' of https://github.com/dumganhar/cocos2d-x into iss1770-webp
2013-02-06 13:07:22 +08:00
James Chen
cc690c5a86
issue #1770 : Adding webp support for mac port.
2013-02-06 13:06:48 +08:00
minggo
e136476fb3
issue #1703:add tinyxml2 in makefile
2013-02-06 11:55:36 +08:00
minggo
682910b5f8
Merge https://github.com/cocos2d/cocos2d-x into tinyxml
2013-02-06 11:53:58 +08:00
James Chen
95dc349b77
issue #1770 : Adding webp support for win32.
2013-02-06 11:23:10 +08:00
minggo
7d02925d7e
issue #1703:include tinyxml2 files in android/iOS project
2013-02-06 11:15:54 +08:00
James Chen
1e5431bcc5
issue #1770 : Adding webp support for blackberry and marmalade.
2013-02-06 10:52:13 +08:00
minggo
6e3409a30c
issue #1703:move tinyxml2 to cocos2dx/support
2013-02-06 10:18:31 +08:00
James Chen
a94e1b2a9d
issue #1770 : Webp works ok on Android and iOS.
2013-02-05 18:18:53 +08:00
James Chen
64248386a2
issue #1770 : Updating iOS project configuration and adding WEBP test demo.
2013-02-05 11:37:13 +08:00
James Chen
da91e97e17
Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp
...
Conflicts:
scripting/javascript/bindings/generated
2013-02-05 11:22:53 +08:00
James Chen
c42ef7e44a
Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support
...
issue #1687 : Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
2013-02-04 18:59:49 -08:00
minggo
ca0b9ca521
Merge pull request #1957 from thomaslee/initwithimage-without-release
...
Don't call release() if CCTexture2D::initWith* fails
2013-02-04 02:12:32 -08:00
Tom Lee
4023fcc094
Return false instead of NULL
2013-02-04 01:38:22 -08:00
minggo
5f9e0b5ac2
Merge branch 'tinyxml2' of https://github.com/martell/cocos2d-x into tinyxml
2013-02-04 17:24:22 +08:00
Tom Lee
610aeb28cf
Don't call release() if initWith* fails
2013-02-04 01:04:54 -08:00
minggo
0465a950c7
Merge pull request #1951 from dumganhar/iss1697-render-texture
...
issue #1697 : fixed two logical errors in CCRenderTexture::initWithWithAndHeight.
2013-02-04 00:28:54 -08:00
minggo
8511e75745
fixed #1689:fixed a compiling error
2013-02-04 16:17:59 +08:00
dualface
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
dualface
c13965c939
remove duplicate codes
2013-02-04 11:52:16 +08:00
James Chen
7f81db038c
issue #1697 : fixed two logical error in CCRenderTexture::initWithWithAndHeight.
2013-02-04 11:33:13 +08:00
minggo
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
minggo
7f594f00b8
Merge pull request #1930 from NatWeiss/tmxpolygons
...
Added TMX polygon parsing.
2013-02-02 19:17:44 -08:00
James Chen
a0bf0d8655
issue #1687 : Moving the implementation of NS2CC.mm to CCFileUtilsIOS(MAC).mm.
2013-02-03 10:56:59 +08:00
dualface
f8c372ca9b
fix CCLuaLog()
2013-02-02 15:05:30 +08:00
dualface
c58a63aa92
fix for android
2013-02-02 14:56:09 +08:00
dualface
d6686fe57c
Merge branch 'upstream_master' into add_webp_support
2013-02-02 12:24:05 +08:00
dualface
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
James Chen
e25c79f1ec
issue #1687 : CCFileUtils::isFileExist now support relative path.
2013-02-01 22:19:58 +08:00
James Chen
ae0b973cf1
issue #1687 : Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class.
...
)
2013-02-01 18:48:44 +08:00
James Chen
1acdf1c957
issue #1687 : Updating the comments for CCFileUtils.
2013-02-01 17:16:33 +08:00
James Chen
357da4f2fc
issue #1687 : Updating the comments for CCFileUtils.
2013-02-01 16:46:15 +08:00
James Chen
a110778739
issue #1687 : Updating comments for CCFileUtils.
2013-02-01 15:41:41 +08:00
James Chen
c296ab363f
issue #1687 : Comments some logs output for CCFileUtils.
2013-02-01 11:53:05 +08:00
James Chen
63778570d2
issue #1687 : [Marmalade] If the font name wasn't end with `.ttf`, skip making a full path.
2013-02-01 11:40:55 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
James Chen
9b5d0bd251
Merge pull request #1935 from moadib/bb_eglview_event_handler
...
fixed #1015 : Added CCEGLView::EventHandler class for Blackberry platform.
2013-01-30 22:31:03 -08:00
James Chen
eb7cae93fd
Merge pull request #1937 from dumganhar/revert-ttf-update
...
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-30 22:28:48 -08:00
James Chen
da59570214
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-31 14:26:45 +08:00
James Chen
157e229f8c
fixed #1634 : Added the very first implementation of CCEditBox for Win32.
2013-01-31 14:04:49 +08:00
moadib
4d271e782b
Added CCEGLView::EventHandler class for Blackberry platform
...
Added CCEGLView ::getWindowGroupId() method for Blackberry platform
2013-01-30 18:28:06 +04:00
James Chen
6b0417902c
Merge pull request #1932 from Weeds/feature_linux-font-alignment
...
fixed #1689 : [Linux] fixed horizontal font alignment.
2013-01-29 22:22:01 -08:00
Andre Rudlaff
9b8f3ca01e
[Linux] fixed horizontal font alignment
...
kAlignTop and kAlignBottom should center text horizontally
2013-01-30 02:04:59 +01:00
Andre Rudlaff
5959c24b80
[Linux] fixed loading truetype fonts from resource directory
...
We should use CCFileUtils to get the full path to font resources.
Additionally the input font is converted to lowercase for checking if it is
a ttf file. So we can also load .TTF or .tTf files.
2013-01-30 01:43:21 +01:00
Nat Weiss
9b98e4548f
Added TMX polygon parsing.
2013-01-29 14:45:41 -08:00
James Chen
bb431c54ed
Comments some logs in CCFileUtils.
2013-01-29 19:12:55 +08:00
minggo
fb1a32e696
Merge pull request #1923 from dumganhar/master
...
Updating doxygen comments for CCFileUtils.h.
2013-01-29 02:50:16 -08:00
minggo
de7dfdbc2c
Merge pull request #1925 from minggo/master
...
update js-tests codes from upstream and fix a logical bug of CCRect
2013-01-29 02:08:08 -08:00
James Chen
2ca28d7e3d
Updating comments for CCFileUtils.h.
2013-01-29 16:45:11 +08:00
James Chen
632b91ee08
Updating comments for CCFileUtils.h.
2013-01-29 16:31:28 +08:00
James Chen
0cd9efcf6d
Updating comments for CCFileUtils.h.
2013-01-29 16:28:59 +08:00
James Chen
3cff253446
Updating comments for CCFileUtils.h.
2013-01-29 16:10:18 +08:00
James Chen
558a4bb3cc
Updating comments for CCFileUtils.h.
2013-01-29 16:07:50 +08:00
James Chen
0bd2e11d75
Updating comments for CCFileUtils.h.
2013-01-29 15:56:08 +08:00
James Chen
0141b7856d
Updating comments for CCFileUtils.h.
2013-01-29 15:52:33 +08:00
James Chen
13c494ad69
Updating doxygen comments for CCFileUtils.h.
2013-01-29 15:50:57 +08:00
James Chen
170fb32b6c
Updating CCFileUtils.cpp for BlackBerry.
2013-01-29 15:07:36 +08:00
minggo
fbcb33eefd
make CCRect accept width<0 and height<0
2013-01-29 14:03:03 +08:00
James Chen
0c01711293
Comments some LOGs in CCFileUtils::fullPathForName.
2013-01-29 10:48:31 +08:00
James Chen
31681e005e
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
2013-01-29 10:40:44 +08:00
James Chen
6baeee3ff9
Adding LOG in CCFIleUtils::fullPathForFilename for Marmalade port.
2013-01-29 10:27:36 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
James Chen
d5237d637d
Absolute path check for blackberry.
2013-01-29 00:42:21 +08:00
James Chen
1f0b422112
Fix a typo.
2013-01-28 23:40:56 +08:00
James Chen
c160d3ed0a
Using full path in CCFileUtils::getFileData.
2013-01-28 23:37:04 +08:00
James Chen
7c89086173
Merge remote-tracking branch 'cocos2d-x/master'
2013-01-28 23:29:41 +08:00
James Chen
341193eec6
Updating comments for CCFileUtils.
2013-01-28 23:28:14 +08:00
minggo
3ea562b4ad
fix some logical errors and compiling errors
2013-01-28 23:19:57 +08:00
James Chen
2e421304ca
Merge pull request #1911 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 05:43:41 -08:00
James Chen
f0fc414a81
Fixing a bug in CCLabelTTF.cpp, checking the return value of CCTexture2D::initWithString.
2013-01-28 21:17:43 +08:00
James Chen
75d926f810
issue #1683 : Fixing complication errors for blackberry.
2013-01-28 21:16:01 +08:00
minggo
05363ee8dd
Merge pull request #1908 from minggo/master
...
fix some warnings
2013-01-28 04:36:01 -08:00
minggo
249b935be8
fix some warnins
2013-01-28 20:34:52 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
6bceb2ac6f
Merge remote-tracking branch 'cocos2d-x/master' into iss1683-ccfileutils
2013-01-28 19:54:02 +08:00
James Chen
ba852e8606
issue #1683 : Adding default path to the vector of searching path.
2013-01-28 19:53:16 +08:00
James Chen
0d8756c900
Merge pull request #1907 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Updating CCFileUtils.cpp for Win32.
2013-01-28 03:51:59 -08:00
James Chen
031380d4e9
issue #1683 : Updating CCFileUtils.cpp for Win32.
2013-01-28 19:49:34 +08:00
James Chen
c5975dd7c4
Merge pull request #1905 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Fixed compilation errors for linux.
2013-01-28 02:34:24 -08:00
James Chen
733a334ec2
issue #1683 : Fixed compilation errors for linux.
2013-01-28 18:32:34 +08:00
James Chen
57eb58df42
Merge pull request #1904 from dumganhar/iss1683-ccfileutils
...
issue #1683 : Adding FileUtilsTest.Adding default search path if developer didn't pass it.
2013-01-28 01:57:46 -08:00
James Chen
632f99b611
issue #1683 : Updating CCFileUtils for MAC.
2013-01-28 17:54:49 +08:00
James Chen
e736ed487f
issue #1683 : Adding default search path if developer didn't pass it.
2013-01-28 17:44:53 +08:00
minggo
cd75f37d06
change version string
2013-01-28 15:24:13 +08:00
James Chen
13881ba8a8
issue #1683 : Updating CCApplication.h/.cpp for linux.
2013-01-28 11:56:56 +08:00
James Chen
345f18ebeb
issue #1683 : Refactoring CCFileUtils::setResourceRootPath for BB, Linux, MAC.
2013-01-28 10:48:47 +08:00
James Chen
c24ca63a0c
issue #1683 : Making CCApplication::setResourceRootPath deprecated.
2013-01-28 10:36:37 +08:00
James Chen
78c16fdd22
issue #1683 : Fixing absolute path check for Android.
2013-01-28 10:23:19 +08:00
James Chen
f2dad83610
issue #1683 : Refactoring CCFileUtils for MAC port.
2013-01-27 20:53:32 +08:00
James Chen
d532670640
Removing some CCLOG.
2013-01-27 20:16:46 +08:00
James Chen
09cef5511a
issue #1683 : Updating CCFileUtils.
2013-01-26 23:24:41 +08:00
James Chen
be6c0c9d9b
Updated CCFileUtils of linux.
2013-01-26 23:20:40 +08:00
James Chen
119115502d
issue #1683 : Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
2013-01-26 22:31:57 +08:00
James Chen
ca9e96213f
issue #1683 : Commented one LOG.
2013-01-26 15:02:04 +08:00
martell
0e3560bcd5
final fix.. tested
2013-01-26 06:27:49 +00:00
James Chen
d9fd3c6c60
issue #1683 : Fixed an issue about OPENGLES ERROR 501 Warning in CCTextureAtlas.cpp.
2013-01-26 14:20:24 +08:00
James Chen
3328cfd6a4
Refactoring some logic of CCFileUtils.
2013-01-26 14:19:14 +08:00
James Chen
522e860205
issue #1683 : Fixed a bug in file lookup for Android.
2013-01-26 12:10:55 +08:00
martell
05bece9d07
added ccuserdefault tinyxml2 ver
2013-01-26 02:41:27 +00:00
James Chen
f71df5a873
Fixed an issue in CCFileUtils::setResourceDirectory for android.
2013-01-25 23:01:47 +08:00
James Chen
2c399de28e
issue #1683 : Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android.
2013-01-25 22:55:20 +08:00
James Chen
2235f745d3
issue #1683 : Fixed compilation error for Win32.
2013-01-25 22:30:16 +08:00
James Chen
ef131beed1
Merge pull request #1885 from dumganhar/refactor-ccfileutils
...
issue #1683 :Refactoring CCFileUtils.TO BE DONE:
Making the api of CCFileUtils more c++ friendly.
2013-01-25 05:55:10 -08:00
James Chen
fde39c6dcb
Adding cache support for CCFileUtils.
2013-01-25 21:52:35 +08:00
James Chen
55af1fd3bf
Removing unneeded codes in CCFileUtils.mm for iOS port.
2013-01-25 21:17:28 +08:00
James Chen
a1574fe9f6
Reverted this commit ( be305f84b6
) since i didn't find the crash.
2013-01-25 20:59:58 +08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
martell
684b46dd74
Initial Import of tinyxml2 to replace libxml2
2013-01-25 10:39:54 +00:00
James Chen
b3f54f6c1d
Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils
2013-01-25 17:23:58 +08:00
James Chen
70b8e624d6
Merge pull request #8 from rohankuruvilla/fileutils_test
...
Merged @Rohan's improvements for CCFileUtils.
2013-01-25 01:20:51 -08:00
minggo
dcaa3900a4
fixed #1679 : use unstripped libs for armeabi-v7a
2013-01-25 14:49:25 +08:00
James Chen
805067b046
Refactored CCFileUtils for blackberry port.
2013-01-25 14:09:56 +08:00
James Chen
314445e1ca
Refectored CCFileUtils for MAC port.
2013-01-25 11:12:38 +08:00
Rohan Kuruvilla
9750bbab95
removing absolute path lookup in fullPathForFilename
2013-01-24 19:04:27 -08:00
Rohan Kuruvilla
f5c74d9022
Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread
2013-01-24 18:37:24 -08:00
Rohan Kuruvilla
be305f84b6
Fixing bug where it doesn't use embedded texture data, if texture filename is not available
2013-01-24 18:37:23 -08:00
Rohan Kuruvilla
287b5575f4
Changing architecture of CCFileUtils
2013-01-24 18:37:23 -08:00
James Chen
cefef60e11
Refactored CCFileUtils for Marmalade port.
2013-01-24 17:38:43 +08:00
James Chen
73389d68d5
Refactor CCFileUtils for Linux port.
2013-01-24 16:44:13 +08:00
James Chen
e954ce4f75
Made compatibility with old api CCFileUtils::setResourceDirectory.
2013-01-24 14:07:48 +08:00
James Chen
7589be6fb7
Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now.
2013-01-24 13:56:50 +08:00
James Chen
dcf1127d31
Merge branch 'master' into refactor-ccfileutils
2013-01-24 11:21:23 +08:00
Ed Bartley
908035bdee
Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int).
2013-01-23 14:00:23 -05:00
James Chen
46f38c57fb
issue #1661 : CrystalCraze works ok on android.
2013-01-24 00:32:22 +08:00
James Chen
8cfd912a06
CrystalCraze works ok on iOS.
2013-01-23 23:17:44 +08:00
James Chen
388e1d82c3
Added resource structure which is the same as cocos2d-iphone.
2013-01-23 22:29:00 +08:00
James Chen
294509c4c0
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
2013-01-23 19:52:17 +08:00
James Chen
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
James Chen
c92d00dfa1
Merge pull request #1857 from walzer/master
...
fixed #1678 : Well documented CCNode member functions and variables.
2013-01-22 23:35:14 -08:00
James Chen
2b9f79efc0
Merge pull request #1882 from dumganhar/memoryleak-action
...
Fixed memory leaks in CCActionCatmullRom class.
2013-01-22 22:41:44 -08:00