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

19664 Commits

Author SHA1 Message Date
heliclei a6dd44e38c [ci skip]fix typo 2014-04-01 22:08:32 +08:00
heliclei 5d37f8960d [ci skip]auto detect android device ip via adb command 2014-04-01 22:05:47 +08:00
samuele3hu 84dd2c2a13 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 
Conflicts:
	build/android-build.py
 2014-04-01 21:04:35 +08:00
James Chen 3f6205519c Merge pull request #6099 from dumganhar/develop 
Fixed copying resource fails in empty-lua-test.
 2014-04-01 20:09:11 +08:00
James Chen 8ae82e2eb5 Fixed copying resource fails in empty-lua-test. 2014-04-01 20:06:43 +08:00
samuele3hu fff768b84b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 19:58:06 +08:00
samuele3hu 7a308feb58 update android-build.py for copying files about lua 2014-04-01 19:56:37 +08:00
minggo 95ed30e0dd [ci skip] 2014-04-01 19:37:15 +08:00
Sergey b153131097 Android crash fix on new devices 2014-04-01 15:14:25 +04:00
James Chen 47620408ea Merge pull request #6095 from samuele3hu/develop_socket 
update android-build.py for copying files about lua
 2014-04-01 18:17:33 +08:00
samuele3hu d4d8960342 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 18:13:19 +08:00
samuele3hu 6c92c10a67 update android-build.py for copying files about lua 2014-04-01 18:09:49 +08:00
James Chen ed29ce8585 Merge pull request #6094 from dumganhar/develop 
Updates templates for linux platform
 2014-04-01 16:52:25 +08:00
James Chen 96e7bad7e3 Updates templates for linux platform 2014-04-01 01:49:24 -07:00
minggo 5325cdbb38 Merge pull request #6092 from heliclei/fix-autotest 
Fix autotest infinite loop
 2014-04-01 16:15:09 +08:00
dplusic 1aac5c6934 fixed cc.pGetAngle not using absolute value 2014-04-01 17:13:59 +09:00
heliclei f04ca0069c fix autotest infinite loop 2014-04-01 16:05:28 +08:00
James Chen 53984e1712 Update CHANGELOG [ci skip] 2014-04-01 15:40:15 +08:00
James Chen 1a5de6cfa7 Merge pull request #6091 from Dhilan007/develop_label 
Label:fixed possible appear OpenGL error 0x500.
 2014-04-01 15:15:01 +08:00
minggo 5c57ba5aea Merge pull request #6090 from dumganhar/iss4383-label-missing-letters 
closed #4383: Fixed missing letters if using old LabelTTF and running on  iPhone 64bit simulator(device).
 2014-04-01 15:10:58 +08:00
Dhilan007 c63baa388b remove unused local variable. 2014-04-01 15:10:24 +08:00
James Chen 70dd83512c Renames s_isIOS7 to s_isIOS7OrHigher 2014-04-01 15:08:08 +08:00
Dhilan007 540c67f701 Label:fixed possible appear OpenGL error 0x500. 2014-04-01 15:03:17 +08:00
James Chen 944e752509 fonts/xxx.ttf -> Xxx for old LabelTTF test. 2014-04-01 14:49:02 +08:00
James Chen 47320e7c7c closed #4383: Fixed missing letters if using old LabelTTF and running on 
iphone 64bit simulator(device).
 2014-04-01 14:47:52 +08:00
minggo c3334cb4ac Merge pull request #6089 from Dhilan007/develop_label 
Fixed logical error in Label::enableShadow
 2014-04-01 14:18:48 +08:00
Dhilan007 eadbca8ee7 1.fixed logical error in Label::enableShadow. 
2.Add test case for shadow and outline take effect at the same time.
 2014-04-01 14:15:35 +08:00
minggo 566fa7110d Merge pull request #6087 from Dhilan007/develop_label 
fixed shadow and outline can't take effect at the same time
 2014-04-01 14:03:42 +08:00
James Chen ea62d1646e Merge pull request #6088 from samuele3hu/develop_socket 
Update `build_ios.sh` for building luajit
 2014-04-01 11:55:39 +08:00
James Chen d709a50f69 Update CHANGELOG [ci skip] 2014-04-01 11:51:43 +08:00
James Chen 96429dfe1e Update AUTHORS [ci skip] 2014-04-01 11:51:01 +08:00
James Chen 0bb71ce678 Merge pull request #6082 from zukkun/fix_cpbodysetangvellimit 
fixed incorrect function invocation in PhysicsBody::setAngularVelocityLimit
 2014-04-01 11:49:38 +08:00
samuele3hu 8af92fd574 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:49:06 +08:00
James Chen fb9c94f692 Merge pull request #6086 from CocosRobot/update_lua_bindings_1396323111 
[AUTO]: updating luabinding automatically
 2014-04-01 11:45:23 +08:00
samuele3hu 130c2608da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:40:21 +08:00
James Chen 1325f7aa4f Update CHANGELOG [ci skip] 2014-04-01 11:38:14 +08:00
Dhilan007 3a556c24aa fixed shadow and outline can't take effect at the same time 2014-04-01 11:37:36 +08:00
James Chen cb16bb1158 Merge pull request #6084 from dumganhar/update-websocket-v1.23 
Updates websocket to the latest release v1.23.
 2014-04-01 11:36:03 +08:00
samuele3hu abaaa3132c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:33:50 +08:00
James Chen 5c3fe15339 Merge pull request #6085 from CocosRobot/update_cocosfiles_1396323023 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-01 11:33:49 +08:00
CocosRobot 55b87dbad0 [AUTO]: updating luabinding automatically 2014-04-01 03:33:06 +00:00
CocosRobot d93ebe0b37 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-01 03:30:24 +00:00
samuele3hu 22720fa1b7 Update `build_ios.sh` for building luajit 2014-04-01 11:28:27 +08:00
minggo 7fb5e1f13a Merge pull request #6066 from minggo/quadcommand-optimize 
use xxhash to generate material id
 2014-04-01 11:27:51 +08:00
minggo 7804fdf0a1 Merge pull request #6078 from boyu0/3.0rc1_test 
1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
 2014-04-01 11:23:16 +08:00
minggo 086464f07a Merge pull request #6081 from samuele3hu/develop_socket 
fix the lua template error that would lead to crash when do rotate
 2014-04-01 11:20:26 +08:00
minggo 4f5a10143f Merge pull request #16 from koowolf/quadcommand-optimize 
use xxhash in win32 and wp8
 2014-04-01 10:50:43 +08:00
James Chen b73a7d2939 Updates websocket to the latest release v1.23. 2014-04-01 10:44:50 +08:00
James Chen 61cd585c5c Merge pull request #6083 from CocosRobot/update_lua_bindings_1396318132 
[AUTO]: updating luabinding automatically
 2014-04-01 10:10:27 +08:00
CocosRobot ce10ddd84b [AUTO]: updating luabinding automatically 2014-04-01 02:09:55 +00:00