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 |
|
James Chen
|
e59374de81
|
issue #4729: Move CC_INVALID_INDEX from ccCArray.h to ccTypes.h,
probably there is a better place to define this variable, but let's just
choose ccTypes.h now.
|
2014-04-10 00:36:42 +08:00 |
|
andyque
|
57d8f155df
|
issue #4401. resolve conflicts
|
2014-03-26 14:54:50 +08:00 |
|
Dale Stammen
|
77ab59ebab
|
#pragma mark for ios and mac only
|
2014-03-22 05:52:45 -07:00 |
|
James Chen
|
5e6130c92c
|
issue #4058: Get rid of Object ,rename it to Ref.
|
2014-02-20 10:53:49 +08:00 |
|
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
|
boyu0
|
f16384a105
|
fix more code with hungarian notation
|
2013-12-18 18:51:36 +08:00 |
|
minggo
|
ab23b47043
|
use ssize_t for capacity and index in containers
|
2013-12-12 14:48:26 +08:00 |
|
minggo
|
b67d567a79
|
replace long with int or ssize_t
|
2013-12-05 17:22:22 +08:00 |
|
Ricardo Quesada
|
ba7ed6e578
|
Fixes some compiler warnings
The warnings are related to:
* 64-to-32-bit conversion
* shadow variables
|
2013-11-04 16:31:36 -08:00 |
|
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
|
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |