Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

This commit is contained in:
Walzer 2011-07-11 10:34:47 +08:00
parent 63ffc574d7 697d675003
commit aa12ea838e
11 changed files with 176 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloWorld/Resource/app.icf
View File

@ -1,7 +1,7 @@
[S3E] [S3E]
MemSize=[s3e]SCREENSIZE + 50331648 MemSize=[s3e]SCREENSIZE + 50331648
MemFlags0=USE_STACK_ALLOCATOR #MemFlags0=USE_STACK_ALLOCATOR
FixScreenOrientation = 1 FixScreenOrientation = 1

2
cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp
View File

@ -264,7 +264,7 @@ CCTouchHandler* CCTouchDispatcher::findHandler(CCTouchDelegate *pDelegate)
void CCTouchDispatcher::rearrangeHandlers(CCMutableArray<CCTouchHandler*> *pArray) void CCTouchDispatcher::rearrangeHandlers(CCMutableArray<CCTouchHandler*> *pArray)
{ {
sort(pArray->begin(), pArray->end(), less); std::sort(pArray->begin(), pArray->end(), less);
} }
void CCTouchDispatcher::setPriority(int nPriority, CCTouchDelegate *pDelegate) void CCTouchDispatcher::setPriority(int nPriority, CCTouchDelegate *pDelegate)

2
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
58728dc0be18955fcaabb9d6cd2ead3fdf389132 ef940d5753a60f54cba21c8c503248f75bd3ab98

2
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
f04508231e03751a17872c963c91f97e4335132a 55a23e272c4ae52bb22a27f5bd0f4309bcb4c683

2
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
62513e048519ce58a6a7b19d444f751b0e6ae9a4 e927644074613ed3644c897bdb0912660335380e

2
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
c8cbd6aa2f9f570eda299b591f7b2903a4c954c7 dec21d9705b1a93bf01aac9fb46e3e65996adfba

2
tests/Res/app.icf
View File

@ -1,7 +1,7 @@
[S3E] [S3E]
MemSize=[s3e]SCREENSIZE + 50331648 MemSize=[s3e]SCREENSIZE + 50331648
MemFlags0=USE_STACK_ALLOCATOR #MemFlags0=USE_STACK_ALLOCATOR
FixScreenOrientation = 1 FixScreenOrientation = 1

12
tests/test.android/jni/tests/Android.mk
View File

@ -11,6 +11,17 @@ LOCAL_SRC_FILES := main.cpp \
../../../tests/Box2DTestBed/GLES-Render.cpp \ ../../../tests/Box2DTestBed/GLES-Render.cpp \
../../../tests/Box2DTestBed/Test.cpp \ ../../../tests/Box2DTestBed/Test.cpp \
../../../tests/Box2DTestBed/TestEntries.cpp \ ../../../tests/Box2DTestBed/TestEntries.cpp \
../../../tests/BugsTest/Bug-1159.cpp \
../../../tests/BugsTest/Bug-1174.cpp \
../../../tests/BugsTest/Bug-350.cpp \
../../../tests/BugsTest/Bug-422.cpp \
../../../tests/BugsTest/Bug-624.cpp \
../../../tests/BugsTest/Bug-886.cpp \
../../../tests/BugsTest/Bug-899.cpp \
../../../tests/BugsTest/Bug-914.cpp \
../../../tests/BugsTest/BugsTest.cpp \
../../../tests/BugsTest/Bug-458/Bug-458.cpp \
../../../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp \
../../../tests/ChipmunkTest/Bounce.cpp \ ../../../tests/ChipmunkTest/Bounce.cpp \
../../../tests/ChipmunkTest/Joints.cpp \ ../../../tests/ChipmunkTest/Joints.cpp \
../../../tests/ChipmunkTest/LogoSmash.cpp \ ../../../tests/ChipmunkTest/LogoSmash.cpp \
@ -36,6 +47,7 @@ LOCAL_SRC_FILES := main.cpp \
../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \ ../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \
../../../tests/CocosNodeTest/CocosNodeTest.cpp \ ../../../tests/CocosNodeTest/CocosNodeTest.cpp \
../../../tests/CurlTest/CurlTest.cpp \ ../../../tests/CurlTest/CurlTest.cpp \
../../../tests/DirectorTest/DirectorTest.cpp \
../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ ../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
../../../tests/EaseActionsTest/EaseActionsTest.cpp \ ../../../tests/EaseActionsTest/EaseActionsTest.cpp \
../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ ../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \

2
tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
2a6419e2f46f039761c135c554fd04f4a9551313 33ad1fd0694c56b7b34f9ebd3e563782e572c270

48
tests/test.wophone/Makefile.ARM
View File

@ -50,6 +50,17 @@ OBJECTS = \
$(OBJECTS_DIR)/GLES-Render.o \ $(OBJECTS_DIR)/GLES-Render.o \
$(OBJECTS_DIR)/Test.o \ $(OBJECTS_DIR)/Test.o \
$(OBJECTS_DIR)/TestEntries.o \ $(OBJECTS_DIR)/TestEntries.o \
$(OBJECTS_DIR)/Bug-1159.o \
$(OBJECTS_DIR)/Bug-1174.o \
$(OBJECTS_DIR)/Bug-350.o \
$(OBJECTS_DIR)/Bug-422.o \
$(OBJECTS_DIR)/Bug-624.o \
$(OBJECTS_DIR)/Bug-886.o \
$(OBJECTS_DIR)/Bug-899.o \
$(OBJECTS_DIR)/Bug-914.o \
$(OBJECTS_DIR)/BugsTest.o \
$(OBJECTS_DIR)/Bug-458.o \
$(OBJECTS_DIR)/QuestionContainerSprite.o \
$(OBJECTS_DIR)/Bounce.o \ $(OBJECTS_DIR)/Bounce.o \
$(OBJECTS_DIR)/cocos2dChipmunkDemo.o \ $(OBJECTS_DIR)/cocos2dChipmunkDemo.o \
$(OBJECTS_DIR)/drawSpace.o \ $(OBJECTS_DIR)/drawSpace.o \
@ -75,6 +86,7 @@ OBJECTS = \
$(OBJECTS_DIR)/CocosDenshionTest.o \ $(OBJECTS_DIR)/CocosDenshionTest.o \
$(OBJECTS_DIR)/CocosNodeTest.o \ $(OBJECTS_DIR)/CocosNodeTest.o \
$(OBJECTS_DIR)/CurlTest.o \ $(OBJECTS_DIR)/CurlTest.o \
$(OBJECTS_DIR)/DirectorTest.o \
$(OBJECTS_DIR)/DrawPrimitivesTest.o \ $(OBJECTS_DIR)/DrawPrimitivesTest.o \
$(OBJECTS_DIR)/EaseActionsTest.o \ $(OBJECTS_DIR)/EaseActionsTest.o \
$(OBJECTS_DIR)/EffectsAdvancedTest.o \ $(OBJECTS_DIR)/EffectsAdvancedTest.o \
@ -168,6 +180,39 @@ $(OBJECTS_DIR)/Test.o : ../tests/Box2DTestBed/Test.cpp
$(OBJECTS_DIR)/TestEntries.o : ../tests/Box2DTestBed/TestEntries.cpp $(OBJECTS_DIR)/TestEntries.o : ../tests/Box2DTestBed/TestEntries.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TestEntries.o ../tests/Box2DTestBed/TestEntries.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TestEntries.o ../tests/Box2DTestBed/TestEntries.cpp
$(OBJECTS_DIR)/Bug-1159.o : ../tests/BugsTest/Bug-1159.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-1159.o ../tests/BugsTest/Bug-1159.cpp
$(OBJECTS_DIR)/Bug-1174.o : ../tests/BugsTest/Bug-1174.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-1174.o ../tests/BugsTest/Bug-1174.cpp
$(OBJECTS_DIR)/Bug-350.o : ../tests/BugsTest/Bug-350.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-350.o ../tests/BugsTest/Bug-350.cpp
$(OBJECTS_DIR)/Bug-422.o : ../tests/BugsTest/Bug-422.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-422.o ../tests/BugsTest/Bug-422.cpp
$(OBJECTS_DIR)/Bug-624.o : ../tests/BugsTest/Bug-624.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-624.o ../tests/BugsTest/Bug-624.cpp
$(OBJECTS_DIR)/Bug-886.o : ../tests/BugsTest/Bug-886.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-886.o ../tests/BugsTest/Bug-886.cpp
$(OBJECTS_DIR)/Bug-899.o : ../tests/BugsTest/Bug-899.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-899.o ../tests/BugsTest/Bug-899.cpp
$(OBJECTS_DIR)/Bug-914.o : ../tests/BugsTest/Bug-914.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-914.o ../tests/BugsTest/Bug-914.cpp
$(OBJECTS_DIR)/BugsTest.o : ../tests/BugsTest/BugsTest.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/BugsTest.o ../tests/BugsTest/BugsTest.cpp
$(OBJECTS_DIR)/Bug-458.o : ../tests/BugsTest/Bug-458/Bug-458.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-458.o ../tests/BugsTest/Bug-458/Bug-458.cpp
$(OBJECTS_DIR)/QuestionContainerSprite.o : ../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/QuestionContainerSprite.o ../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp
$(OBJECTS_DIR)/Bounce.o : ../tests/ChipmunkTest/Bounce.cpp $(OBJECTS_DIR)/Bounce.o : ../tests/ChipmunkTest/Bounce.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bounce.o ../tests/ChipmunkTest/Bounce.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bounce.o ../tests/ChipmunkTest/Bounce.cpp
@ -243,6 +288,9 @@ $(OBJECTS_DIR)/CocosNodeTest.o : ../tests/CocosNodeTest/CocosNodeTest.cpp
$(OBJECTS_DIR)/CurlTest.o : ../tests/CurlTest/CurlTest.cpp $(OBJECTS_DIR)/CurlTest.o : ../tests/CurlTest/CurlTest.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CurlTest.o ../tests/CurlTest/CurlTest.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CurlTest.o ../tests/CurlTest/CurlTest.cpp
$(OBJECTS_DIR)/DirectorTest.o : ../tests/DirectorTest/DirectorTest.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DirectorTest.o ../tests/DirectorTest/DirectorTest.cpp
$(OBJECTS_DIR)/DrawPrimitivesTest.o : ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp $(OBJECTS_DIR)/DrawPrimitivesTest.o : ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DrawPrimitivesTest.o ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp $(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DrawPrimitivesTest.o ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp

108
tests/test.wophone/test.wophone.vcproj
View File

@ -970,6 +970,114 @@
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="BugsTest"
>
<File
RelativePath="..\tests\BugsTest\Bug-1159.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-1159.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-1174.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-1174.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-350.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-350.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-422.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-422.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-624.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-624.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-886.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-886.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-899.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-899.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-914.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-914.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\BugsTest.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\BugsTest.h"
>
</File>
<Filter
Name="Bug-458"
>
<File
RelativePath="..\tests\BugsTest\Bug-458\Bug-458.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-458\Bug-458.h"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-458\QuestionContainerSprite.cpp"
>
</File>
<File
RelativePath="..\tests\BugsTest\Bug-458\QuestionContainerSprite.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="DirectorTest"
>
<File
RelativePath="..\tests\DirectorTest\DirectorTest.cpp"
>
</File>
<File
RelativePath="..\tests\DirectorTest\DirectorTest.h"
>
</File>
</Filter>
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter