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
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
lvlong a5746dd2a0 1. modify Android.mk 
2. modify DrawNode3D include path
 2014-12-18 18:14:16 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
yangxiao f54f8a4826 remove return value of enque 2014-12-18 16:16:04 +08:00
tangziwen 086bca399f add three samples -- toonshader fakeshadow lightmap 2014-12-18 16:09:29 +08:00
yangxiao 6e99698c59 Merge branch 'newcode' into sync_load 2014-12-18 14:03:07 +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 b11e3d74cc restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar 2014-12-17 16:46:48 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00
tangziwen 73014e8be3 asdasd 2014-12-17 13:31:35 +08:00
minggo e7fc2a5607 Merge pull request #9531 from samuele3hu/v3_4_bug 
Synchronize the KeyCode Enum to Lua
 2014-12-17 11:32:20 +08:00
samuele3hu 5c20885ad1 Synchronize the KeyCode Enum to Lua 2014-12-17 11:27:01 +08:00