Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bradparks/pixie
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ozcoder/pixie
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
2 contributors

Commits on Aug 13, 2014

  1. Move title to input for sprite upload buttons 

    On the upload sprite/costume buttons, Firefox looks for the title on
the the input instead of the containing div, defaulting to “No file
selected.”
    djdolphin committed Aug 13, 2014
    Copy the full SHA
    88dfbd9 View commit details

Commits on Feb 8, 2015

  1. Add Sublime project

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    8955d18 View commit details

  2. Reorganize sources

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    b40272a View commit details

  3. Start converting to vector assets

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    7b792f7 View commit details

  4. Add more vector assets

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    def390c View commit details

  5. Fix JS-based assets

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    83c78ac View commit details

  6. Fix asset URLs

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    a7d2c8e View commit details

  7. Use resolution-independent gradients for canvas background

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    d54fe34 View commit details

  8. Fix shadow outline performance

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    834a7fb View commit details

  9. Vectorize bitmap tools

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    3bc21d1 View commit details

  10. Vectorize check boxes

    @nathan
    nathan committed Feb 8, 2015
    Copy the full SHA
    0f709b3 View commit details

Commits on Feb 9, 2015

  1. Vectorize new buttons

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    4bf1e2a View commit details

  2. Vectorize swatch buttons

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    676fa3c View commit details

  3. Vectorize zoom buttons and eyedropper

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    c2c0bc7 View commit details

  4. Update visual

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    858a51c View commit details

  5. Vectorize rotation arrows and list watcher add button

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    51c3003 View commit details

  6. Fix list watcher add button

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    3cdecaa View commit details

  7. Switch to zero-width spaces 

    This fixes a bug in Chrome
    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    953456e View commit details

  8. Remove assets.png

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    ea706df View commit details

  9. Remove obsolete assets.xcf

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    c389b4b View commit details

  10. Update visual

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    afc89d7 View commit details

  11. Add Sketch slices for each sprite

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    1534eb9 View commit details

  12. Fix flag icon slicing

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    a22ad84 View commit details

  13. Merge branch 'master' of https://github.com/djdolphin/pixie into djdo… 

    …lphin-master
    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    e994592 View commit details

  14. Set tooltip on costume buttons correctly in Chrome

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    b5432ae View commit details

  15. Don't use background-position-x/y (Firefox doesn't support these)

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    b4741ce View commit details

  16. Organize CSS

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    15138e8 View commit details

  17. Fix dialog keybindings

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    63a1c56 View commit details

  18. Scroll selected costume into view

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    7e8e34e View commit details

  19. Fix indentation in CostumesPanel::addCostume

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    857792f View commit details

  20. Select costumes icon after adding them to the DOM 

    This makes them scroll into view properly
    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    19a1664 View commit details

  21. Flash the green flag for a minimum amount of time (50 ms)

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    d731974 View commit details

  22. Flash the green flag when a single-frame script runs

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    5878f53 View commit details

  23. Add about dialog

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    5aee1ab View commit details

  24. Add NS annotation to about dialog

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    8469848 View commit details

  25. Fix palette spacing

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    f212e01 View commit details

  26. Add individual image assets as guides

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    52007b5 View commit details

  27. Add tool buttons to top bar

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    d0a4223 View commit details

  28. Fix new group label in small stage mode

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    7790d41 View commit details

  29. Make costume icons draggable

    @nathan
    nathan committed Feb 9, 2015
    Copy the full SHA
    647c18d View commit details

Commits on Feb 10, 2015

  1. Rename some layers

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    2f1a39b View commit details

  2. Fix key handling

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    c972162 View commit details

  3. Fix error when clicking a list watcher

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    262cd98 View commit details

  4. Add list watcher cell editors

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    fe08945 View commit details

  5. Accept editors when the user blurs them

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    2c19a9b View commit details

  6. Add tab/shift+tab keyboard shortcuts to list watchers

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    157dfec View commit details

  7. Insert after last item edited when adding an item to a list

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    48bd985 View commit details

  8. Add keyboard shortcut for list watcher add button

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    c8e0318 View commit details

  9. Fix updates to cell/index width involving editors

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    a9f9851 View commit details

  10. Allow shift key to insert item before last edited item

    @nathan
    nathan committed Feb 10, 2015
    Copy the full SHA
    a262e72 View commit details
Showing with 3,406 additions and 1,251 deletions.
  1. +1 −1 LICENSE
  2. +9 −0 Pixie.sublime-project
  3. +5 −0 README.md
  4. BIN assets.png
  5. BIN assets.xcf
  6. BIN assets/assets.sketch
  7. +517 −0 assets/assets.svg
  8. +500 −171 { → assets}/pixie.css
  9. +3 −2 index.html
  10. +26 −0 lib/pixie/.jshintrc
  11. 0 { → lib/pixie}/background.js
  12. +2,325 −1,075 { → lib/pixie}/pixie.js
  13. +1 −1 lib/visual
  14. +1 −1 manifest.json
  15. +18 −0 vendor/pixi.min.js
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Nathan Dinsmore
Copyright (c) 2014-2015 Nathan Dinsmore

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
9 changes: 9 additions & 0 deletions Pixie.sublime-project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"folders":
[
{
"follow_symlinks": true,
"path": "."
}
]
}
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Pixie

An unofficial rewrite of [Scratch][] in JavaScript. Pixie aims to provide an application nearly identical to the current, Flash-based Scratch editor and player using only web technologies.

[scratch]: https://scratch.mit.edu
Binary file removed assets.png
View file
Binary file not shown.
Binary file removed assets.xcf
View file
Binary file not shown.
Binary file added assets/assets.sketch
View file
Binary file not shown.
Loading