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

16252 Commits

Author SHA1 Message Date
James Chen 7155273b0e Merge pull request #5349 from CocosRobot/update_cocosfiles_1392270517 
[AUTO] : updating tools/project-creator/module/cocos_files.json
 2014-02-13 13:49:58 +08:00
CocosRobot 14adb36002 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 05:48:38 +00:00
James Chen 37fabcb6ce Merge pull request #5348 from dumganhar/develop 
issue #4020: Sorts the elements in cocos_files.
 2014-02-13 13:46:44 +08:00
James Chen 3ac6f01742 issue #4020: Sorts the elements in cocos_files. 2014-02-13 13:45:50 +08:00
James Chen 508fcce64d Merge pull request #5346 from CocosRobot/update_cocosfiles_1392263816 
[AUTO] : updating tools/project-creator/module/cocos_files.json
 2014-02-13 11:58:04 +08:00
CocosRobot 8b0ed16205 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 03:56:58 +00:00
James Chen 18d72f20ed Merge pull request #5345 from dumganhar/iss4020-auto-cocos-files 
issue #4020: Adds execute permission for generate-cocosfile.sh.
 2014-02-13 11:54:56 +08:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 431409c640 Merge pull request #5344 from dumganhar/iss4020-auto-cocos-files 
closed #4020: cocos_files.json should be auto-generated by CocosRobot.
 2014-02-13 11:47:39 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
James Chen a255478127 [Linux] Installs libssl-dev package. 2014-02-13 10:08:03 +08:00
James Chen 4146ce69da Merge pull request #5339 from azmeuk/jsb-linux 
closed #3895: Linux javascript bindings support.
 2014-02-13 09:51:45 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards. 
Dependencies installation is skipped on linux distributions that does not use .deb package format.
 2014-02-13 01:25:23 +01:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00
Ricardo Quesada 2108ae0c35 Merge pull request #5324 from heliclei/develop 
set prompt for async console commands
 2014-02-13 08:05:07 +08:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
Éloi Rivard 3fb2b61591 Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
Ricardo Quesada c13a38e42f Merge pull request #5340 from ricardoquesada/fix_fps 
quick fix for positioning the FPS on non HD
 2014-02-13 04:11:18 +08:00
Ricardo Quesada 61e4ffbc3c quick fix for positioning the FPS on non HD 2014-02-13 04:10:23 +08:00
Ricardo Quesada e7af234d31 Merge pull request #5337 from ricardoquesada/droid_fonts 
Droid fonts
 2014-02-12 20:27:51 +08:00
Ricardo Quesada 200eb9713c Merge branch 'develop' into droid_fonts 2014-02-12 20:23:40 +08:00
James Chen cd4478f17c Merge pull request #5327 from chuanweizhang2013/jsruntime 
issue #3984: Adds JS runtime and project-creator supports creating JS runtime.
 2014-02-12 18:51:30 +08:00
chuanweizhang2013 ea82fa33e6 lower-case for StartRuntime and ReloadRuntime 2014-02-12 18:23:07 +08:00
James Chen 130c326811 Update CHANGELOG [ci skip] 2014-02-12 17:42:45 +08:00
James Chen 8ede1607a2 Merge pull request #5325 from boyu0/iss3988_physics_setRotation_bug 
closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body.
 2014-02-12 17:00:31 +08:00
boyu0 e7c077bb16 closed #3988: fix indent. 2014-02-12 16:21:26 +08:00
boyu0 4fda8a2635 closed #3988: add bug test 2014-02-12 15:57:02 +08:00
James Chen bafc1369bf Merge pull request #5333 from lmskater/fix_build_path 
[Jenkins] fix build path
 2014-02-12 13:06:35 +08:00
lm 3cc9235681 [Jenkins] fix build path 2014-02-12 12:49:30 +08:00
James Chen 0e1fb4fa44 Update AUTHORS [ci skip] 2014-02-12 09:22:57 +08:00
James Chen 8360d65f49 Merge pull request #5329 from azmeuk/fedora-glfw 
GLFW include path for Fedora
 2014-02-12 09:21:29 +08:00
Ricardo Quesada 0a2d701e9f Update verts and calls every frame 2014-02-12 08:41:32 +08:00
Ricardo Quesada 1836375468 schemes are no longer shared 2014-02-12 08:26:22 +08:00
Ricardo Quesada 07764d03f9 Uses Droid Sans Console font for FPS and more 
* Uses Droid Sans Console: Size 10
* Don't scale up font even if content scale factor is bigger (not needed for FPS)
* Adds better labels in FPS console
 2014-02-12 06:58:34 +08:00
Éloi Rivard e992723758 GLFW include path for Fedora 2014-02-11 16:35:52 +01:00
chuanweizhang2013 a73d6ea81c delete main.cpp 2014-02-11 18:16:46 +08:00
chuanweizhang2013 d5aee5eb04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into jsruntime 2014-02-11 18:08:14 +08:00
chuanweizhang2013 fcc78f39a1 add mac Simulator 2014-02-11 18:07:20 +08:00
boyu0 ea6edd5417 closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body. 2014-02-11 17:10:27 +08:00
heliclei 60faacab02 remove redundant return 2014-02-11 17:05:10 +08:00
heliclei c39d9f57c8 add return 2014-02-11 17:00:09 +08:00
heliclei f925bb17cf add back prompts 2014-02-11 16:57:30 +08:00
heliclei a0c3cbe054 Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop 2014-02-11 16:50:39 +08:00
heliclei c15fdc3161 Merge pull request #1 from cocos2d/develop 
merge upstream/develop
 2014-02-11 16:41:41 +08:00
heliclei e7679a62b0 fix console prompt 2014-02-11 16:41:12 +08:00
heliclei 4a2fd2b52d fix console prompt 2014-02-11 16:14:49 +08:00
James Chen 4b2e6bbb72 Merge pull request #5323 from CocosRobot/updategeneratedsubmodule_1392100455 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-11 14:37:31 +08:00