Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/test-cpp/Classes
History
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 		2014-01-28 11:32:25 -08:00
..
AccelerometerTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ActionManagerTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ActionsEaseTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ActionsProgressTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ActionsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
Box2DTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
Box2DTestBed issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
BugsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ChipmunkTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ClickAndMoveTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ClippingNodeTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
CocosDenshionTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ConfigurationTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ConsoleTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
CurlTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
CurrentLanguageTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
DataVisitorTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
DrawPrimitivesTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
EffectsAdvancedTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
EffectsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ExtensionsTest Merge branch 'develop' into glview_improvements 2014-01-28 11:32:25 -08:00
FileUtilsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
FontTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
InputTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
IntervalTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
KeyboardTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
KeypadTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
LabelTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
LayerTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
MenuTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
MotionStreakTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
MutiTouchTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
NewEventDispatcherTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
NewRendererTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
NodeTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ParallaxTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ParticleTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
PerformanceTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
PhysicsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ReleasePoolTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
RenderTextureTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
RotateWorldTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
SceneTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
SchedulerTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ShaderTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
SpineTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
SpriteTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TextInputTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
Texture2dTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TextureCacheTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TexturePackerEncryptionTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TileMapTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TouchesTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
TransitionsTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
UnitTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
UserDefaultTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
ZwoptexTest issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
AppDelegate.cpp Merge branch 'develop' into glview_improvements 2014-01-28 11:32:25 -08:00
AppDelegate.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
BaseTest.cpp issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
BaseTest.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
VisibleRect.cpp Merge branch 'develop' into glview_improvements 2014-01-28 11:32:25 -08:00
VisibleRect.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
controller.cpp issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
controller.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
testBasic.cpp issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
testBasic.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
testResource.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
tests.h issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00