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

8112 Commits

Author SHA1 Message Date
James Chen 9ea35977db new tile map tests 2013-04-01 17:39:26 +08:00
James Chen 4a1eab5101 CCLOG -> cclog 2013-04-01 17:39:26 +08:00
James Chen 205123f661 Adding TileMapTest.lua 2013-04-01 17:39:26 +08:00
James Chen 5fd2acca47 Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding. 2013-04-01 17:39:26 +08:00
James Chen d401fb3771 labeltest.lua finish. 2013-04-01 17:39:25 +08:00
James Chen 8854fc046f BitmapFontMultiLineAlignment is ok. 2013-04-01 17:39:25 +08:00
James Chen 5a623b9b07 Some tests in LabelTest.lua are ok. 2013-04-01 17:39:25 +08:00
James Chen a388f401bf Updating LabelTest.lua. 2013-04-01 17:39:25 +08:00
James Chen 65720983d8 Update AUTHORS 2013-04-01 13:52:42 +08:00
James Chen 42aafa7519 Merge pull request #2285 from DarraghCoy/ccuserdefault_android_fix 
Fix CCUserDefault.cpp compiling on Android.
 2013-03-31 22:45:18 -07:00
Darragh Coy 7f565bb2fa Fix CCUserDefault.cpp compiling on Android. 
CCUserDefault.cpp shouldn't compile on Android.
 2013-03-31 22:24:10 -07:00
waiter c9e36438a8 Add ActionRemoveSelf in TestCpp/ActionTest 
Add ActionRemoveSelf in TestCpp/ActionTest
 2013-04-01 10:18:26 +08:00
Michael Chinen 227d2cf60b Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator 2013-03-31 20:47:43 +09:00
Darragh Coy d0f8aaad9e Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue 
When calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' and 'CCFileUtils::createCCArrayWithContentsOfFile' on iOS/OSX these functions call upon 'CCFileUtils::fullPathForFilename' to resolve the path given into a full path which can be used with system file IO functions. This matches the convention found throughout the cocos2dx library and is expected behaviour. However, on Android and other platforms it appears calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' or 'CCFileUtils:: createCCArrayWithContentsOfFile' does not do the same resolution using 'CCFileUtils::fullPathForFilename' - resulting in file paths which are correctly specified (and which worked on iOS/OSX) to fail to load on these platforms.

Fix this issue by performing a lookup/resolve of the file path using 'CCFileUtils::fullPathForFilename' before doing the low level loading work itself. This brings the behaviour of other platforms in line with iOS and OSX.
 2013-03-29 22:51:25 -07:00
Andre Rudlaff bcab80a0f1 Added TestCase for crash in CCScheduler 
The code seems to look wrong (and it sure is) however in real-world
applications it might not be that eays to tell who has ownership of the object,
especially if weak references are involved.
 2013-03-29 14:48:35 +01:00
sjchao cd3a2be720 change comment type 2013-03-29 17:21:29 +08:00
sjchao 4690a45f3e change a method name 
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
 2013-03-29 17:19:47 +08:00
James Chen 8d5ff2b911 Update AUTHORS 2013-03-29 17:16:03 +08:00
James Chen 869f30ddfa Merge pull request #2280 from CocosRobot/updategeneratedsubmodule_1364547743 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-29 02:14:02 -07:00
CocosRobot 9f50cb71e2 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 17:02:38 +08:00
James Chen c50743b0ab Merge pull request #2251 from tiantian20007/master 
fixed #1937: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
 2013-03-29 02:00:17 -07:00
Éloi Rivard 2664c5e4b9 Makefile 2013-03-29 09:41:15 +01:00
Éloi Rivard 64d9b73f39 Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal 2013-03-29 09:40:41 +01:00
Éloi Rivard 2cc3674bb6 Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal 2013-03-29 09:40:01 +01:00
Éloi Rivard ddc9aa1cc6 Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal 2013-03-29 09:38:25 +01:00
Éloi Rivard 2fca3b618f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal 2013-03-29 09:37:32 +01:00
Éloi Rivard 9e9f75cd34 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal 2013-03-29 09:33:22 +01:00
Éloi Rivard b9ec3ead65 * Fixed CocosDenshionTestBug 2013-03-29 09:32:50 +01:00
tianTian 053efa0537 m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default. 2013-03-29 16:19:34 +08:00
sjchao f1f31deb98 Fix the display bug when a scrollView nested in another scrollView 2013-03-29 16:05:28 +08:00
sjchao 18c43e29b2 change method name from getIsScissorEnable() to isScissorEnable() 2013-03-29 15:32:30 +08:00
James Chen 6db4358584 Merge pull request #2278 from CocosRobot/updategeneratedsubmodule_1364529763 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-28 21:05:13 -07:00
CocosRobot 7b37a9aaef cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-29 12:02:51 +08:00
James Chen 8380eec235 Update AUTHORS 2013-03-29 11:59:21 +08:00
James Chen d052f6a752 Merge pull request #2275 from dumganhar/rohankuruvilla-ccbreader 
fixed #1936: Merging Pull Request #2273: Adding OpenGL Bindings to Javascript.
 2013-03-28 20:58:09 -07:00
James Chen 92d132ae19 Updating Android.mk to add OpenGL jsb support. 2013-03-29 11:43:25 +08:00
James Chen fd1b056d6a define JSB_INCLUDE_OPENGL in js_bindings_config.h 2013-03-29 11:41:32 +08:00
James Chen b7a86c601a fixing compilation errors for TestJavascript on windows. 2013-03-29 11:16:14 +08:00
chao 253ebe49e4 add getIsScissorEnable() and getScissorRect() for CCEGLViewProtocal 2013-03-29 01:28:26 +08:00
Marcel Bloemendaal 6d6a0f23eb Added support for secureTextEntry (passwords) 
Added a secureTextEntry property. Enabling this property causes the
TextField to display the entered text as bullets.
 2013-03-28 15:08:33 +01:00
Éloi Rivard 36544ecced Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal 
Conflicts:
	CocosDenshion/linux/SimpleAudioEngineOpenAL.cpp
	CocosDenshion/proj.linux/Makefile
 2013-03-28 12:11:34 +01:00
Éloi Rivard 8c013fe619 * Basic Linux OpenAL support. 2013-03-28 12:07:09 +01:00
Éloi Rivard 6922d7169f * Basic Linux OpenAL support. 2013-03-28 11:53:20 +01:00
James Chen 374024cefd Updating JS Test. OpenGLTest works ok now. 2013-03-28 16:58:36 +08:00
James Chen 54edf8cafd Don't require 'jsb_opengl_constants.js' in 'jsb_opengl.js'. It will break js obscure 2013-03-28 16:58:02 +08:00
James Chen 4220fd4ca5 fixed #1936: Updating project configuration for TestJavascript. 2013-03-28 16:55:23 +08:00
James Chen 201dc74ecb fixed #1936: Updating obfuscate.xml. 2013-03-28 16:54:49 +08:00
James Chen b6556bd41f fixed #1936: Updating the obfuscated file, game.js in TestJavascript. 2013-03-28 16:54:18 +08:00
James Chen 771ffb4368 fixer #1936: Updating "obfuscate_exclude_cocos2d.js". 2013-03-28 16:53:35 +08:00
James Chen 65bcc6035e Fixing a type: "FiniteTimeAction" --> "GLNode". 2013-03-28 16:51:11 +08:00