Master by JerryWong0119 · Pull Request #439 · cocos2d/CocosBuilder

Commits on Mar 16, 2013

Commits on Mar 18, 2013

Merge pull request #275 from pierrepaullavoie/upstream-005
Viktor Lidholt
committed
Merge pull request #277 from pierrepaullavoie/upstream-007
Viktor Lidholt
committed

Commits on Mar 19, 2013

Fixed the open in external editor menu to work correctly
Viktor Lidholt
committed
Updated to latest version of cocos2d and CCBReader
Viktor Lidholt
committed
Fixes issue with setting empty blocks
Viktor Lidholt
committed
Updates how last keyframe of visible property is displayed
Viktor Lidholt
committed

Commits on Mar 20, 2013

Update Cocos2d-html5 to version v2.1.2 beta.
linshun
committed
Merge pull request #278 from linshun/develop
Viktor Lidholt
committed

Commits on Mar 21, 2013

Merge branch 'master' of github.com:cocos2d/CocosBuilder
Viktor Lidholt
committed
Fix Cant create keyframes from spritesheet: refs #267
vedi
committed

Commits on Mar 26, 2013

Added Roadmap for version 3 to documentation.
Viktor Lidholt
committed
Added to roadmap
Viktor Lidholt
committed

Commits on Mar 28, 2013

#281 fixed
ylong
committed
#249 fixed
ylong
committed
Merge pull request #297 from longyangxi/master
Viktor Lidholt
committed

Commits on Mar 29, 2013

Merge pull request #1 from cocos2d/develop
longyangxi
committed

Commits on Apr 1, 2013

#291 fixed
ylong
committed
Merge pull request #306 from longyangxi/dev329
Viktor Lidholt
committed
Added About window with current version number
Viktor Lidholt
committed
Added classes for handling Debugger connection
Viktor Lidholt
committed
Made hash longer for commit version
Viktor Lidholt
committed
Updated about box icon
Viktor Lidholt
committed

Commits on Apr 2, 2013

Started work on debug connection
Viktor Lidholt
committed
Merge pull request #2 from cocos2d/develop
longyangxi
committed

Commits on Apr 3, 2013

#249 fixed finally
ylong
committed
Now connecting to debugger and can send debug commands
Viktor Lidholt
committed

Commits on Apr 4, 2013

Updated look of debugger
Viktor Lidholt
committed
Textfield is now sending commands to debugger
Viktor Lidholt
committed
Added custom class for debugger input text field
Viktor Lidholt
committed
Debbuger input text field history is now working!
Viktor Lidholt
committed
Improved debug console
Viktor Lidholt
committed
Merge pull request #312 from longyangxi/dev0403
Viktor Lidholt
committed
Updates the title of the main window with the name of the project
Viktor Lidholt
committed

Commits on Apr 5, 2013

Changes behavior of CCScale9Sprite so its insets are multiplied by resolution scale
Viktor Lidholt
committed
Fixes #307
Viktor Lidholt
committed
Updates Fragaria
Viktor Lidholt
committed

Commits on Apr 7, 2013

Merge pull request #3 from cocos2d/develop
longyangxi
committed

Commits on Apr 8, 2013

Add feature for Run Cocos2d JS projects in browser, issue #12
Jia Liu
committed
Fixes issue with 8-bit images
Viktor Lidholt
committed
Remove debug-print
Viktor Lidholt
committed

Commits on Apr 9, 2013

Commits on Apr 10, 2013

Adds basic initial support for highlighting errors.
Viktor Lidholt
committed
Merge pull request #4 from cocos2d/develop
longyangxi
committed
Improved support for syntax errors
Viktor Lidholt
committed
Update project settings to not make the whole project arc but only the cocoaHTTPServer code.
Jia Liu
committed
Merge pull request #2 from cocos2d/develop
ayuer
committed
Add feature for Run Cocos2d JS projects in browser, issue #12
Jia Liu
committed
Update based on Viktor's feedback, 1, move to seperate class; 2, restart the server when user update publish dir; 3, remove DDLog; 4, Let kernel pick a port if default one is taken.
Jia Liu
committed
Update project file to only make those needed to be arc
Jia Liu
committed
fix merge issues
Jia Liu
committed
Add support for different browser, don't know how to determine if one is existing on your machine yet.
Jia Liu
committed
Added divider line in File menu
Viktor Lidholt
committed
Moved CCBHTTPServer to the Publishing group in project file
Viktor Lidholt
committed
Improved support for displaying errors in text editor
Viktor Lidholt
committed

Commits on Apr 11, 2013

JavaScript document is now syntax checked when opened
Viktor Lidholt
committed
Updated to latest version
Viktor Lidholt
committed

Commits on Apr 12, 2013

Added code for parsing the JavaScript files and retrieving variable names
Viktor Lidholt
committed
Updated Fragaria
Viktor Lidholt
committed
#31 feature completed version1
ylong
committed
Merge pull request #3 from cocos2d/develop
ayuer
committed
Move open browser code out of app delegate, and fix a xib bug where Chrome is not binded correctly.
Jia Liu
committed
#31 feature completed version2
ylong
committed
Merge pull request #319 from longyangxi/dev0412
Viktor Lidholt
committed
Improved support for auto completion
Viktor Lidholt
committed

Commits on Apr 13, 2013

Much improved syntax coloring
Viktor Lidholt
committed

Commits on Apr 15, 2013

Commits on Apr 16, 2013

Merge pull request #322 from ayuer/js_in_browser3
Viktor Lidholt
committed
#31 polished and add dither option for PNG-8BIT texture format
ylong
committed

Commits on Apr 17, 2013

Better display of errors in editor, added code for finding function names and lines
Viktor Lidholt
committed
Merge pull request #5 from cocos2d/develop
ayuer
committed
Fix warnings in CocosBuilder.
Jia Liu
committed
Improved error display
Viktor Lidholt
committed
Merge branch 'dev0415' of https://github.com/longyangxi/CocosBuilder into develop
Viktor Lidholt
committed
Fixes issue with error button positioning
Viktor Lidholt
committed
Merge branch 'fix_warnings' of https://github.com/ayuer/CocosBuilder into develop
Viktor Lidholt
committed
Removed header files from list of files to compile
Viktor Lidholt
committed
Autocomplete is now working across files
Viktor Lidholt
committed

Commits on Apr 18, 2013

Merge pull request #6 from cocos2d/develop
longyangxi
committed
Quick jump function in text editor is now working
Viktor Lidholt
committed
Updated Fragaria for improved syntax highlighting
Viktor Lidholt
committed
Adding save all feature and pop alert before publish.
Jia Liu
committed
Save JS files too.
Jia Liu
committed
WebP format is ready and polished the smart sprite sheet setting
ylong
committed
Merge pull request #330 from ayuer/save_all
Viktor Lidholt
committed
Merge pull request #331 from longyangxi/dev0418
Viktor Lidholt
committed
Fixed issues with save all before publish
Viktor Lidholt
committed
Fixed memory leak in texture packer
Viktor Lidholt
committed
Fixes #33
Viktor Lidholt
committed
Changes position of menu items
Viktor Lidholt
committed
Fixed merge conflict

Ye Zhenhua
authored and
Viktor Lidholt
committed
Merge branch 'master' of https://github.com/vedi/CocosBuilder into develop
Viktor Lidholt
committed

Commits on Apr 19, 2013

Commits on Apr 22, 2013

force republish when settings changed
ylong
committed
Merge pull request #335 from longyangxi/dev0422
Viktor Lidholt
committed

Commits on Apr 23, 2013

Merge branch 'fix_skipping_extra_props' of https://github.com/theGoodEvil/CocosBuilder into develop
Viktor Lidholt
committed
Removed debug traces
Viktor Lidholt
committed
Fixes bug when regenerating sprite sheets.
Viktor Lidholt
committed
Removes debug traces
Viktor Lidholt
committed

Commits on Apr 25, 2013

Adds support for highlighting a line when hitting breakpoints
Viktor Lidholt
committed
Updated to latest version of cocos2d
Viktor Lidholt
committed
Changed to new debugger port
Viktor Lidholt
committed

Commits on Apr 26, 2013

Updates for visual debugger
Viktor Lidholt
committed
Add some alignment operation
zhaoboqiang
committed
Sort CCNode by position when "Align Across" or "Align Down".
zhaoboqiang
committed

Commits on Apr 27, 2013

Update cocos2d-html5 engine to version v2.1.2-beta2
linshun
committed
update engine version to v2.1.2-beta2
linshun
committed

Commits on Apr 28, 2013

updated Cocos2d-html5 engine version to v2.1.3
linshun
committed

Commits on Apr 29, 2013

Merge pull request #342 from linshun/develop
Viktor Lidholt
committed
Adds support for eval and better trace output
Viktor Lidholt
committed

Commits on Apr 30, 2013

Add some kind of object alignment:
zhaoboqiang
committed

Commits on May 1, 2013

Fixes issues with debugger connection
Viktor Lidholt
committed
Updated change log
Viktor Lidholt
committed
Better output formatting and removes debug code
Viktor Lidholt
committed
New README.md file for CocosPlayer
Viktor Lidholt
committed
Updated documentation
Viktor Lidholt
committed
Updated docs
Viktor Lidholt
committed
Latest version of cocos2d-iphone
Viktor Lidholt
committed
CocosPlayer graphics are now correctly republished and anti-aliased
Viktor Lidholt
committed
Added known issue to docs
Viktor Lidholt
committed
Updated to latest version of cocos2d
Viktor Lidholt
committed
Fixed build issue for examples
Viktor Lidholt
committed

Commits on May 2, 2013

Really fixed the build issue for the examples
Viktor Lidholt
committed

Commits on May 7, 2013

Fixes issues with publishing for HTML5. Now uses resolution scale and do not publish for mobile unless needed.
Viktor Lidholt
committed

Commits on May 8, 2013

Fixes issue #353

Viktor Lidholt
authored and
Viktor Lidholt
committed
Merge pull request #344 from zhaoboqiang/develop
Viktor Lidholt
committed
Fixed confusing naming in alignment

Viktor Lidholt
authored and
Viktor Lidholt
committed
Fixes issue #337

Viktor Lidholt
authored and
Viktor Lidholt
committed
Add version number to project settings.
Jia Liu
committed

Commits on May 10, 2013

HTML5 Template: Use runWithScene when loading first scene
Sergej Tatarincev
committed

Commits on May 11, 2013

Show and publish json files
Sergej Tatarincev
committed

Commits on May 13, 2013

Remove old publish dir if version mis-match and we want to re-publish
Jia Liu
committed
Merge remote-tracking branch 'upstream/develop' into force_republish
Jia Liu
committed
Move store the project setting to appDelegate and fix a typo.
Jia Liu
committed
Mark need republish when clean cache is clicked.
Jia Liu
committed
Merge pull request #360 from ayuer/force_republish
Viktor Lidholt
committed
Fixed issues with republishing files when updating version
Viktor Lidholt
committed
Merge branch 'patch-1' of https://github.com/SevInf/CocosBuilder into develop
Viktor Lidholt
committed
Merge pull request #359 from SevInf/json
Viktor Lidholt
committed
Merge branch 'develop' of github.com:cocos2d/CocosBuilder into develop
Viktor Lidholt
committed
Improves autocomplete
Viktor Lidholt
committed
Fixes issue with build not being correctly cleaned with newer versions of Xcode
Viktor Lidholt
committed
Fixes potential issue with redirection of stdout
Viktor Lidholt
committed

Commits on May 21, 2013

Updated Cocos2d and CCBReader to latest versions

Viktor Lidholt
authored and
Viktor Lidholt
committed
Merge branch 'master' into develop

Viktor Lidholt
authored and
Viktor Lidholt
committed
Moved frameworks to framework group

Viktor Lidholt
authored and
Viktor Lidholt
committed
Adds menu option for creating JS files

Viktor Lidholt
authored and
Viktor Lidholt
committed
Fixed clipped control

Viktor Lidholt
authored and
Viktor Lidholt
committed
Added add-file button
Viktor Lidholt
committed
Renamed menu options
Viktor Lidholt
committed

Commits on May 22, 2013

Updated to latest version of Cocos2d
Viktor Lidholt
committed
Some change in file
Viktor Lidholt
committed

Commits

Commits on Jan 24, 2013

Commits on Jan 25, 2013

Commits on Jan 26, 2013

Commits on Jan 29, 2013

Commits on Feb 1, 2013

Commits on Feb 2, 2013

Commits on Feb 4, 2013

Commits on Feb 5, 2013

Commits on Feb 6, 2013

Commits on Feb 7, 2013

Commits on Feb 8, 2013

Commits on Feb 11, 2013

Commits on Feb 12, 2013

Commits on Feb 13, 2013

Commits on Feb 14, 2013

Commits on Feb 15, 2013

Commits on Feb 19, 2013

Commits on Feb 20, 2013

Commits on Feb 21, 2013

Commits on Feb 22, 2013

Commits on Feb 23, 2013

Commits on Feb 28, 2013

Commits on Mar 1, 2013

Commits on Mar 5, 2013

Commits on Mar 7, 2013

Commits on Mar 14, 2013

Commits on Mar 15, 2013

Commits on Mar 16, 2013

Commits on Mar 18, 2013

Commits on Mar 19, 2013

Commits on Mar 20, 2013

Commits on Mar 21, 2013

Commits on Mar 26, 2013

Commits on Mar 28, 2013

Commits on Mar 29, 2013

Commits on Apr 1, 2013