Ricardo Quesada
6a194225b3
Merge pull request #5074 from luisparravicini/issue-3720
...
fixes #3720
2014-01-15 15:31:43 -08:00
Luis Parravicini
21c4b2c893
fixes #3720
2014-01-15 19:44:57 -03:00
Ricardo Quesada
f8dc8f0b38
Renderer performance fixes
...
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
2014-01-15 14:35:26 -08:00
Ricardo Quesada
567630fa47
Merge pull request #5073 from ricardoquesada/console_log_fixes
...
Console::log(format, va_args) is private
2014-01-15 11:19:17 -08:00
Ricardo Quesada
4278f024b8
Console::log(format, va_args) is private
...
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
Dhilan007
68eddf3cd7
fix compiling error
2014-01-15 17:29:07 +08:00
zhangbin
536eaca24d
closed #3714 , Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.
2014-01-15 17:27:53 +08:00
Dhilan007
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
zhangbin
d7adbf2269
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-15 16:38:01 +08:00
zhangbin
04d8c7514c
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 16:35:08 +08:00
James Chen
9a0808371f
Merge pull request #5069 from natural-law/develop
...
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-14 22:32:44 -08:00
hbb
8fac676a82
add check data valid in getStringFromFile
...
so far no check would be crashed when getData faild.
maybe return an empty string is better.
2014-01-15 12:39:56 +08:00
hbb
e5aaed49cf
Merge pull request #1 from cocos2d/develop
...
update cc2dx/develop
2014-01-14 20:33:40 -08:00
zhangbin
60009a818e
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-15 12:05:17 +08:00
Ricardo Quesada
226054e810
Merge pull request #5067 from ricardoquesada/compile_error_fix
...
ooops
2014-01-14 18:55:34 -08:00
Ricardo Quesada
f0537f17da
ooops
2014-01-14 18:55:14 -08:00
James Chen
f1672ad120
Merge pull request #5066 from CocosRobot/updategeneratedsubmodule_1389753556
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-14 18:51:16 -08:00
CocosRobot
3b208337fe
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 02:39:20 +00:00
Ricardo Quesada
cc2adad9ab
Merge pull request #5065 from ricardoquesada/develop
...
Ignore getFullPathCache() in FileUtils
2014-01-14 18:31:55 -08:00
Ricardo Quesada
b3f306e742
Ignore getFullPathCache() in FileUtils
2014-01-14 18:30:51 -08:00
Ricardo Quesada
71fccd5c78
Merge pull request #5064 from CocosRobot/updategeneratedsubmodule_1389749831
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-14 17:40:48 -08:00
CocosRobot
82797d8434
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 01:37:15 +00:00
Ricardo Quesada
2efeb32352
Merge pull request #5063 from ricardoquesada/performance_test_fixes
...
Performance Test fixes
2014-01-14 17:24:49 -08:00
Ricardo Quesada
c267c479db
Performance Test fixes
...
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Ricardo Quesada
8554eaa46c
Merge pull request #5062 from darkdukey/fixVBOFull
...
Fix vbo full
2014-01-14 17:13:04 -08:00
Nite Luo
fd04e17808
add a new line
2014-01-14 17:11:32 -08:00
Nite Luo
edc7547f70
add test instructions
2014-01-14 17:06:22 -08:00
Nite Luo
5f661babd2
Add VBO full test
2014-01-14 17:03:54 -08:00
Nite Luo
a18788ff0a
Fix artifects when VBO is full
2014-01-14 16:45:40 -08:00
James Chen
428afae8e9
Update CHANGELOG [ci skip]
2014-01-14 21:52:04 +08:00
James Chen
d306d5fe58
Update AUTHORS [ci skip]
2014-01-14 21:51:13 +08:00
James Chen
b9dfad3df3
Merge pull request #5039 from martell/win64
...
closed #3700 : Added x64 support for Windows - CCExtensions
2014-01-14 05:49:42 -08:00
James Chen
cd1c408e6b
Merge pull request #5054 from dumganhar/iss3698-retina-mac
...
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-13 23:02:49 -08:00
James Chen
11d290ab13
Update AUTHORS [ci skip]
2014-01-14 14:54:19 +08:00
James Chen
815cea3d7b
Merge pull request #5044 from Pisces000221/patch-1
...
Corrected a few mistakes in project-creator README
2014-01-13 22:52:34 -08:00
James Chen
8993289f07
Merge pull request #5053 from Dhilan007/develop_crash
...
fix compiling error cause by clash with the existing macro definition on window platform.
2014-01-13 22:45:49 -08:00
James Chen
7e1fd18f76
FLT_MIN —> FTL_EPSILON.
2014-01-14 14:38:34 +08:00
Dhilan007
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
James Chen
83a42dc760
closed #3698 : Wrong display when dragging window through retina and non-retina screen.
2014-01-14 13:59:00 +08:00
Dhilan007
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08:00
Ricardo Quesada
38b8299ad2
Merge pull request #5052 from CocosRobot/updategeneratedsubmodule_1389654457
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-13 15:34:01 -08:00
CocosRobot
c49aa1f125
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-13 23:07:44 +00:00
Ricardo Quesada
1bd4f75fa3
Merge pull request #5051 from ricardoquesada/copyright
...
Adds missing copyright headers in some files
2014-01-13 14:48:45 -08:00
Ricardo Quesada
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
Ricardo Quesada
a94a68771c
Merge pull request #5049 from ricardoquesada/node_camera_fixes
...
Camera and Node fixes
2014-01-13 12:54:33 -08:00
Ricardo Quesada
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
Ricardo Quesada
be39eee5ea
Merge pull request #5048 from darkdukey/improveProjectCreator
...
Improve project creator
2014-01-13 12:00:24 -08:00
Nite Luo
37522c61c3
Make the ui look a bit better
2014-01-13 11:54:33 -08:00
Nite Luo
2e127f819b
Add Polish the labels for project creator ui
2014-01-13 11:37:44 -08:00
Dhilan007
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00