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

28008 Commits

Author SHA1 Message Date
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
Nick Barrios 0c2e64b8b9 AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES. 2014-12-19 16:50:47 -05:00
Nick Barrios 08875d9e83 Append new C flags when adding defines in base CMakeLists.txt. 2014-12-19 16:40:02 -05:00
mannewalis 0d590604f9 updating changelog 2014-12-19 12:39:49 -05:00
mannewalis 50bd3cf2b7 modify inline macro to work on windows 2014-12-19 10:57:19 -05:00
Justin Graham da3fdf7a48 Merge pull request #1 from Dhilan007/mem_alloc_again 
Fix compile error on WIN32.
 2014-12-19 10:39:00 -05:00
XiaoYang 7f7bb24ef8 Merge pull request #178 from tangziwen/v3 
V3
 2014-12-19 17:13:30 +07:00
tangziwen 68177e41e9 update 2014-12-19 17:39:26 +08:00
tangziwen 395cf929a8 update 2014-12-19 17:22:17 +08:00
XiaoYang 9102c77840 Merge pull request #182 from lvlonggame/v3 
camera frustum update
 2014-12-19 16:14:01 +07:00
tangziwen 95bcfaaa3e update test 15:29 2014-12-19 15:31:06 +08:00
XiaoYang 6be4538f3d Merge pull request #181 from songchengjiang/sync_load 
fix errors on Windows
 2014-12-19 13:33:20 +07:00
yangxiao eb2e27ef27 Merge branch 'newcode' into sync_load 2014-12-19 14:27:17 +08:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
tangziwen 1bbe9e249d fix coding style 2014-12-19 11:22:59 +08:00
yangxiao f4dbaa53e4 add to linux 2014-12-19 10:29:10 +08:00
lvlong 13cae3c480 deal tab 2014-12-19 10:25:59 +08:00
minggo ad6defcf33 [ci skip] 2014-12-19 10:23:26 +08:00
yangxiao 7137e49cd4 modify async load test fix crash 2014-12-19 10:22:42 +08:00
yangxiao 5aad841080 add stop task 2014-12-19 10:22:02 +08:00
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao 37f4d67a49 make it thread safe 2014-12-19 10:20:37 +08:00
minggo 627e5dacfc Merge pull request #9543 from tjunxin/patch-1 
comment line 83
 2014-12-19 10:04:14 +08:00
minggo 8f3e9d9fb1 Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers 
Update that avoid crash during load resource which serialize by flat buffers.
 2014-12-19 09:58:26 +08:00
minggo 851e8e9669 [ci skip] Update CHANGELOG 2014-12-19 09:55:41 +08:00
minggo 6f0a4191cb Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha 
fix webp format premultipliedAlpha error
 2014-12-19 09:53:44 +08:00
minggo 2a72efa3e2 Merge pull request #9539 from CocosRobot/update_lua_bindings_1418812554 
[AUTO]: updating luabinding automatically
 2014-12-19 09:52:05 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
tangziwen 591edd8bad update test 2014-12-19 09:05:53 +08:00
mannewalis 467a5e9c12 minor changes for linux build 2014-12-18 18:21:49 -05:00
mannewalis c05a6c877d adding files to cmake files 2014-12-18 18:10:13 -05:00