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

16184 Commits

Author SHA1 Message Date
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
James Chen 6e56a56f64 Update AUTHORS [ci skip] 2014-02-10 21:54:27 +08:00
James Chen 0c58064bee Merge pull request #5306 from azmeuk/gitignore 
Ignore files generated by cmake
 2014-02-10 21:52:40 +08:00
James Chen f80f9bcd68 Merge pull request #5317 from CocosRobot/updategeneratedsubmodule_1392014528 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-10 17:42:23 +08:00
CocosRobot 12b5fba628 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 06:42:10 +00:00
James Chen e90e0b0c23 Merge pull request #5312 from dumganhar/merge5268 
closed #3716:PhysicsContact should be inherited from EventCustom, it will simplify the logic of emitting collision events
 2014-02-10 14:37:43 +08:00
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
James Chen 6f81e7f304 Merge pull request #5256 from Dhilan007/develop_label 
Label::reduce unnecessary calculation amount.
 2014-02-10 14:08:49 +08:00
James Chen 263464e7b2 Merge pull request #5315 from CocosRobot/updategeneratedsubmodule_1392011921 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-10 14:03:34 +08:00
CocosRobot 4f54b36127 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-10 05:58:44 +00:00
James Chen 9e42285d63 Merge pull request #5314 from dumganhar/develop 
Compilation error fix after merging PR #5311
 2014-02-10 13:53:57 +08:00
James Chen a05cd6fbb2 Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5311 2014-02-10 12:53:08 +08:00
Dhilan007 47e16728cc reduce unnecessary calculation amount. 2014-02-10 12:38:32 +08:00
Dhilan007 6a662a6330 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-02-10 11:47:05 +08:00
Ricardo Quesada a7b853e360 Merge pull request #5311 from ricardoquesada/gl_vertices 
Gl vertices
 2014-02-09 19:41:11 -08:00
Ricardo Quesada 68143d3093 re-add missing assert 2014-02-09 19:39:56 -08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Dhilan007 e12c1f57ac Label::reduce unnecessary calculation amount. 2014-02-10 11:21:54 +08:00
James Chen 3b57f897d9 Merge pull request #5310 from dumganhar/event-disp-typo 
Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners.
 2014-02-10 11:19:45 +08:00
James Chen 9a02568eca Some case sensitivity fixes in EventDispatcher. e.g. xxxlisteners -> xxxListeners. 2014-02-10 11:15:56 +08:00
James Chen a1aa4b9b8a Update CHANGELOG [ci skip] 2014-02-10 11:05:09 +08:00
James Chen db91ec9183 Update AUTHORS [ci skip] 2014-02-10 11:04:23 +08:00
James Chen eda4c9a420 Merge pull request #5302 from Pisces000221/improve-label-chinese 
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
 2014-02-10 11:03:03 +08:00
Ricardo Quesada 1c4321304c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:01:55 -08:00
Dhilan007 a8387a12f0 Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop 2014-02-10 10:09:56 +08:00
James Chen 092784d7c5 Update CHANGELOG [ci skip] 2014-02-10 09:55:54 +08:00
James Chen 9e07846ec6 Update AUTHORS [ci skip] 2014-02-10 09:53:20 +08:00
James Chen 3420e9bd55 Merge pull request #5305 from hbbalfred/develop 
close #2128: remove the redundant check when load a file in ccbreader.
 2014-02-10 09:51:50 +08:00
Ricardo Quesada a1a914faa9 Merge branch 'develop' into fast_tmx 2014-02-08 21:30:47 -08:00
Ricardo Quesada a10e370d69 Merge pull request #5308 from ricardoquesada/console_more_fixes 
Event more improvements in the console
 2014-02-08 21:30:13 -08:00
Ricardo Quesada 337271cc46 Event more improvements in the console 
Much better help system
 2014-02-08 21:29:39 -08:00
Ricardo Quesada 9d5393631c Merge branch 'develop' into fast_tmx 
Conflicts:
	tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
	tests/test-cpp/Classes/VisibleRect.cpp
 2014-02-08 12:49:56 -08:00
Ricardo Quesada 2963af5eb0 Merge pull request #5307 from ricardoquesada/console_improvements 
better Console support
 2014-02-08 12:48:11 -08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 13aa3ad2b5 Adds new commands to Console 
* resolution
* projection
 2014-02-08 12:35:11 -08:00
Éloi Rivard baecd2faa6 Ignore files generated by cmake 2014-02-08 19:56:36 +01:00
Ricardo Quesada c7a999335c Console. Less error prone, easier to use, more documentation 2014-02-08 10:20:12 -08:00
Ricardo Quesada ceba63db8b Merge branch 'develop' into fast_tmx 2014-02-08 09:08:33 -08:00
hbb f5d4dd4afe remove the redundant check 
ccbreader can load file without the owner setting
 2014-02-08 19:12:33 +08:00
hbb 2738fc4cc1 Merge pull request #2 from cocos2d/develop 
update cc2dx/develop
 2014-02-08 19:08:36 +08:00
Pisces000221 7f19e2ad7e Merge pull request #1 from Pisces000221/patch-8 
Will merge this pull request
 2014-02-08 17:19:21 +08:00
Pisces000221 03be459376 Update LabelTestNew.lua 2014-02-08 17:17:35 +08:00
Pisces000221 cef84f05af Add LabelTTFCJKWrappingTest 2014-02-08 17:16:59 +08:00
Pisces000221 49163bb774 Add LabelTTFCJKWrappingTest 2014-02-08 17:15:57 +08:00
Pisces000221 1170943cf8 Add LabelTTFCJKWrappingTest 2014-02-08 17:14:38 +08:00
James Chen af7a591483 Merge pull request #5304 from heliclei/develop 
fix job trigger url
 2014-02-08 16:10:45 +08:00
heliclei 4c6dea3548 fix job trigger url 2014-02-08 16:08:50 +08:00