Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
|
Jason Xu
|
42c374157d
|
CC_CALLBACK_2 not std::bind directly
|
2014-04-25 17:32:21 +08:00 |
|
Jason Xu
|
5cc483276b
|
use new ccHttpRequestCallback.
|
2014-04-25 17:15:57 +08:00 |
|
James Chen
|
ae2027ea53
|
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
|
2014-03-24 17:59:44 +08:00 |
|
James Chen
|
e075b82dfe
|
tab -> 4 spaces, whitespace cleanup.
|
2014-03-24 17:58:35 +08:00 |
|
Chris Hannon
|
ba37c07053
|
[add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code
-update static connect method to match JS API, kept original method but marked deprecated
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2014-03-21 11:45:14 -04:00 |
|
James Chen
|
757425c54b
|
issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.
|
2014-03-03 11:00:30 +08:00 |
|
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
|
James Chen
|
432534d857
|
#include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
|
2014-01-20 17:31:12 +08:00 |
|
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
|
minggo
|
07600bd46b
|
network -> cocos2d::network
|
2014-01-02 16:25:35 +08:00 |
|
James Chen
|
0695e32fff
|
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
|
2013-12-18 15:40:31 +08:00 |
|
minggo
|
fa7c97171b
|
fix some warnings
|
2013-12-06 16:32:06 +08:00 |
|
signmotion
|
0d9cd9784b
|
* Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float').
|
2013-11-23 07:23:06 +02:00 |
|
minggo
|
6fc2be62f5
|
issue #2905: testcpp bild ok on Android
|
2013-10-15 18:00:03 +08:00 |
|
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |