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

16203 Commits

Author SHA1 Message Date
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
James Chen 84146b9434 Merge pull request #5303 from natural-law/develop 
Update the reference of the submodule "plugin".
 2014-02-08 15:40:22 +08:00
zhangbin b5411ff8b1 Update the reference of the submodule "plugin". 2014-02-08 15:36:11 +08:00
Pisces000221 c9e4944321 Fix one character disappears when breaking line 2014-02-08 15:18:18 +08:00
Pisces000221 da2a58ccc9 Improved formatting when using both CJK and ASCII 2014-02-08 15:05:36 +08:00
Pisces000221 7484286f25 Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:59 +08:00
Pisces000221 b5e9a4a00a Rename ischinese_unicode as iscjk_unicode 2014-02-08 14:52:10 +08:00
Ricardo Quesada 61c8bf23b6 optimized draw 2014-02-07 22:19:03 -08:00
James Chen f96bb6fd5e Merge pull request #5292 from azmeuk/typo 
Minor typo in template
 2014-02-08 14:17:16 +08:00
Pisces000221 7aebdd89a5 Added ischinese_unicode function 2014-02-08 14:15:42 +08:00
James Chen b50befa549 Merge pull request #5301 from CocosRobot/updategeneratedsubmodule_1391839742 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-08 14:11:20 +08:00
CocosRobot c775681767 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-08 06:09:04 +00:00
Pisces000221 ae8057b933 Added ischinese_unicode function 2014-02-08 14:07:18 +08:00
James Chen d1a0dd395c Merge pull request #5300 from dumganhar/iss3900-sp-v27 
closed #3900: Upgrades spidermonkey to Firefox v27.
 2014-02-08 14:04:53 +08:00
James Chen 4d60b17a59 Merge pull request #5298 from heliclei/develop 
[jenkins]To add ios build support:fix xcodebuild stackoverflow, add shared build schemes
 2014-02-08 14:04:28 +08:00
James Chen a75004398d issue #3900: Updates cocos2d-console to support spidermonkey v27. 2014-02-08 13:48:38 +08:00
Ricardo Quesada 82700339c0 Adds a way to print the renderer vertices 2014-02-07 19:37:44 -08:00
James Chen e7bc7c10e1 issue #3900: Updates bindings-generator. 2014-02-08 10:54:18 +08:00
James Chen bca9bba8c5 A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE. 2014-02-08 10:41:02 +08:00
James Chen 5163f1f78d issue #3900: Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;) 2014-02-08 10:35:03 +08:00
Ricardo Quesada 08330039fc Merge remote-tracking branch 'cocos2d/develop' into fast_tmx 2014-02-07 18:34:17 -08:00
Ricardo Quesada 78fdabe926 more cleanup in TMX code 2014-02-07 18:33:30 -08:00
Ricardo Quesada 616feadda1 More fixes and "tiles" is an uint32 (GID) 2014-02-07 18:11:17 -08:00
Ricardo Quesada f2836e627b Code is cleaner 2014-02-07 17:33:27 -08:00
James Chen 3ff127cf92 Merge pull request #5296 from samuele3hu/developDynamic 
issue #3907:The project that lua or js template generated crash on the iOS platform
 2014-02-07 21:30:45 +08:00
James Chen bb36f99a08 Merge pull request #5297 from dumganhar/develop 
[Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2.
 2014-02-07 21:29:51 +08:00
heliclei c5542d782f fix build path 2014-02-07 21:25:34 +08:00
heliclei 78419adc81 xctool fails to init, use xcodebuild instead 2014-02-07 21:24:48 +08:00
James Chen e0e37424f0 [Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2. 2014-02-07 21:11:30 +08:00
samuele3hu 49fbfcbbe8 issue #3907:The project that lua or js template generated crash on the iOS platform 2014-02-07 18:11:26 +08:00
James Chen 05c79b54ac issue #3900: Typedef jschar to wchar_t to fix linking errors on windows. 2014-02-07 17:30:02 +08:00
James Chen 6cc22ac0b0 issue #3900: Fixes wrong include. 2014-02-07 17:26:28 +08:00
James Chen f0418a17d3 issue #3900: Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows. 2014-02-07 17:04:44 +08:00