Commit Graph

13135 Commits

Author SHA1 Message Date
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop
[Win32] fix compile error.
2013-11-11 04:42:42 -08:00
James Chen a951ba600f Merge pull request #4179 from CocosRobot/updategeneratedsubmodule_1384167474
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 03:02:04 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
James Chen d64de4f74d Merge pull request #4178 from dumganhar/develop
[develop] Updating bindings-generator, fixing forward declare that gener...
2013-11-11 02:46:48 -08:00
James Chen df214acb6f [develop] Updating bindings-generator, fixing forward declare that generates binding glue codes which is an empty class. 2013-11-11 18:42:39 +08:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo d3cf36ba37 Merge pull request #4171 from dumganhar/jsb-64bit-fix
[ci skip]Jsb 64bit fix
2013-11-11 02:17:42 -08:00
minggo d1a414194e [ci skip]update linux build commands 2013-11-11 17:36:23 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
James Chen 394f4e703b Reverting AssetsManager::update. 2013-11-11 17:06:32 +08:00
James Chen 22584ca9c2 Updating submodule of bindings-generator. 2013-11-11 16:50:07 +08:00
minggo 2a31ff04c2 Merge pull request #4166 from dabingnn/iss3025_TextureCache
[ci skip]issue #3025: move deprecated texture cache implementation to cpp file
2013-11-11 00:46:46 -08:00
James Chen 49289d7576 Adding cc.TextureCache.getInstance() to jsb_deprecated.js. 2013-11-11 16:45:44 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
James Chen 0151ac60ba fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
James Chen f25bd8ddb1 Merge pull request #4170 from CocosRobot/updategeneratedsubmodule_1384157112
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-11 00:06:44 -08:00
CocosRobot 2e52dd4905 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 08:05:15 +00:00
Huabing.Xu dfcae4ed0d issue #3025: change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore 2013-11-11 16:04:34 +08:00
James Chen a255fadd70 Merge pull request #4169 from dumganhar/develop
Updating Bindings-generator.
2013-11-10 23:58:02 -08:00
James Chen 272afaa7d9 Updating Bindings-generator. 2013-11-11 15:57:15 +08:00
minggo 796c75f834 [ci skip]change the building commands of linux 2013-11-11 15:56:15 +08:00
Huabing.Xu 3fc16256ab issue #3025: move deprecated texture cache implementation to cpp file 2013-11-11 15:40:12 +08:00
minggo 00b477e756 [ci skip] 2013-11-11 15:11:28 +08:00
minggo cd22f5543b Merge pull request #3997 from ondesly/screen_size_change
[ci skip]android & ios screen size change support
2013-11-10 23:10:13 -08:00
minggo bbb2579114 Merge pull request #4160 from dabingnn/iss3025_TextureCache
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
minggo d8dce17c35 Merge pull request #4149 from dumganhar/android-build-fix
[ci skip]Return non-zero if ndk build fails.
2013-11-10 23:07:29 -08:00
minggo 67c67efd74 Merge pull request #4154 from dumganhar/jsb-compile-fix
[ci skip]Some fixes:
2013-11-10 23:07:13 -08:00
James Chen 9d7a8c44f9 Reverts auto-generated. 2013-11-11 14:40:23 +08:00
James Chen 8f8d0f86d7 Updating Bindings-generator. 2013-11-11 14:38:12 +08:00
James Chen ff3bfbe8a2 Using std::unordered_map instead of UTHASH for js_type_class_t.
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
2013-11-11 14:36:43 +08:00
James Chen 55cf30b7c8 HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp. 2013-11-11 14:36:43 +08:00
James Chen 5a0df8d2e8 VS2012 doesn’t support invoke another constructor method in current constructor. 2013-11-11 14:36:43 +08:00
James Chen fe88f7c941 Fixing memory leak of JSStringWrapper::set . 2013-11-11 14:36:43 +08:00
James Chen 9d5813b7d9 Some fixes:
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
2013-11-11 14:36:42 +08:00
Huabing.Xu 55b9462b17 issue #3025: directly use _textureCache in Director 2013-11-11 14:21:41 +08:00
minggo e193311e55 Merge pull request #4161 from boyu0/iss2770_fix_warnings
[ci skip]issue #2770: fix warning
2013-11-10 22:10:10 -08:00
James Chen 058cd9d896 Update AUTHORS [ci skip] 2013-11-11 13:51:44 +08:00
James Chen 707a6c246f Merge pull request #4157 from dumganhar/iss3137-fix-acc
closed #3137: Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
2013-11-10 21:03:24 -08:00
boyu0 6c1144ee79 issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
minggo e981dbf7e4 Merge pull request #4158 from dumganhar/remove-jsb-version
[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
2013-11-10 20:45:22 -08:00
minggo def560c811 Merge pull request #4159 from mlepage/develop
[ci skip]Fix typos and other trivial cleanup
2013-11-10 20:06:56 -08:00
Huabing.Xu 02da3a29cc issue #3025: deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead 2013-11-11 11:38:02 +08:00
Marc Lepage 27b82f8f67 Fix typos and other trivial cleanup 2013-11-10 22:00:50 -05:00
James Chen 0c4b6e7a37 Removing JSB Version since JSB source codes will be updated with cocos2d-x.
Also, remove some unused codes.
2013-11-11 10:40:51 +08:00
James Chen a6c85a3906 issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
James Chen 0eb9caa3d6 Merge commit 'refs/pull/4123/head' of git://github.com/cocos2d/cocos2d-x into fix-acc 2013-11-11 10:08:28 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop
[ci skip]fix tolua_fix, cleanup peertable after object deleted
2013-11-10 17:44:24 -08:00
James Chen 1f742b6675 Update AUTHORS [ci skip] 2013-11-10 20:56:40 +08:00
James Chen f6aa50f6b2 Merge pull request #4155 from luisparravicini/issue-3136
typos in create_project.py
2013-11-10 04:52:42 -08:00
Luis Parravicini 90df6fc763 fixed typos 2013-11-10 08:25:01 -03:00