Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for particleWithFile for both Quad & Point Particle Systems #528

Merged
merged 1 commit into from Sep 28, 2011
Merged

Add support for particleWithFile for both Quad & Point Particle Systems #528

merged 1 commit into from Sep 28, 2011

Conversation

ciaranj
Copy link
Contributor

@ciaranj ciaranj commented Sep 27, 2011

Adds in sparse class definitions for Quad & Point Particle systems, allows for constructing these systems from a plist file.

minggo added a commit that referenced this pull request Sep 28, 2011
@minggo
Merge pull request #528 from ciaranj/more_particle_systems_in_lua
9531d4a 
Add support for particleWithFile for both Quad & Point Particle Systems
@minggo minggo merged commit 9531d4a into cocos2d:master Sep 28, 2011
@minggo minggo mentioned this pull request May 13, 2013
Merged
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
issue cocos2d#528: refactor ok on win32
fd57dc4
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
issue cocos2d#528: refactor lua ok on Android
4a94ac8
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
issue cocos2d#528: refactor lua ok on iOS
e9b906d
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
issue cocos2d#528: fix some bug & complete hello.lua
8a260c5
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
fixed cocos2d#528: refactor lua ok
f2f92da
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
fixed cocos2d#528: add copyright & modify pop menu position
1b8174c
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
fixed cocos2d#528: safe call of CCScriptEngineManager::sharedScriptEn…
11bb4c6 
…gineManager()->getScriptEngine()->xxx()
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
issue cocos2d#528, improve CCScriptEngineManager. AppDelegate should …
66ed00e 
…hold the whole lifecycle of LuaEngine object.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
Merge pull request cocos2d#308 from minggo/master
66c0506 
fixed cocos2d#528
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
fixed cocos2d#528: fix a compile bug
7192715
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
fixed cocos2d#528: modify HelloWorld to works ok
99a2e89
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
[ios] issue cocos2d#528, add script_support into xcode4 template
433bee9
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
[android] issue cocos2d#528, rename the folders in cocos2d-x/lua, for…
f67b32e 
… xcode4 template generator.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
improve HelloLua, rename images, add error msg in LuaEngine, refactor…
f47c77f 
… hello.lua, add RootViewController. issue cocos2d#540 cocos2d#528
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
fixed cocos2d#528, Lua can get the CCTouch array in callback function…
bf8e18b 
…; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 28, 2014
@minggo
Merge pull request cocos2d#528 from ciaranj/more_particle_systems_in_lua
4748a81 
Add support for particleWithFile for both Quad & Point Particle Systems
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
issue cocos2d#528: refactor ok on win32
70725ef
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
issue cocos2d#528: refactor lua ok on Android
9aa087e
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
issue cocos2d#528: refactor lua ok on iOS
5d632a1
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
issue cocos2d#528: fix some bug & complete hello.lua
c531bc6
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
fixed cocos2d#528: refactor lua ok
2136074
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
fixed cocos2d#528: add copyright & modify pop menu position
6b67e37
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
fixed cocos2d#528: safe call of CCScriptEngineManager::sharedScriptEn…
6a61f9a 
…gineManager()->getScriptEngine()->xxx()
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
issue cocos2d#528, improve CCScriptEngineManager. AppDelegate should …
bc9ac09 
…hold the whole lifecycle of LuaEngine object.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
Merge pull request cocos2d#308 from minggo/master
6750a1e 
fixed cocos2d#528
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
fixed cocos2d#528: fix a compile bug
a347811
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
fixed cocos2d#528: modify HelloWorld to works ok
edee243
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
[ios] issue cocos2d#528, add script_support into xcode4 template
160e649
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
[android] issue cocos2d#528, rename the folders in cocos2d-x/lua, for…
2087636 
… xcode4 template generator.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
improve HelloLua, rename images, add error msg in LuaEngine, refactor…
f57dcf4 
… hello.lua, add RootViewController. issue cocos2d#540 cocos2d#528
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
fixed cocos2d#528, Lua can get the CCTouch array in callback function…
f727386 
…; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now.
angeltown pushed a commit to angeltown/cocos2d-x that referenced this pull request Apr 29, 2014
@minggo
Merge pull request cocos2d#528 from ciaranj/more_particle_systems_in_lua
6a57849 
Add support for particleWithFile for both Quad & Point Particle Systems
minggo added a commit that referenced this pull request May 4, 2014
@minggo
issue #528: refactor ok on win32
022e2b9
minggo added a commit that referenced this pull request May 4, 2014
@minggo
issue #528: refactor lua ok on Android
2f97a43
minggo added a commit that referenced this pull request May 4, 2014
@minggo
issue #528: refactor lua ok on iOS
826a782
minggo added a commit that referenced this pull request May 4, 2014
@minggo
issue #528: fix some bug & complete hello.lua
80e618f
minggo added a commit that referenced this pull request May 4, 2014
@minggo
fixed #528: refactor lua ok
8066312
minggo added a commit that referenced this pull request May 4, 2014
@minggo
fixed #528: add copyright & modify pop menu position
9687799
minggo added a commit that referenced this pull request May 4, 2014
@minggo
fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineMan…
00cc1d2 
…ager()->getScriptEngine()->xxx()
walzer pushed a commit that referenced this pull request May 4, 2014
issue #528, improve CCScriptEngineManager. AppDelegate should hold th…
f3375f0 
…e whole lifecycle of LuaEngine object.
minggo added a commit that referenced this pull request May 4, 2014
@minggo
Merge pull request #308 from minggo/master
6cb6359 
fixed #528
minggo added a commit that referenced this pull request May 4, 2014
@minggo
fixed #528: fix a compile bug
53a5ec4
minggo added a commit that referenced this pull request May 4, 2014
@minggo
fixed #528: modify HelloWorld to works ok
4f7db6b
walzer pushed a commit that referenced this pull request May 4, 2014
[ios] issue #528, add script_support into xcode4 template
3498a91
walzer pushed a commit that referenced this pull request May 4, 2014
[android] issue #528, rename the folders in cocos2d-x/lua, for xcode4…
19c5392 
… template generator.
walzer pushed a commit that referenced this pull request May 4, 2014
improve HelloLua, rename images, add error msg in LuaEngine, refactor…
a88aa00 
… hello.lua, add RootViewController. issue #540 #528
walzer pushed a commit that referenced this pull request May 4, 2014
fixed #528, Lua can get the CCTouch array in callback function; Add C…
e606027 
…CNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now.
minggo added a commit that referenced this pull request May 4, 2014
@minggo
Merge pull request #528 from ciaranj/more_particle_systems_in_lua
da8a409 
Add support for particleWithFile for both Quad & Point Particle Systems
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ciaranj @minggo