Commit Graph

29 Commits

Author SHA1 Message Date
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 e2a24dec84 replace Point with Vector2 2014-04-15 18:08:29 +08:00
James Chen 5e6130c92c issue : Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
James Chen f5ae2bbacc Merge pull request from boyu0/iss3401_physical_lua_binding
issue : physical lua binding
2014-01-06 23:48:47 -08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
boyu0 eaa3041a97 issue : physical lua banding script, add testlua->physics test 2014-01-06 22:19:40 +08:00
boyu0 0a06d93328 issue : physical lua banding script and auto script 2014-01-02 11:45:11 +08:00
walzer c5e95618d9 fixed , make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment 2013-12-26 23:55:05 +08:00
boyu0 2dbb2d496f issue : add and change some physics API, and add more documents 2013-12-13 17:36:58 +08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
boyu0 98779b0a9f issue : move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
boyu0 99d904363a issue : delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
boyu0 a56dedb41a issue : add class PhysicsDebugDraw 2013-11-08 14:25:03 +08:00
boyu0 7363be0697 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-07 17:37:33 +08:00
boyu0 6c27a0df0b issue : make api more friendly 2013-11-06 15:43:29 +08:00
boyu0 a01fcc6f36 issue : move header definition to first line 2013-11-06 14:51:56 +08:00
boyu0 af129e25f0 issue : change some coding style 2013-11-05 20:02:58 +08:00
boyu0 8c62bf813f issue : enhance API and add Slice demo 2013-11-05 15:54:33 +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
boyu0 2f67ceb495 issue : fix some code style 2013-11-01 16:26:03 +08:00
boyu0 cae9a3e54f issue : add physics pump demo and fix bugs 2013-10-29 17:31:35 +08:00
boyu0 66d1bbd89f issue : edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
boyu0 a8ddca81bd issue : fix some compile error in win32 2013-10-23 18:52:09 +08:00
boyu0 17422c3123 issue : fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 24561860f0 issue : add ray cast test 2013-10-22 18:00:24 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
minggo 95acb1b9e3 issue : helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00