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
|
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 |
Ricardo Quesada
|
d0dbf34319
|
removes "include "cocos2d.h" from cocos2d files
|
2014-01-16 21:35:58 -08:00 |
walzer
|
d4c1aa92d5
|
add copyrights for 2014, in folders other then 2d.
|
2014-01-07 11:47:11 +08:00 |
chengstory
|
faaf6d3f2b
|
fixed #3457 fixes some bug.
|
2013-12-27 17:21:13 +08:00 |
Liam
|
0cdf2d15fe
|
merge from develop branch
|
2013-12-27 10:50:50 +08:00 |
Liam
|
2a6c24f8bf
|
update coco action with correct coding rule
|
2013-12-27 10:43:49 +08:00 |
chengstory
|
774e3d8536
|
issue #3457
1. replace UIAction NULL to nullptr.
2. modify class variable name.
|
2013-12-26 23:40:50 +08:00 |
Liam
|
bc54707893
|
modify coco action with new coding rule
|
2013-12-26 16:29:59 +08:00 |
yinkaile
|
5eb961b165
|
fixed warning
|
2013-12-25 19:46:09 +08:00 |
zhangcheng
|
2c6f95ecea
|
issue #3456 replace jsoncpp to rapidjson.
|
2013-12-24 20:33:55 +08:00 |
Ricardo Quesada
|
10eafeaeed
|
fixes warning compiler
|
2013-12-17 11:16:30 -08:00 |
Ricardo Quesada
|
5c74c938ee
|
Merge branch 'develop' into constructors_are_protected
Conflicts:
cocos/2d/CCLayer.h
|
2013-11-19 13:13:57 -08:00 |
Ricardo Quesada
|
c943702bc8
|
Merge branch 'develop' into constructors_are_protected
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
|
2013-11-18 11:07:15 -08:00 |
Liam
|
c7932b6181
|
fixed ui anmation crash when stop animation
|
2013-11-19 00:57:22 +08:00 |
Liam
|
66443255a6
|
Shielded unusefull log
|
2013-11-18 14:20:50 +08:00 |
minggo
|
db804891ed
|
fix some warnings
|
2013-11-16 20:02:49 +08:00 |
Ricardo Quesada
|
7c2ed2743c
|
Menu + MenuItem
`Menu` and `MenuItem` have protected constructors
|
2013-11-15 13:14:12 -08:00 |
Liam
|
2aaa21255f
|
fixed cocostudio action can not looping
|
2013-11-08 14:34:24 +08:00 |
minggo
|
8f7a489a4d
|
issue #2905:make cocostudio and gui flat
|
2013-10-16 16:48:39 +08:00 |