micahli
7d1d46ee3f
fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address
2012-10-13 16:44:46 +08:00
James Chen
6cf602ea3b
issue #1486 : CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture.
2012-10-13 10:18:03 +08:00
folecr
2ac7a5cbe4
microlattice : updating submodule reference to latest autogenerated bindings
2012-10-12 09:48:37 -07:00
minggo
8b650794e6
Merge pull request #1445 from minggo/gles20
...
make TestJavascript work on iOS
2012-10-12 02:47:55 -07:00
minggo
0a39fa8bef
fixed #1507 : use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
2012-10-12 17:43:43 +08:00
James Chen
32a9d51618
issue #1486 : Commented some unused codes.
2012-10-12 17:37:49 +08:00
James Chen
36600d95b1
issue #1486 : Calculate content scale factor by screen height.
2012-10-12 17:37:26 +08:00
James Chen
6178594068
issue #1486 : Updated lua templates.
2012-10-12 16:19:33 +08:00
James Chen
04a4ebc571
issue #1486 : Using relative coordinate for HelloLua.
2012-10-12 16:18:28 +08:00
James Chen
99a7dcefa4
issue #1486 : Updated lua bindings.
2012-10-12 16:04:26 +08:00
James Chen
965540ecec
issue #1486 : fix a warning in CCAutoreleasePool.cpp.
2012-10-12 16:03:53 +08:00
James Chen
f5abe422ea
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res
2012-10-12 15:50:11 +08:00
James Chen
f928fb3dcb
Merge pull request #1446 from dumganhar/win32-js-tests
...
Updated TestJavascript project configuration for VS2008 & VS2010.
2012-10-12 00:46:51 -07:00
James Chen
6fd24c469b
Updated *.user for vs2010 & vs2008.
2012-10-12 15:45:57 +08:00
James Chen
e876b997e7
Updated TestJavascript.vcproj
2012-10-12 15:42:00 +08:00
James Chen
21491317c0
Fix compilation errors.
2012-10-12 15:41:45 +08:00
James Chen
a4e41c924d
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into surith-js-tests
2012-10-12 15:15:12 +08:00
James Chen
3b0a989200
Updated TestJavascript project configuration for VS2008 & VS2010.
2012-10-12 15:14:47 +08:00
minggo
572460e60a
make TestJavascript work on iOS
2012-10-12 12:00:36 +08:00
minggo
e2c734f7b3
Merge pull request #1444 from rohankuruvilla/gles20
...
Adding JS bindings for additional Classes and functions
2012-10-11 20:59:04 -07:00
James Chen
98aa5dd489
issue #1486 : Updated AppDelegate.cpp and proj.win32/main.cpp.
2012-10-12 10:02:49 +08:00
James Chen
e1c0ea761b
issue #1486 : Removed some unused codes, made it works on WINDOWS.
2012-10-12 09:58:42 +08:00
Rohan Kuruvilla
eafd6ebf08
Fixing restart of context to not leak memory
2012-10-11 18:48:37 -07:00
Rohan Kuruvilla
e7ac758b9f
Updating bindings to match cocos2d-html5
2012-10-11 18:45:22 -07:00
Rohan Kuruvilla
0c1c5a432d
Adding support to pass array of CCPoints from JS
2012-10-11 18:44:46 -07:00
Rohan Kuruvilla
540b41c091
Fixing LabelAtlas to read texture relative to path of plist file
2012-10-11 18:44:46 -07:00
minggo
77f4469a1a
Merge pull request #1443 from folecr/tests
...
Run cocos2d-html5-tests on cocos2d-x
2012-10-11 18:41:29 -07:00
folecr
36f8b31efc
Define some helper functions and comment out references to chipmunk
2012-10-11 17:56:44 -07:00
folecr
fc59b2c962
Updated build script
...
* merges js files from the cocos2d-html5-tests submodule into Android's assets folder
* copies js helper files into Android's assets folder
* copies the res from cocos2d-html5-tests into Android's assets folder
2012-10-11 16:58:44 -07:00
folecr
336af23428
Helper files copied from cocos2d-iphone
2012-10-11 16:58:44 -07:00
folecr
c63cf54256
Submodule for cocos2d-html5-tests
2012-10-11 16:37:22 -07:00
folecr
2e8aad611d
Run tests-boot-jsb.js from the root directory
2012-10-11 16:35:17 -07:00
folecr
a763e4242f
Remove samples/TestJavascript/Resources
2012-10-11 14:25:48 -07:00
folecr
2cf579de6b
NDK debugger script
2012-10-11 14:25:47 -07:00
James Chen
b78e2c9130
issue #1486 : Added iPad, ipadhd resources, and make some watermark for these pictures.
2012-10-11 18:33:43 +08:00
walzer
6560657fe3
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-10-11 17:22:21 +08:00
James Chen
cdf54a872f
issue #1486 : A bug fix.
2012-10-11 17:02:27 +08:00
James Chen
77da7b5895
issue #1486 : First commit based on BorMor's branch.
2012-10-11 16:45:14 +08:00
James Chen
ade54a3de7
Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
...
Conflicts:
samples/HelloCpp/Classes/AppDelegate.cpp
samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
James Chen
5efadbb4ff
Merge pull request #1441 from folecr/updatesubmodulereference
...
Update submodule reference to point to latest auto-generated changes
2012-10-10 20:12:25 -07:00
folecr
4af5abbc56
Update submodule reference to point to latest auto-generated changes
2012-10-10 20:07:46 -07:00
James Chen
1d4a2cc13c
Merge pull request #1439 from folecr/updatescript
...
Updated script behaviour.
2012-10-10 17:32:30 -07:00
folecr
57e8c4b304
Updated script behaviour
...
* Auto generated bindings are always pushed to remote repo.
* If a remote repository is not given, exit with failure.
* Updating the submodule reference is not done unless
* ... remote cocos2dx repo is set.
2012-10-10 08:37:54 -07:00
James Chen
fbfc7c0123
Merge pull request #1438 from dumganhar/iss1469-moonwarriors
...
issue #1469 : Adding MoonWarriors sample game.
2012-10-10 07:22:05 -07:00
James Chen
918045e6ac
issue #1469 : Deleted two unused files.
2012-10-10 22:18:27 +08:00
James Chen
122a748029
issue #1469 : Removed some unused resources.
2012-10-10 22:15:47 +08:00
James Chen
36d8e86879
issue #1469 : Made MoonWarriors works on iOS.
2012-10-10 22:06:44 +08:00
James Chen
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
James Chen
700b83f3b9
issue #1469 : Added 'setBlendFunc' support for CCSprite, CCParticleSystem...etc.
2012-10-10 15:25:27 +08:00
James Chen
9f93b609e8
issue #1469 : Added cc.config for js-bindings.
2012-10-10 15:24:20 +08:00