Skip to content

Many new features - #36

Open
meetinger wants to merge 40 commits into
MusicTheorist:masterfrom
meetinger:master
Open

Many new features#36
meetinger wants to merge 40 commits into
MusicTheorist:masterfrom
meetinger:master

Conversation

@meetinger

@meetingermeetinger commented Jun 12, 2020

Copy link
Copy Markdown
  1. Delay Override
  2. Bars Stroke
  3. Marks Settings
  4. FPS Settings
  5. Text antialiasing

@MusicTheorist

Copy link
Copy Markdown
Owner

Thank you so much!! I'll be looking over this for the next few weeks and manually merge your changes. Lemme know if you have any questions. Cheers!

@MusicTheoristMusicTheorist added enhancement New feature or request fixed Reported bug was fixed needstime Issue will be fixed in the future labels Jun 12, 2020
@meetinger
meetingerforce-pushed the master branch 2 times, most recently from 9c2cf16 to d1f7d63CompareJune 12, 2020 13:09
@landfillbaby

landfillbaby commented Jun 12, 2020

Copy link
Copy Markdown

ok so, sorry my advice before wasn't clear enough.
to actually fix this, run the following, which will delete any untracked or uncommited files!

git remote add upstream https://github.com/MusicTheorist/ArrayVisualizer.git
git fetch --all
git reset --hard HEAD~
git rebase d110ce8dbccd5ca824720748e41afcd925fb53a0
git push --force-with-lease

@landfillbaby

Copy link
Copy Markdown

sorry to be rude but how do you keep consistently breaking the commit history like this?
there's something very wrong with your git config

@landfillbaby

landfillbaby commented Jul 20, 2020

Copy link
Copy Markdown

now that i have write access i fixed it for you
rebased against d110ce8 just like before

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancementNew feature or requestfixedReported bug was fixedneedstimeIssue will be fixed in the future

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@meetinger@MusicTheorist@landfillbaby