Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,989 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

25989 Commits

Author SHA1 Message Date
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
joewanchen bb1267cd09 use auto&. 2014-12-21 14:05:34 +08:00
joewanchen a15a4a0739 fix compile error. 2014-12-21 02:03:41 +08: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
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
tangziwen 1bbe9e249d fix coding style 2014-12-19 11:22:59 +08:00
minggo ad6defcf33 [ci skip] 2014-12-19 10:23:26 +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
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
tangziwen 086bca399f add three samples -- toonshader fakeshadow lightmap 2014-12-18 16:09:29 +08:00
tjunxin 561350c2bc comment line 83 
As known,  _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
 2014-12-18 13:49:54 +08:00
mannewalis 6b1f994c40 turn off global new delete 2014-12-17 13:55:14 -05:00
mannewalis a6eab3c496 Merge branch 'v3' into mem_alloc_again 2014-12-17 11:59:24 -05:00
mannewalis 34a2f6f640 minor tweak 2014-12-17 11:56:19 -05:00
mannewalis fd22242fb2 added locking semantics to fixed block allocator 
pool allocator uses lockless semantics by default
 2014-12-17 11:54:06 -05:00
pipu 79acf80fb1 Update that avoid crash during load resource which serialize by flat buffers 2014-12-17 19:00:24 +08:00
CocosRobot 9ffacb3f78 [AUTO]: updating luabinding automatically 2014-12-17 10:38:03 +00:00
minggo 9da1317f10 Merge pull request #9453 from sxd1140/v3 
add stopActionByName()
 2014-12-17 18:32:04 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00