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

Master #439

Open
wants to merge 481 commits into
base: v2_1
Choose a base branch
from
Open

Master #439

wants to merge 481 commits into from

Conversation

JerryWong0119
Copy link

No description provided.

Viktor Lidholt and others added 30 commits January 24, 2013 15:48
Added to authors
e0aae68
@ricardoquesada
"play" / "stop" works OK when Player is compiled in DEBUG mode
09aa713
Merge pull request #231 from ricardoquesada/player_stop_fix
a9e84c0 
"play" / "stop" works OK when Player is compiled in DEBUG mode
@ricardoquesada
Updates cocos2d repo and improves the stop fix
88df4fd
Merge pull request #232 from ricardoquesada/safer_stop_fix
dde450b 
Updates cocos2d repo and improves the stop fix
CocosBuilder now exports ogg for Android
00756ab
Updated docs for automatic sound conversions
b43d98c
Fix to publisher
96d2eb8
@ricardoquesada
Reports status on the window
0a9bd9e
Publisher doesn't regenerate sprite sheets if they are already publis…
7449810 
…hed.
@ricardoquesada
Server is not being shutdown recursively
a8edb91
Merge pull request #234 from ricardoquesada/report_status
a60d113 
Report status
Updated CCBReader
7f4f2c9
Updated to latest cocos2d-html5 version
3103d4e
Updated to latest version of cocos2d-iphone
18a1a09
@rohankuruvilla
Update Documentation/4c. Connecting with cocos2d-x.md
488f9b0
Merge pull request #237 from rohankuruvilla/patch-1
735b83c 
Update Documentation/4c. Connecting with cocos2d-x.md
Merge branch 'master' of github.com:cocos2d/CocosBuilder into develop
63af6d8
Updated documentation
7f10547
Updated deployment target to OS X 10.7
7a9c621
Started work on optimization of publisher
7e0b025
Removed CocosDragonJS from examples
1706710
@ricardoquesada
Update Documentation/4c. Connecting with cocos2d-x.md
e63417c 
fixes code block
Merge pull request #238 from ricardoquesada/patch-2
d1c18b9 
Update Documentation/4c. Connecting with cocos2d-x.md
Fixes documentation
4a6e675
Optimizations to publisher
553a4e4
@emk771
Fixed typo in Doc.../6. Working with Animations.md
9598e71 
"I can sometimes" changed to "It can sometimes"
Cleaned up code
f4a68b9
Updated change log
70ec69c
CocosPlayer is now sending UUID
8eee02c
Viktor Lidholt and others added 30 commits May 1, 2013 18:01
Really fixed the build issue for the examples
ad43f42
Fixes issues with publishing for HTML5. Now uses resolution scale and…
07a05b0 
… do not publish for mobile unless needed.
Fixes issue #353
55e3c98
Merge pull request #344 from zhaoboqiang/develop
16a71a6 
Add some objects alignment
Fixed confusing naming in alignment
34e0323
Fixes issue #337
e46061b
Add version number to project settings.
fdd5e81
HTML5 Template: Use runWithScene when loading first scene
92cd505 
Using runWithScene produces assertion error:

`Assertion failed: Use runWithScene: instead to start the director`
Show and publish json files
c0ecd39
Remove old publish dir if version mis-match and we want to re-publish
78348c7
Merge remote-tracking branch 'upstream/develop' into force_republish
85b9326
Move store the project setting to appDelegate and fix a typo.
d018c97
Mark need republish when clean cache is clicked.
05c0368
Merge pull request #360 from ayuer/force_republish
26b1136 
Fix issue #329, Force republish
Fixed issues with republishing files when updating version
4e983b9
Merge branch 'patch-1' of https://github.com/SevInf/CocosBuilder into…
bc15aec 
… develop
Merge pull request #359 from SevInf/json
96e9b73 
Show and publish json files
Merge branch 'develop' of github.com:cocos2d/CocosBuilder into develop
557b470
Improves autocomplete
8cfc527
Fixes issue with build not being correctly cleaned with newer version…
468c748 
…s of Xcode
Fixes potential issue with redirection of stdout
fac541f
Updated Cocos2d and CCBReader to latest versions
8a3c20d
Merge branch 'master' into develop
7c554de
Moved frameworks to framework group
9990a85
Adds menu option for creating JS files
4c2fb5c
Fixed clipped control
a5518bf
Added add-file button
0511aa7
Renamed menu options
aab7dac
Updated to latest version of Cocos2d
422355b
Some change in file
021d741
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.