Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,911 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

270 Commits

Author SHA1 Message Date
James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 
Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 21:22:16 +08:00
James Chen a73a4b9837 Merge pull request #3276 from dumganhar/constants-refactor 
Enumeration refactoring
 2013-07-26 05:36:16 -07:00
Éloi Rivard 3ffc026c6c Added some guards in file utils. 2013-07-26 14:19:20 +02:00
James Chen e16a5f469b issue #2430: Refactoring enum 'ResolutionPolicy'. 2013-07-26 18:18:58 +08:00
James Chen 2f8d3587bd Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk. 2013-07-26 18:17:30 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
minggo 0870581623 fix warnings 2013-07-26 15:22:45 +08:00
Ricardo Quesada d683e10808 More constant fixes 
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()

And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
 2013-07-25 14:49:43 -07:00
minggo b36a4f1df0 issue #2430:use upper letters for enum item in Image 2013-07-25 23:09:18 +08:00
minggo 2bb577be8b issue #2430:change Image enum item to upper letter 2013-07-25 20:29:53 +08:00
James Chen 35dec5d71e More CCLog --> log. 2013-07-24 10:46:13 +08:00
James Chen 7bc6abfac7 Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it. 2013-07-24 10:14:42 +08:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07:00
Ricardo Quesada 89d210bdb3 CCAssert -> CCASSERT 
and other best pracitces like:

capacity and "index" are ints and not unsigned int (google's recomendation).
 It is easier to detect underflow bugs like this

plus other minor improvements
 2013-07-19 22:01:27 -07:00
minggo 52a27c5fc9 Merge pull request #3118 from jotel/text-shadow-opacity-fix 
Now opacity option for shadow in CCLabelTTF works.
 2013-07-16 02:39:36 -07:00
James Chen 3bdf6b9c69 issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
Jaroslaw Lewandowski f1023232db Now opacity option for shadow in CCLabelTTF works. 2013-07-09 23:23:41 +01:00
Ricardo Quesada 77dbe995d4 Merge branch 'develop' into ios_mac_one_project 2013-07-03 11:39:00 -07:00
Ricardo Quesada 2b73d0cb5f ios and mac projects unified in one simple xcode project 
Not finished yet:
 - iOS only includes Test Cpp (Simple Game not working yet on iOS)

It is easier to maintain and add more targets, files, etc.
 2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski d26fa847d8 - Fixing shadows for text with stroke in iOS 
- Improved text shadows in Android (they look the same as in iOS)
 2013-07-02 22:45:07 +01:00
minggo 8938268183 issue #2329: remove unneeded codes 2013-06-26 16:42:11 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
Ricardo Quesada 578bce4bc8 Re-adds 'CC' prefix to objective-c classes. 
And also makes it compile on Mac, which was broken
 2013-06-20 17:46:22 -07:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen 016d34d889 Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 2013-06-19 15:08:09 +08:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
Mykyta Usikov 28e8899089 fixed strokeColor and fontFillColor of CCLabelTTF 2013-06-13 14:16:33 +03:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
Ricardo Quesada 1780643c63 merge pull reqeust fixing for iOS7 and Xcode5 into master 2013-06-13 10:43:41 +08:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
minggo a8fe210c7e fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing 2013-06-06 12:50:42 +08:00
franck 3fab093f5b adding Norwegian language support 2013-05-29 10:16:22 +02:00
minggo 0857fdd599 issue #2188:fix compiling error of iOS 2013-05-21 18:18:44 +08:00
carlo morgantini 0ff33fd4f5 fix a problem with float stroke size 2013-05-15 16:37:08 -07:00
carlo morgantini 3b50ffe5ba Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase 2013-05-15 16:37:08 -07:00
carlo morgantini fcea506fef fixed some text formatting issues 2013-05-15 16:29:33 -07:00
carlo morgantini c727fa33c0 CCLabelTTF have now a tint, plus bug fixing and code clean up 2013-05-15 16:29:33 -07:00
carlo morgantini dd9b4a8932 new shadow and stroke for CCLabelTTF 2013-05-15 16:12:43 -07:00
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff 
Implement CCDictionary::writeToFile();
 2013-05-06 23:17:11 -07:00
Romain Tisserand d2690d8942 Fix iOS 4.3 JPEG loading (darken picture, alpha issue) 2013-05-04 19:14:23 +02:00
minggo 1a0db3749e Merge pull request #2496 from mchinen/mchinensedit 
Fix missing protocol method warning for iOS 6.0 addition
 2013-05-04 08:55:07 -07:00
Michael Chinen d47759cc32 EAGLView.mm: fix indent 2013-05-03 19:46:58 +09:00