Commit Graph

3474 Commits

Author SHA1 Message Date
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 : 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 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 from rohankuruvilla/eclipse
fixed : Eclipse Project import - Documentation Added and Tested.
2013-03-12 01:36:17 -07:00
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 from AsadR/remove-all-notifications-for-target
fixed : Added CCNotificationCenter::removeAllObservers(CCObject *target).
2013-03-10 22:41:59 -07:00
James Chen 30e304961f Merge pull request from sbc100/make_run_for_linux
fixed : 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 : Minor fix. 2013-03-08 16:00:14 +08:00
James Chen aa53211f86 fixed : 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 from minggo/refactor-ccuserdefault
Refactor ccuserdefault
2013-03-06 23:05:50 -08:00
minggo a691df2251 Merge pull request 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 from waiter/master
Update unload effect function (android normal)
2013-03-05 22:45:10 -08:00
minggo 43dff78f4b Merge pull request 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 from cocos2d/master
update cocos2d/cocos2d-x
2013-03-05 18:43:21 -08:00
minggo 3ce5a99c8d Merge pull request 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
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 from sbc100/cocos_nacl
Native Client port
2013-03-03 18:24:04 -08:00
James Chen 71589e68ee fixed : 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 : 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 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 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 from dumganhar/iss1686-synchronize
issue : Synchronizing LayerTest, LabelTest.
2013-02-28 00:48:32 -08:00
James Chen 3b3adc3eea issue : 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 : 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 : 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 : 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 : 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 : 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 : 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 from minggo/iss1489-AssetsManager
issue : 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 : 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