heliclei
fe1bc368ec
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:46:17 +08:00
heliclei
4657b28c2d
refactor upload:encode file with base64, detach upload from main loop
2014-03-18 00:42:36 +08:00
chuanweizhang2013
295bf7f7f2
rename variable
2014-03-17 11:06:50 +08:00
chuanweizhang2013
0a9ec91d6c
init Console variable
2014-03-15 18:13:29 +08:00
James Chen
c033591e6a
[win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte.
2014-03-15 01:05:04 +08:00
heliclei
600c661acb
remove script support
2014-03-07 15:12:46 +08:00
heliclei
728d5f34de
CCConsole: add script support
2014-03-05 00:07:30 +08:00
heliclei
fe574616f3
fix console loop
2014-02-26 23:51:45 +08:00
heliclei
31a13a6262
remove unused function
2014-02-26 23:46:07 +08:00
heliclei
9d6be63171
CCConsole:support file upload via telnet console
2014-02-26 23:41:47 +08:00
heliclei
1dc6d1ad21
merge begin & end with one 'tap' command
2014-02-25 18:17:43 +08:00
heliclei
6848e6dde0
use atof instead of stof to fix compile error on android
2014-02-25 16:31:21 +08:00
heliclei
7f3aab2bfd
fix touchEnd lambda
2014-02-25 15:59:43 +08:00
heliclei
f1376e7caf
fix help typo
2014-02-25 15:55:01 +08:00
heliclei
a7d636f7bf
support touch swipe directive
2014-02-25 15:52:37 +08:00
heliclei
e09a72f26d
add touch swipe
2014-02-25 11:47:53 +08:00
heliclei
786aae2199
add touch move support
2014-02-25 11:04:59 +08:00
heliclei
2f4e96527b
remove unused declare
2014-02-24 17:50:40 +08:00
heliclei
9777c6e2a5
use closesocket insteadof close on windows
2014-02-24 16:51:08 +08:00
heliclei
5956c3a380
fix compile on windows
2014-02-24 15:05:20 +08:00
heliclei
4a2633933e
remove early cleanup
2014-02-24 14:28:19 +08:00
heliclei
02230add0c
use closeSocket() on windows
2014-02-24 14:24:14 +08:00
heliclei
be45047b6b
use send/recv to replace write/read
2014-02-24 12:01:04 +08:00
heliclei
92571ebe04
merge upstream/develop
2014-02-22 22:58:24 +08:00
heliclei
5376b6333e
fix CCConsole crashed on windows, windows use send/recv(winsock) instead of read/write in unix to do socket i/o, create socketWrite/socketRead to wrap socket i/o function
2014-02-22 22:37:12 +08:00
heliclei
d5bef1ca35
merge pause, resume, stopanimation, startanimation into director command
2014-02-20 11:15:29 +08:00
heliclei
dd9f072429
add more commands: resume, pause, stopanimation and startanimation
2014-02-19 11:19:29 +08:00
heliclei
8bad243903
remove redudant prompt
2014-02-18 12:00:23 +08:00
heliclei
007d2c507c
use local variable to reduce coupling
2014-02-18 10:32:32 +08:00
heliclei
7283e9fdc1
fix console hang
2014-02-17 23:29:09 +08:00
heliclei
35ae3702f4
fix console readline
2014-02-17 16:49:57 +08:00
heliclei
daf9c3f868
delete un-used code
2014-02-14 14:57:12 +08:00
heliclei
2ec75919c0
use stl map to oprate command
2014-02-14 14:54:26 +08:00
heliclei
05e5af7f5f
use realloc to avoid memory leaks
2014-02-13 17:15:47 +08:00
heliclei
391768007b
do not allow adding same commands
2014-02-13 14:07:12 +08:00
heliclei
9befe56a7e
update unit test
2014-02-13 11:10:23 +08:00
heliclei
7c11657242
simplify add custom command
2014-02-13 10:40:57 +08:00
heliclei
60faacab02
remove redundant return
2014-02-11 17:05:10 +08:00
heliclei
c39d9f57c8
add return
2014-02-11 17:00:09 +08:00
heliclei
f925bb17cf
add back prompts
2014-02-11 16:57:30 +08:00
heliclei
a0c3cbe054
Merge branch 'develop' of https://github.com/heliclei/cocos2d-x into develop
2014-02-11 16:50:39 +08:00
heliclei
e7679a62b0
fix console prompt
2014-02-11 16:41:12 +08:00
heliclei
4a2fd2b52d
fix console prompt
2014-02-11 16:14:49 +08:00
heliclei
30942e9fba
set prompt for async console commands
2014-02-11 10:48:18 +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
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
822f141748
log() in win32 doesn't add extra \n
2014-02-04 08:59:56 -08:00
Maks
33a12a594e
fix timeout getting status of sockets in Console::loop()
...
'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
2014-02-03 00:24:58 +02:00
Ricardo Quesada
cb9761125b
Renderer: When not using VAOs, call...
...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -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
zhangbin
60009a818e
closed #3712 , Add relative path for CCFileUtils.h in CCConsole.cpp.
2014-01-15 12:05:17 +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
Dhilan007
92d345156b
un-define clash with the existing macro definition in platform/win32/CCStdC.h
2014-01-14 14:20:22 +08:00
Dhilan007
a1d8e8bdb1
fix compiling error cause by macro define on window platform.
2014-01-14 12:28:24 +08: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
WuHuan
4dbb0ee1e8
mingw console
2014-01-09 17:48:37 +08:00
WuHuan
668c4b83ef
Merge pull request #3 from cocos2d/develop
...
update
2014-01-08 00:44:40 -08:00
walzer
d4c1aa92d5
add copyrights for 2014, in folders other then 2d.
2014-01-07 11:47:11 +08:00
WuHuan
e972c97dcf
support mingw
2014-01-04 14:40:22 +08:00
Ricardo Quesada
a8c317bd83
getDescription() works as expected
...
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
2013-12-12 14:30:22 -08:00
James Chen
be9bb6998b
issue #2790 : Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes.
...
Also renames Map::remove to Map::erase.
2013-12-11 18:08:06 +08:00
James Chen
6aa2e5b257
Updates comments that vs2012 doesn’t support initializer list.
2013-12-05 16:49:05 +08:00
James Chen
b4b50f3491
Compilation fix for windows.
2013-12-05 16:33:13 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
c617eee505
Uses the new Vector<>. Code is more robust!
2013-12-04 22:07:23 -08:00
Ricardo Quesada
73321199b9
Console: commands receives the char*
...
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
2013-12-04 21:51:08 -08:00
Ricardo Quesada
e0bf32d881
dprintf is not defined on Android
...
using my own dprintf
2013-12-04 19:33:50 -08:00
Ricardo Quesada
15321a58df
fixes compiler errors on Linux
2013-12-04 18:28:09 -08:00
Ricardo Quesada
b52d535a42
fixes indentation issues
...
and some compilations issues on Linux
2013-12-04 18:19:51 -08:00
Ricardo Quesada
f42aef0af8
Moves CCConsole.* to base/
2013-12-04 18:09:23 -08:00