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

26639 Commits

Author SHA1 Message Date
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00
Liam 2991b57ec6 update lay out reader and samples 2014-12-22 18:24:06 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
yusheng.lu 6de7fae114 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-22 18:00:08 +08:00
lvlong abd9a35504 CameraClippingDemo: change the sprite number. 2014-12-22 17:48:34 +08:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
minggo a1a41d9f33 Merge pull request #9569 from vovkasm/pull/cmake-cleanups 
cmake: cleanups
 2014-12-22 17:39:26 +08:00
lvlong 2058742e4a Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCCamera.cpp
	cocos/2d/CCCamera.h
	cocos/3d/CCFrustum.cpp
	cocos/3d/CCFrustum.h
	cocos/3d/CCPlane.cpp
	cocos/3d/CCPlane.h
	cocos/3d/CCRay.cpp
	cocos/3d/CCRay.h
	cocos/3d/CCSprite3D.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2014-12-22 17:37:00 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
yangxiao e8c7f30541 add quaternion 2014-12-22 17:23:44 +08:00
minggo f4b3fcd428 Merge pull request #9580 from CocosRobot/update_lua_bindings_1419235211 
[AUTO]: updating luabinding automatically
 2014-12-22 17:17:16 +08:00
CocosRobot 34e1bce6c3 [AUTO]: updating luabinding automatically 2014-12-22 08:02:05 +00:00
minggo feacf75f12 Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3 
#9555 MoveTo and MoveBy support Vec3
 2014-12-22 15:57:12 +08:00
lvlong 63ebf20026 modify code format. 2014-12-22 15:51:10 +08:00
Liam ce9f269680 update object reader for new lay out system 2014-12-22 15:38:47 +08:00
minggo 6195d260c1 Merge pull request #9574 from super626/v3 
Add new test
 2014-12-22 15:25:14 +08:00
lvlong 7291e6e94a modify about feedback. 2014-12-22 15:23:41 +08:00
Liam f5a242be97 update for widget percent position and size logic 2014-12-22 15:23:26 +08:00
Liam 8b32193e04 reset unused format changed 2014-12-22 15:15:40 +08:00
yangxiao bdc12dce8b add quaternion property 2014-12-22 15:14:18 +08:00
minggo 6ac611bd1d Merge pull request #9573 from pipu/update_parse_resource_path 
Update that parse resource path with flat buffers for readers
 2014-12-22 15:11:24 +08:00
minggo 81de0ae687 Merge pull request #9566 from austinkelleher/dev 
Fixing variable name lenght -> length.
 2014-12-22 15:07:15 +08:00
Liam 5a73ea9313 reset widget chaned 2014-12-22 15:04:25 +08:00
minggo 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
minggo 179bd22612 Merge pull request #9561 from wefiends/upstream-v3 
CMake - Append new C flags when adding defines instead of overriding.
 2014-12-22 14:51:54 +08:00
Liam 7c4d31feab update for lay out samples 2014-12-22 14:51:50 +08:00
minggo 39f56f1303 Merge pull request #9562 from wefiends/upstream2-v3 
AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.
 2014-12-22 14:50:38 +08:00
minggo 79e0b624c8 Merge pull request #9563 from CocosRobot/update_cocosfiles_1419028671 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-22 14:48:06 +08:00
minggo 1268f73a7c MoveTo and MoveBy support Vec3 2014-12-22 14:34:35 +08:00
tangziwen 35e9d60dae remove the float type "f" postfix in /simple_shadow.frag 2014-12-22 14:22:30 +08:00
yangxiao 7a332aef04 ios work 2014-12-22 14:17:48 +08:00
kaile.yin f792b4ac68 remove same line 2014-12-22 14:08:15 +08:00
kaile.yin 9ef5d8213e update submodule 2014-12-22 14:07:00 +08:00
pipu 0c6e22dd77 Update that parse resource path with flat buffers for readers 2014-12-22 13:42:18 +08:00
Liam 56e42b0a0a update for lay out 2014-12-22 11:20:03 +08:00
kaile.yin a8dd2a4e80 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-22 11:15:07 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
Liam 8d8215b148 override function for listview 2014-12-22 09:55:29 +08:00
joewanchen bb1267cd09 use auto&. 2014-12-21 14:05:34 +08:00
Vladimir Timofeev edb4e770b1 Remove unused code from Find*.cmake modules. All logic with USE_PREBUILT_LIBS are handled in cmake/Modules/CocosUsePrebuiltLibs.cmake 2014-12-20 23:10:28 +03:00
joewanchen a15a4a0739 fix compile error. 2014-12-21 02:03:41 +08:00
Vladimir Timofeev 1aef6338fc cmake: remove unneeded flatbuffers code... only FLATBUFFERS_INCLUDE_DIRS should be set (for now to our external/flatbuffers directory) 2014-12-20 20:12:26 +03:00
Vladimir Timofeev 69a7b0ac3a Why we ever linking with flatbuffers compiler library??? 
On windows mingw platform all executables as a result will be flatc command line utils (((
Because flatbuffers target contains "main" function...

Fix it by not set FLATBUFFERS_LIBRARIES at all (because it header-only library!)
 2014-12-20 20:12:12 +03:00
joewanchen c2473b9b99 fix. 2014-12-21 01:03:30 +08:00
joewanchen 3765f87651 fix. 2014-12-21 00:49:23 +08:00
joewanchen 7d6686eb7b fix. 2014-12-21 00:42:55 +08:00
joewanchen fc69dabca2 fix serious performance problem. 2014-12-21 00:22:23 +08:00
Austin Kelleher d3ca364259 Fixing variable name lenght -> length. 2014-12-20 07:34:44 -05:00
CocosRobot 7170e85a7a [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-19 22:37:52 +00:00
Ricardo Quesada 92584bbc7f Merge pull request #9547 from mannewalis/mem_alloc_again 
Mem alloc again
 2014-12-19 14:35:26 -08:00