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

1019 Commits

Author SHA1 Message Date
Ricardo Quesada 8390e7eadb Node cleanup 
Uses "normal" interation without the lambda to prevent another object in the stack.

removed unused code.
 2013-12-18 16:56:59 -08:00
CocosRobot 228b4ebf75 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 22:11:07 +00:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest 
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
 2013-12-18 13:52:10 -08:00
Ricardo Quesada a175e5a13c Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 12:18:22 -08:00
CocosRobot d0779b5352 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 20:14:20 +00:00
Ricardo Quesada b36d77b1c2 Android and Linux fixes 2013-12-18 12:07:51 -08:00
Ricardo Quesada d1b555614e removes `using namespace std` from header file 
... in order to prevent possible collisions.

`using namespace XXX` MUST never be used in header files.
 2013-12-18 11:45:30 -08:00
Ricardo Quesada 903844c7bd Removes unneeded files 
New functionality is merged into the 'official' classes
 2013-12-18 11:44:45 -08:00
CocosRobot 000958bf82 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 09:57:15 +00:00
James Chen 9c0d39c6f9 Merge pull request #4531 from dumganhar/extension-warning-fix 
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
 2013-12-18 01:48:14 -08:00
James Chen 589b71eecf Merge pull request #4530 from samuele3hu/developConversion 
issue #3402:Add the new label lua binding and the releated test cases
 2013-12-18 01:16:47 -08:00
James Chen ddc1328e6b Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better. 2013-12-18 17:01:57 +08:00
James Chen 7719c692b8 More warning fixes. 2013-12-18 16:03:07 +08:00
James Chen 581ba49399 Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-18 15:41:57 +08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +08:00
CocosRobot 8f1e94471e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 06:52:09 +00:00
James Chen 7a5074652c Merge pull request #4526 from samuele3hu/LuaConversion 
Add  support for unsigned short
 2013-12-17 22:43:42 -08:00
Dhilan007 2d9b7ee4fc update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
Ricardo Quesada 24f89ac45c Revert... android platform is 10 2013-12-17 19:07:28 -08:00
Ricardo Quesada 156f69c528 Renderer is subclass of Object again... needed for Android. 
ouch
 2013-12-17 19:06:22 -08:00
Ricardo Quesada 5c9b8db0cb Updates project files file Linux and Android 2013-12-17 18:47:46 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada f369a8eec3 Adds correct License to Renderer files 2013-12-17 18:12:15 -08:00
Ricardo Quesada 3f3071fbb6 Cleanup RenderCommand code 
RenderCommand code is cleaner
 2013-12-17 18:02:11 -08:00
Ricardo Quesada d6be81b7a8 The Renderer is not a singleton 
In order to access, you have to get it from the Director

`Director::getInstance()->getRenderer()`
 2013-12-17 17:50:17 -08:00
Ricardo Quesada 10eafeaeed fixes warning compiler 2013-12-17 11:16:30 -08:00
Ricardo Quesada 441cb6c282 fixes warnings in QuadCommand 2013-12-17 10:35:15 -08:00
Ricardo Quesada ff106ed070 fixes warning on Label Fragment shader 2013-12-17 10:01:38 -08:00
CocosRobot 12d8740537 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 10:39:43 +00:00
James Chen 9d1cb43d8c Merge pull request #4510 from dumganhar/vector-fix 
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
 2013-12-17 02:28:56 -08:00
James Chen 37f408f2b9 Merge pull request #4506 from Dhilan007/ushort_jsb 
add API for transform unsigned short
 2013-12-17 02:20:56 -08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +08:00
James Chen 3829f841e7 Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other). 2013-12-17 18:09:07 +08:00
James Chen 16b643fbef Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-17 01:56:09 -08:00
James Chen c0d741d0d8 Merge pull request #4507 from dumganhar/del-vector-foreach 
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
 2013-12-17 01:55:35 -08:00
James Chen c85f9877bb Reverts Vector::eraseObject, not need to return iterator. 2013-12-17 17:54:38 +08:00
CocosRobot 30521ff5a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 09:50:36 +00:00
James Chen d16fa07661 Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort. 2013-12-17 17:45:29 +08:00
minggo bcb07abb7b Merge pull request #4505 from 2youyouo2/newRenderer 
update armature to new render
 2013-12-17 01:43:07 -08:00
yinkaile bc868cc004 update armature to new render 2013-12-17 17:00:01 +08:00
minggo 85ba3ee1a9 Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError 
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
 2013-12-17 00:32:50 -08:00
CocosRobot 91cfecb931 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 08:13:06 +00:00
LinWenhai 649e6b8065 use size_t replace unsigned int for record redeque::size returned value. 2013-12-17 16:04:48 +08:00
James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 
Conflicts:
	cocos/2d/CMakeLists.txt
 2013-12-17 15:50:24 +08:00
James Chen 7fc7757470 issue #2171: Adds header files of renderer in cocos2d.h. 2013-12-17 15:40:50 +08:00
James Chen 08edcca9be issue #2171: small fix in ccTypes.h 2013-12-17 15:39:35 +08:00
James Chen 8f5970ef90 issue #2171: Don’t ‘using namespace std;’ in header file. 2013-12-17 15:32:24 +08:00