Skip to content
This repository was archived by the owner on May 23, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f2e8620
Merge pull request #10 from lofgrenfredrik/Ville
lofgrenfredrik Sep 11, 2015
09ec116
mergat från master
lofgrenfredrik Sep 11, 2015
0c07504
Merge pull request #12 from lofgrenfredrik/Ville
lofgrenfredrik Sep 13, 2015
832b87c
prepare for merge
lofgrenfredrik Sep 14, 2015
74c0058
Merge remote-tracking branch 'origin/master' into devbranch
lofgrenfredrik Sep 14, 2015
e7f9d60
lagt till lite ljudeffekter
lofgrenfredrik Sep 14, 2015
74518b0
lagt till hälsobar
lofgrenfredrik Sep 14, 2015
1e976b4
fixat lite med ljud
lofgrenfredrik Sep 14, 2015
19e3a20
Merge pull request #13 from lofgrenfredrik/devbranch
lofgrenfredrik Sep 14, 2015
1fe2b4c
lagt till sass-cache i gitignore
lofgrenfredrik Sep 14, 2015
633ac21
stash
lofgrenfredrik Sep 14, 2015
781c8cc
tweakat powerskotten, lagt till vinn condition samt lite ban conditions
lofgrenfredrik Sep 15, 2015
e287f62
grejjat med nästa bana funktionalitet
lofgrenfredrik Sep 15, 2015
6d5cfb1
Merge pull request #14 from lofgrenfredrik/devbranch
lofgrenfredrik Sep 15, 2015
715252f
Merge branch 'Ville'
vilhelmfalkenmark Sep 15, 2015
c96851c
testar reverta
lofgrenfredrik Sep 15, 2015
e14dab9
reset
lofgrenfredrik Sep 15, 2015
fd0ea4b
synk med powershots
vilhelmfalkenmark Sep 15, 2015
12b72ee
commit before pull
lofgrenfredrik Sep 15, 2015
dc4139e
prepare to merge
lofgrenfredrik Sep 15, 2015
9b5d04b
prepare to merge
lofgrenfredrik Sep 15, 2015
94107e9
lagt till bild för specialammo
lofgrenfredrik Sep 15, 2015
f086fd3
fipplat med grafiken i spelarfönstret
lofgrenfredrik Sep 16, 2015
0de19e3
Lagt till fungerande studs på hinder
vilhelmfalkenmark Sep 16, 2015
d81a9d8
fixat next level funktion
lofgrenfredrik Sep 16, 2015
5fcdd66
prepare for merge
lofgrenfredrik Sep 16, 2015
e282bff
merger
lofgrenfredrik Sep 16, 2015
5ebead9
merger2
lofgrenfredrik Sep 16, 2015
867c1b5
conflict merge
lofgrenfredrik Sep 16, 2015
29a589a
Synkar för att skapa gren
vilhelmfalkenmark Sep 16, 2015
da3512c
synced conflicts
lofgrenfredrik Sep 16, 2015
46f8fc1
fixar med vad som genereras för olika conditions
lofgrenfredrik Sep 16, 2015
1fa2535
Lagt till bild på skott
vilhelmfalkenmark Sep 16, 2015
6aaba50
Merge pull request #17 from lofgrenfredrik/ville-new
lofgrenfredrik Sep 16, 2015
9cb5c7f
mergat från master
lofgrenfredrik Sep 16, 2015
8af0df9
Merge pull request #18 from lofgrenfredrik/fredrik
lofgrenfredrik Sep 16, 2015
eac28a2
gömt bild på skott
vilhelmfalkenmark Sep 16, 2015
8a45026
Merge branch 'master' into ville-new
vilhelmfalkenmark Sep 16, 2015
3cda3cc
ändrat på knappar man byterskott med samt fixat lite med next level o…
lofgrenfredrik Sep 17, 2015
313a3e4
Lagt till ny sprite med vapenbilder
vilhelmfalkenmark Sep 17, 2015
6639656
Merge pull request #19 from lofgrenfredrik/ville-new
vilhelmfalkenmark Sep 17, 2015
1c058da
ändrat på knappar man byterskott med samt fixat lite med next level o…
lofgrenfredrik Sep 17, 2015
dd944c3
prepare merge
lofgrenfredrik Sep 17, 2015
546407d
mergat
lofgrenfredrik Sep 17, 2015
a47b31c
kommit för att merga
vilhelmfalkenmark Sep 17, 2015
b75f419
tweakat lite inställningar med vinst conditions
lofgrenfredrik Sep 17, 2015
672f16b
Stajlat upp den bigtime
vilhelmfalkenmark Sep 17, 2015
cd90fef
Merge branch 'ville-new'
vilhelmfalkenmark Sep 17, 2015
7c3ce51
prepare to merge
lofgrenfredrik Sep 17, 2015
5b8bd04
mergat med fredrik branch
lofgrenfredrik Sep 17, 2015
a024afa
Merge branch 'master' into ville-new
vilhelmfalkenmark Sep 17, 2015
ff8bdc9
sorterat lite variabler samt tagit bort oanvänd kod
lofgrenfredrik Sep 18, 2015
5151608
Fixat sprite till klar version
vilhelmfalkenmark Sep 18, 2015
b5239a3
Merge pull request #22 from lofgrenfredrik/ville-new
vilhelmfalkenmark Sep 18, 2015
6049c99
Merge branch 'master' into ville-new
vilhelmfalkenmark Sep 18, 2015
9996c97
mergat alla grenar
lofgrenfredrik Sep 18, 2015
0226f30
Merge branch 'master' into ville-new
vilhelmfalkenmark Sep 18, 2015
f5c131d
Laddat ned fungerade vers från tidigare kommit
vilhelmfalkenmark Sep 18, 2015
be76e2c
Merge pull request #23 from lofgrenfredrik/ville-new
vilhelmfalkenmark Sep 18, 2015
7e41076
Fixar merge
vilhelmfalkenmark Sep 18, 2015
77ee0d7
Merge branch 'ville-new'
vilhelmfalkenmark Sep 18, 2015
46f7fcf
Fixat till ett färdigt Spel
vilhelmfalkenmark Sep 18, 2015
6ad93c2
Merge pull request #24 from lofgrenfredrik/ville-new
vilhelmfalkenmark Sep 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,6 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties


.sass-cache/*
Binary file not shown.
Binary file added css/AbrilFatface-Regular.otf
Binary file not shown.
316 changes: 301 additions & 15 deletions css/style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/style.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading