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

26035 Commits

Author SHA1 Message Date
minggo 90a7f99873 Merge pull request #9570 from liamcindy/UIListView 
override function for listview
 2014-12-23 14:25:46 +08:00
minggo 712b0294b1 Merge pull request #9590 from CocosRobot/update_lua_bindings_1419307389 
[AUTO]: updating luabinding automatically
 2014-12-23 14:09:14 +08:00
minggo 205d65fc7b Merge pull request #9589 from CocosRobot/update_cocosfiles_1419307314 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-23 14:08:52 +08:00
CocosRobot facf9a1a66 [AUTO]: updating luabinding automatically 2014-12-23 04:05:21 +00:00
CocosRobot 94d96b5ad1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-23 04:01:55 +00:00
minggo 40d00e3d97 Merge pull request #9554 from super626/sync_load 
create 3d sprite asynchronously
 2014-12-23 12:00:13 +08:00
minggo a2327f9488 Merge pull request #9568 from vovkasm/pull/fix-cmake-link 
cmake: fix tests linking
 2014-12-23 11:49:40 +08:00
minggo cf25160b98 Merge pull request #9588 from mannewalis/windows_allocator_fix 
fixing windows8 build
 2014-12-23 11:48:03 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yangxiao 2309a524fd simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
mannewalis 9d885fe664 default lock macros to nothing for unsupported platforms 2014-12-22 19:49:20 -05:00
mannewalis 09f2eed4b8 default lock macros to nothing for unsupported platforms 2014-12-22 19:46:16 -05:00
mannewalis aad45d6952 fixing windows8 build 2014-12-22 19:43:40 -05: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
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
minggo 6195d260c1 Merge pull request #9574 from super626/v3 
Add new test
 2014-12-22 15:25:14 +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
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
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
yangxiao 7a332aef04 ios work 2014-12-22 14:17:48 +08:00
pipu 0c6e22dd77 Update that parse resource path with flat buffers for readers 2014-12-22 13:42:18 +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
tangziwen 95bcfaaa3e update test 15:29 2014-12-19 15:31:06 +08:00