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

27287 Commits

Author SHA1 Message Date
yangxiao 0f27e0c31a add to ext.h 2015-02-13 16:16:30 +08:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
minggo 4684500987 Merge pull request #10493 from gravitation1/v3 
Cleaned up CCAction.cpp
 2015-02-13 15:29:55 +08:00
minggo eb0a66d091 Merge pull request #10494 from SunLightJuly/v3_fix_bug 
called initGLContextAttrs()  before create glview
 2015-02-13 14:01:42 +08:00
SunLightJuly aaf6ad03c8 called initGLContextAttrs() before create glview 2015-02-13 13:45:15 +08:00
Justin Fraize 3667cc6e1f Cleaned up CCAction.cpp 
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
 2015-02-12 21:00:12 -08:00
minggo 87e444873f Merge pull request #10268 from kompjoefriek/Fixing-warnings 
Fixed some compiler warnings
 2015-02-13 10:04:19 +08:00
minggo cf037a7e3b Merge pull request #10481 from CocosRobot/update_lua_bindings_1423737884 
[AUTO]: updating luabinding automatically
 2015-02-13 09:57:34 +08:00
yangxiao d4ace2a08c Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-13 09:49:07 +08:00
yangxiao 2789ad1393 remove unused code 2015-02-13 09:48:27 +08:00
XiaoYang 1fe78ca2de Merge pull request #237 from IPubby/particle_merge 
Solve compile errors on win32 platform
 2015-02-13 09:00:43 +08:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
zhukaixy acc0476f01 Solve compile errors on win32 platform 2015-02-12 19:36:03 +08:00
CocosRobot a643691795 [AUTO]: updating luabinding automatically 2015-02-12 10:47:08 +00:00
minggo 4de2e6b9bf Merge pull request #10480 from minggo/disable-travis-notify 
[ci skip]disable travis notification
 2015-02-12 18:40:42 +08:00
minggo e017511c65 disable travis notification 2015-02-12 18:39:42 +08:00
minggo afd4e94c4c Merge pull request #10160 from lite3/wildpointer 
fix wild pointer
 2015-02-12 18:01:10 +08:00
minggo 7fd6b5bfe7 Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const 
make CCTMXObjectGroup::getGroupName const
 2015-02-12 18:00:49 +08:00
minggo 8716164a5d Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node 
Specify default capacity for sprite batch node
 2015-02-12 17:58:59 +08:00
yangxiao 954fd52493 rename folder and fix warning 2015-02-12 17:54:27 +08:00
minggo 3a4e9ced46 Merge pull request #10442 from Dhilan007/v3-accelerometer-fix 
Fixed Accelerometer has lagged on iOS
 2015-02-12 17:20:07 +08:00
yangxiao 2bae6b5351 check created vertex and index buffer 2015-02-12 17:15:48 +08:00
yangxiao 58bfae2e57 adjust and remove unused code 2015-02-12 16:58:34 +08:00
yangxiao 026ce1a288 modify according to minggo 2015-02-12 16:51:02 +08:00
minggo f44ea6468e Merge pull request #10461 from ntotani/fix-lua-framework-v3 
fix SpriteEx
 2015-02-12 16:17:46 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
minggo e276a2b7f0 [ci skip]update CHANGELOG 2015-02-12 15:42:28 +08:00
minggo 9d6f399584 Merge pull request #10467 from minggo/audio-issue 
audio resume issue
 2015-02-12 15:39:48 +08:00
Wenhai Lin eb7a7a9fb7 Fixed audio can't resume after the interruption of audio session has ended on iOS. 2015-02-12 15:38:44 +08:00
minggo 6d526b1a66 [ci skip]update CHANGELOG 2015-02-12 15:34:14 +08:00
minggo c5e8d0cc1d Merge pull request #10466 from minggo/string-padding 
Changed the option to be passed to calculate bounding rect size for strings
 2015-02-12 15:32:22 +08:00
sawada_yasuharu cf8a7cd6da Changed the option to be passed to calculate bounding rect size for 
strings.

As an option, NSStringDrawingUsesLineFragmentOrigin and
NSStringDrawingUsesFontLeading are passed, the result size is differ
from the size which actually strings are rendered.
 2015-02-12 15:30:46 +08:00
Naoyuki Totani 2b43c12b88 fix SpriteEx 2015-02-12 15:16:48 +09:00
yangxiao c114d5d496 add particle to linux project 2015-02-12 11:00:48 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
WenhaiLin 20ad425407 Fixed Accelerometer has lagged on iOS 2015-02-11 16:28:43 +08:00
KompjoeFriek 7f28230311 Fixed merge error 2015-02-10 21:37:18 +01:00
kompjoefriek 00edc542cb Merged with upstream/v3 
Merged with upstream/v3 and resolved merge conflicts
 2015-02-10 21:27:20 +01:00
kompjoefriek bbd6eb1dcc Merge branch 'v3' of https://github.com/kompjoefriek/cocos2d-x into v3 2015-02-10 21:10:52 +01:00
minggo 1e11f3b3da Merge pull request #10310 from perminovVS/v3 
Fix visual studio project out of date
 2015-02-10 14:18:13 +08:00
minggo cc56eae6f7 Merge pull request #10420 from Sheado/FIX_10373 
FIX for Build error when CC_USE_CULLING=0 #10373
 2015-02-10 11:18:42 +08:00
minggo a65070bf00 Merge pull request #10380 from fusijie/cameratest 
fixed Camera3dTest restart bug.
 2015-02-10 10:43:38 +08:00
Chad befbc0a14e FIX for Build error when CC_USE_CULLING=0 #10373 
Fix for build error when using CC_USE_CULLING
 2015-02-09 18:15:22 -08:00
minggo 95bb2b7b7b Merge pull request #10392 from super626/v3_render 
fix render state
 2015-02-06 16:02:16 +08:00
yangxiao 2ac0b35283 fix render state 2015-02-06 10:09:23 +08:00
Nite Luo ee2781e6a6 Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core 
Cmake build system fixes for MSVC (partial)
 2015-02-04 23:18:08 -08:00
Jacky ecefc53c0d fixed Camera3dTest restart bug. 2015-02-05 14:16:31 +08:00
Nite Luo 6f53719772 Merge pull request #10317 from darkdukey/G17hao-patch-12 
Improve group command
 2015-02-02 14:12:50 -08:00
Huabing.Xu 173578cf41 Merge pull request #10315 from samuele3hu/v3_4_rc1 
Fix the error that the binary data would be truncated
 2015-02-01 07:18:31 +08:00
Nite Luo e9b4e4e19c Merge branch 'patch-13' of https://github.com/G17hao/cocos2d-x into G17hao-patch-12 2015-01-31 09:46:59 -08:00