minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
James Chen
cdcfda1f2c
issue #2087 : [dispatcher] Removing unused codes.
2013-09-17 17:00:37 +08:00
boyu0
c726765b4a
closed #2745 : fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke()
2013-09-16 17:13:44 +08:00
minggo
2a315e53b8
Merge pull request #3402 from j4m3z0r/develop-emscripten
...
Port my variant of font-rendering over to dev branch -- adds correct ali...
2013-09-15 22:52:33 -07:00
James Chen
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
samuele3hu
d8bd65b2e8
issue #2784:Add class constructor js-binding document
2013-09-13 16:46:31 +08:00
samuele3hu
5ddd9ae23c
issue #2784:Delete class destuctor js-binding and lua-binding document
2013-09-13 13:52:42 +08:00
James Chen
1702cbd7b2
[dispatcher] Other platforms update.
2013-09-12 20:56:57 +08:00
James Chen
da1101beeb
[Dispatcher] New event dispatcher, first commit.
2013-09-11 22:09:34 +08:00
Ricardo Quesada
028deae846
Adds const in FileUtils
...
`const` was missing in some getters
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:52:55 -07:00
James Chen
ca78d2d129
closed #2650 : Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11.
2013-08-22 18:16:50 +08:00
James Gregory
ff6c5f8adf
Fix comment broken in last commit.
2013-08-19 13:45:32 -07:00
James Gregory
0287f273e0
Port my variant of font-rendering over to dev branch -- adds correct alignment behavior.
2013-08-08 18:39:42 -07:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
Éloi Rivard
95b826d82a
Fixed a bug in emscripten file utils.
2013-07-26 14:19:47 +02:00
Éloi Rivard
3ffc026c6c
Added some guards in file utils.
2013-07-26 14:19:20 +02:00
James Chen
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +08:00
James Chen
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
James Chen
35dec5d71e
More CCLog --> log.
2013-07-24 10:46:13 +08:00
James Chen
7bc6abfac7
Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it.
2013-07-24 10:14:42 +08:00
boyu0
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
James Chen
3bdf6b9c69
issue #2397 : Mark Application::sharedApplication as deprecated function.
2013-07-15 16:37:38 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
James Chen
d1527f39f5
issue #2397 : FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp
2013-07-12 15:00:10 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
James Chen
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
James Chen
62902ad212
Fixing compilation errors for Emscripten port.
2013-06-24 10:21:36 +08:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
minggo
ccbd0a831d
issue #2304:use function to simplify acceremeter call back
2013-06-19 16:10:53 +08:00
James Chen
8f33bf7e05
issue #2301 : _pTextures --> _textures.
2013-06-19 13:40:21 +08:00
James Chen
fa6a0d4051
issue #2301 : m_pTextures --> _pTextures.
2013-06-19 13:15:03 +08:00
James Chen
1eadcd8b38
fixed #2301 : Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate
...
Conflicts:
cocos2dx/proj.emscripten/cocos2dx.mk
2013-06-19 13:03:51 +08:00
James Gregory
5095b03f9c
Get async image loading building with -O2 and asm.js
2013-06-17 17:10:41 -07:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Gregory
872be8e964
Initial commit of browser accelerated async image-loading code for Emscripten.
2013-06-12 14:46:32 -07:00
James Gregory
8b4f5b5853
Fix calculation of offsets in font rendering so that we don't scribble all over memory!
2013-05-29 21:25:32 -07:00
James Gregory
da7113a04f
Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them.
2013-05-20 20:09:56 -07:00
James Gregory
7cca63130c
Pre-multiply text when rendered by Emscripten's SDL implementation (since HTML5 canvas is non-pre-multiplied).
2013-05-17 17:10:51 -07:00
James Gregory
a1ff189854
Query the GL canvas for its width and height and use that rather than hardcoding it. Default the frame size to the whole canvas, and update the samples to use iPad resolution (1024x768).
2013-05-17 12:39:18 -07:00
James Gregory
bdbab7f5cf
TTF rendering via SDL now seems to basically work. Not perfect yet, but seems to be about 3X faster on Chrome.
2013-05-15 20:21:30 -07:00
James Gregory
82f1a8e8ff
Re-enable mouse-handling.
2013-05-15 20:21:02 -07:00
James Gregory
ab2d94c040
First pass at using SDL to render fonts instead of FreeType.
2013-05-14 21:38:56 -07:00
James Gregory
25bded7faf
Now validates as asm.js: Disable HttpClient, pthread_cond_signal and eglReleaseThread in Emscripten.
2013-05-07 17:25:39 -07:00