Commits

Branch selector

 68eb953

User selector

All users

Datepicker

All time

Commit History

Commits on Feb 18, 2021

• Latest version on my end w/ my trees and the UI changes

  klydero

  committed
  68eb953

• Merge remote-tracking branch 'upstream/main' into Miriam's-Items

  klydero

  committed
  f909d65

• adjusted SFX so there are now two distinct sounds and they are attached to the marshmallow in space

  davidmpickett

  committed
  f295e4d

• fixed bug where "New Achievement" text triggered when it wasn't a new achievement

  davidmpickett

  committed
  da9bca4

• adjusted marshmallow controls

  Show description for 1b80c08
  davidmpickett

  committed
  1b80c08

Commits on Feb 15, 2021

• adding new badge images

  garcia50gabriela

  committed
  e1a52ad

Commits on Feb 14, 2021

• accurate rotation, progress bar, flame probability, 4 new achievement logic

  garcia50gabriela

  committed
  facf6c9

Commits on Feb 13, 2021

• opps put everything back

  garcia50gabriela

  committed
  498f731

• update gitignore

  garcia50gabriela

  committed
  ebfce84

Commits on Feb 12, 2021

• added rocks to main build

  davidmpickett

  committed
  c7537cf

• added position reset upon mouse unclick

  davidmpickett

  committed
  febf187

Commits on Feb 7, 2021

• Merge branch 'main' of https://github.com/garcia50gabriela/marshmallow into main

  davidmpickett

  committed
  adcd143

• Merge branch 'main' of https://github.com/garcia50gabriela/marshmallow into main

  davidmpickett

  committed
  84d4ef9

• added miriam's music

  davidmpickett

  committed
  482bfe3

• adding achievements background and other models

  garcia50gabriela

  committed
  df21f88

Commits on Feb 4, 2021

• Sound effect with variable volume!

  davidmpickett

  committed
  0031760

• Merge pull request #1 from davidmpickett/main

  Show description for c0f6f8d
  davidmpickett

  authored
  c0f6f8d

• Update .DS_Store

  klydero

  committed
  1682670

• Create .DS_Store

  klydero

  committed
  a6e67ec

• 3d modelled a marshmallow

  davidmpickett

  committed
  35dff7c

• moved SFX

  davidmpickett

  committed
  40229e9

Commits on Feb 1, 2021

• made some SFX

  davidmpickett

  committed
  e8d7f4b

Commits on Jan 31, 2021

• Add files via upload

  garcia50gabriela

  authored
  d85c59c

• Add files via upload

  garcia50gabriela

  authored
  5323e48

• Add files via upload

  garcia50gabriela

  authored
  3676285

• Create readme.md

  garcia50gabriela

  authored
  acf419d

• Add files via upload

  garcia50gabriela

  authored
  a4d0bae

• Create readme.md

  garcia50gabriela

  authored
  ec44268

• Delete readme.md

  garcia50gabriela

  authored
  d6de4ec

• Add files via upload

  garcia50gabriela

  authored
  a55d35b

• Create readme.md

  garcia50gabriela

  authored
  bcf556b

• Add files via upload

  garcia50gabriela

  authored
  7450e8e

Commits on Jan 25, 2021

• Initial commit

  garcia50gabriela

  authored
  a3b8d9e