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

794 Commits

Author SHA1 Message Date
Hanju Kim b45abf3f2d Bug fixes for new label 2014-01-13 21:14:50 +09:00
Hanju Kim 4bbcd91bdf Fix for compiling error for windows 2014-01-13 20:51:56 +09:00
Ricardo Quesada f4a99d0627 Removes DirectorDelegate 2014-01-10 20:26:15 -08:00
Ricardo Quesada 9386866d56 cocos2d::log() moved to CCConsole 
Unified console code since it is 90% similar to all platforms
 2014-01-10 19:04:07 -08:00
Ricardo Quesada c68ad76bfe don't send "unknown command". 
... if the command is an empty command
 2014-01-10 18:11:35 -08:00
Ricardo Quesada 2316e4d55f Debug messages are forward to the console 2014-01-10 17:58:54 -08:00
Ricardo Quesada 2a6b9fe08e Console is a property of Director. 
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
 2014-01-10 17:11:14 -08:00
minggo a013565420 Merge pull request #5023 from dabingnn/develop_layerColorBugForShaderChange 
fix layerColor bug for shader change
 2014-01-10 06:26:49 -08:00
James Chen 0088399d94 Merge pull request #5016 from akof1314/develop 
Support MinGW with CMake for TestCpp
 2014-01-09 23:13:19 -08:00
WuHuan 16367b7594 solve conflicted with math.h isnan 2014-01-10 14:20:00 +08:00
Huabing.Xu a1629a09e8 fix layerColor bug for shader change 2014-01-10 10:03:47 +08:00
Ricardo Quesada 1dc169b19f Camera is working again 
Projection is passed in the shader.
Since P is in the shader, QuadCommand uses `Vec3Transform` instead of `Vec3TransformCoord` since it is faster.
 2014-01-09 14:26:22 -08:00
WuHuan 2f4b094598 Merge pull request #4 from cocos2d/develop 
update
 2014-01-09 02:56:21 -08:00
James Chen 2e4c76a5d7 closed #3644: Keyboard pressed events are being repeatedly fired before keyboard is released. 2014-01-09 18:34:35 +08:00
James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode 
Conflicts:
	cocos/2d/CCDrawNode.h
 2014-01-09 17:03:08 +08:00
James Chen 3bb1fae660 Merge pull request #5010 from boyu0/fix_texture2dtest_crash_bug 
closed #3638: Fix Image crashes when load tga file.
 2014-01-09 00:40:09 -08:00
boyu0 e34ef0d38f change initialization _data from 0 to nullptr. 2014-01-09 16:33:31 +08:00
boyu0 e063755596 fix Image crashes in mac when load tag file 2014-01-09 15:26:05 +08:00
walzer 1ad14340bf issue #3627, remove Hungarian Notation in LabelAtlas 2014-01-09 14:26:34 +08:00
walzer 8da4879560 issue #3627, remove lua/js doxygen mark from LabelAtals constructor & destructor. 2014-01-09 14:21:43 +08:00
walzer d15874fdf7 fixed #3627, an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected. 2014-01-09 14:16:26 +08:00
walzer 2d8fcb2c00 issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module 2014-01-09 12:40:51 +08:00
Dhilan007 fe7d5cbdfb update If Construct 2014-01-09 09:46:17 +08:00
Dhilan007 d18da42695 fix addImageAsync bad judgment of generate image for the first ImageFile. 2014-01-08 23:42:54 +08:00
WuHuan 1cd68accc1 Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop 2014-01-08 17:03:44 +08:00
WuHuan 954ee61022 testcpp mingw 2014-01-08 16:58:36 +08:00
WuHuan 668c4b83ef Merge pull request #3 from cocos2d/develop 
update
 2014-01-08 00:44:40 -08:00
James Chen eb8f621ab0 closed #3597: Uses !xxx.empty() instead of xxx.size() > 0. 2014-01-08 10:47:27 +08:00
James Chen 685b80796b Merge commit 'refs/pull/4846/head' of git://github.com/cocos2d/cocos2d-x into iss3597-particle-plist 2014-01-08 10:36:51 +08:00
minggo ac8a7b4ce1 Merge pull request #4983 from dabingnn/develop_layerColorBug 
fix layerColor occlude sprite bug on android
 2014-01-07 06:25:59 -08:00
Huabing.Xu b1d9d5e55e fix layerColor occlude sprite bug on android 2014-01-07 22:08:00 +08:00
minggo feb4ac1cdb Merge pull request #4959 from minggo/actionprogress-fade-tint 
ActionProgress has fade and tint effect
 2014-01-07 00:32:43 -08:00
minggo 1275d03c77 add override 2014-01-07 16:30:12 +08:00
minggo 6bb4f9822a ActionProgress has fade and tint effect 2014-01-07 16:23:58 +08:00
James Chen 49ca35fc3d Merge pull request #4956 from dumganhar/move-temp-obj 
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build'  folder.
 2014-01-06 23:58:42 -08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
Ricardo Quesada aa2168f66f RenderQuad with bigger size 
It uses 18 bits for texture id
and 10 bits for shader id
This is a temporal fix
 2014-01-06 23:41:01 -08:00
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
minggo 49d314363f Merge pull request #4945 from dabingnn/develop_label_shaderBug 
fix label fnt bug for wrong shader
 2014-01-06 19:44:06 -08:00
Huabing.Xu 6c6da4cf77 fix label fnt bug for wrong shader 2014-01-07 11:39:55 +08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
minggo 721181632b Merge pull request #4930 from Dhilan007/develop_crash 
fix error for load spriteFrames from plist in CCAnimationCache class.
 2014-01-06 18:57:47 -08:00
Dhilan007 aec4045797 fix error for load spriteFrames from plist in CCAnimationCache class. 2014-01-06 20:23:45 +08:00
James Chen 75804ac8a2 Warning fix in ccUTF8.cpp/h 2014-01-06 20:04:09 +08:00
James Chen dd0e157c74 Warning fix in CCTextFieldTTF.cpp. 2014-01-06 20:01:28 +08:00
minggo 9b44e80cf2 Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug 
init shader on construction instead of draw in class CCSpriteBatchNode
 2014-01-06 00:11:59 -08:00
minggo e4bec7d1ef Merge pull request #4902 from Dhilan007/develop_crash 
fix TextInput not show IME on android.
 2014-01-05 19:50:19 -08:00
Dhilan007 5b317196c8 fix TextInput not show IME on android. 2014-01-06 11:45:18 +08:00
Huabing.Xu 381be48c56 init shader on construction instead of draw in class CCSpriteBatchNode 2014-01-06 11:26:00 +08:00
James Chen d74d21a6f0 Merge pull request #4884 from daltomi/debug 
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
 2014-01-05 19:08:37 -08:00