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

18331 Commits

Author SHA1 Message Date
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
James Chen aa8df9607d Update CHANGELOG [ci skip] 2014-04-01 10:07:21 +08:00
James Chen 89e1e59f0d Update AUTHORS [ci skip] 2014-04-01 10:06:14 +08:00
James Chen d7ca1999ab Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash 
closed #4626: Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
 2014-04-01 10:02:35 +08:00
koowolf 36aeb88a9d Merge branch 'quadcommand-optimize' of https://github.com/minggo/cocos2d-x into quadcommand-optimize 
Conflicts:
	cocos/2d/cocos2d_wp8.vcxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
 2014-04-01 09:39:03 +08:00
zukkun e41fd1a29b fixed PhysicsBody::setAngularVelocityLimit incorrect function call 2014-04-01 09:34:42 +09:00
samuele3hu 3ce597bc0e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-31 23:12:18 +08:00
samuele3hu 0a1d23753b fix the lua template error that would lead to crash when do rotate 2014-03-31 23:11:26 +08:00
koowolf ad653c6cf9 use xxhash in win32 and wp8 2014-03-31 18:38:39 +08:00
James Chen a93470c67d Merge pull request #6077 from Dhilan007/develop_label 
Label:fixed possible blink if label contains shadow.
 2014-03-31 18:33:55 +08:00
boyu0 18b0c041b4 1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection. 2014-03-31 18:17:00 +08:00
Dhilan007 f485d3b6d5 Label:fixed possible blink if label contains shadow. 2014-03-31 18:16:08 +08:00
James Chen 8bb3cdee47 Merge pull request #6076 from CocosRobot/update_cocosfiles_1396259549 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-31 17:58:02 +08:00
CocosRobot 9801dc6f50 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-31 09:52:30 +00:00
James Chen bc5a2ff5db Merge pull request #6075 from Dhilan007/develop_label 
fixed warnings in LabelTest.
 2014-03-31 17:40:30 +08:00
Dhilan007 687b2e9f87 update test case. 2014-03-31 17:38:54 +08:00
James Chen 9edbbd9abb Merge pull request #6074 from samuele3hu/develop_socket 
Add ignored `Makefile` file for building luajit
 2014-03-31 17:34:45 +08:00
Dhilan007 51f3833a7e fixed warn. 2014-03-31 17:31:04 +08:00
Dhilan007 72811d8869 fixed warn in test case. 2014-03-31 17:21:56 +08:00
James Chen 4d18b7d8f7 Merge pull request #6070 from CocosRobot/update_lua_bindings_1396255857 
[AUTO]: updating luabinding automatically
 2014-03-31 17:17:28 +08:00
minggo 01aaed59f4 Merge pull request #15 from koowolf/quadcommand-optimize 
use xxhash in win32 and wp8
 2014-03-31 17:17:13 +08:00
koowolf 75ec817ac5 use xxhash in win32 and wp8 2014-03-31 17:15:04 +08:00
samuele3hu 60296e79d6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-31 17:08:19 +08:00
samuele3hu de3e9aa916 Add ignored `Makefile` file for building luajit 2014-03-31 17:06:36 +08:00
CocosRobot cf59264dfe [AUTO]: updating luabinding automatically 2014-03-31 08:52:27 +00:00
James Chen f4a7da8457 Merge pull request #6069 from Dhilan007/develop_label 
fixed can't type chinese.
 2014-03-31 16:46:43 +08:00
Dhilan007 6c99f992dc fixed can't type chinese. 2014-03-31 16:18:45 +08:00
James Chen 9e64140f8a Merge pull request #6067 from Dhilan007/develop_label 
1) fixed logical error in Label::updateFont.
2) fixed the font file searching strategy, used FileUtils::isFileExist to check whether the font file exist rather than find . letter.
 2014-03-31 16:11:59 +08:00
Dhilan007 d39a419eeb fixed logical error in Label::create. 2014-03-31 16:06:20 +08:00
Dhilan007 89eba4424f fixed logical error. 2014-03-31 15:45:06 +08:00
minggo 66440ac335 add xxhash on linux 2014-03-31 15:43:35 +08:00
minggo 98ed579b34 Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301 
Fixed bugs for Editor
 2014-03-31 15:37:45 +08:00
Dhilan007 774debd142 fixed logical error in Label::updateFont. 2014-03-31 15:29:24 +08:00