Ricardo Quesada
|
81c2d92355
|
yeah... love in includes
<3
|
2014-04-26 10:35:57 -07:00 |
|
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 |
|
Huabing.Xu
|
68e058b12d
|
IOS/Mac OK: remove kazMath
Make code compatible with old tests
|
2014-04-21 17:37:52 +08:00 |
|
Huabing.Xu
|
63b52dd287
|
replace Point with Vector2 in cocos folder cpp file
|
2014-04-15 18:13:57 +08:00 |
|
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
|
Huabing.Xu
|
5303f50904
|
Migrate to Vector2 in DrawPrimitive.h
|
2014-04-15 17:29:23 +08:00 |
|
Huabing.Xu
|
1670e07300
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-04-11 11:18:13 +08:00 |
|
James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
|
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
|
James Chen
|
a240c7b240
|
issue #4729: Moved CCNotificationCenter.h/.cpp to deprecated folder.
|
2014-04-10 00:36:42 +08:00 |
|
James Chen
|
5b296a62e9
|
issue #4729: Moved deprecated classes to 'cocos/deprecated' folder
|
2014-04-10 00:36:41 +08:00 |