Code

p#1

Code

Open

GunnarPalss wants to merge 88 commits intoGunnarPalss:masterGunnarPalss/bubbleTrouble:masterfrom hthorhalls:masterCopy head branch name to clipboard

+1,478-889

Commits

Commits on Nov 11, 2014

• Boltar

  BjarkiThor

  committed
  943c03b

  Copy full SHA for 943c03b

• Revert "Boltar"

  Show description for 0563331
  BjarkiThor

  committed
  0563331

  Copy full SHA for 0563331

• Bubbles

  BjarkiThor

  committed
  ce3dc40

  Copy full SHA for ce3dc40

• Derp

  BjarkiThor

  committed
  3a0af46

  Copy full SHA for 3a0af46

• sprite fyrir player

  

  Sölvi Logason

  committed
  876ca20

  Copy full SHA for 876ca20

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  2f39bb7

  Copy full SHA for 2f39bb7

• Spatial manager

  hthorhalls

  committed
  ae29096

  Copy full SHA for ae29096

• Succesfully merged animation and boundingbox

  hthorhalls

  committed
  7d175c4

  Copy full SHA for 7d175c4

• Should handle death and collision right

  hthorhalls

  committed
  c2e4a1d

  Copy full SHA for c2e4a1d

Commits on Nov 12, 2014

• Force

  BjarkiThor

  committed
  aaa9fdc

  Copy full SHA for aaa9fdc

• Collision between all entities

  hthorhalls

  committed
  daec95c

  Copy full SHA for daec95c

• Gravity and bubbles bounce up on collision

  hthorhalls

  committed
  00fd543

  Copy full SHA for 00fd543

• deleted some unnecessary files

  hthorhalls

  committed
  ae7acb5

  Copy full SHA for ae7acb5

Commits on Nov 17, 2014

• Cleaned up some unnecessary code

  hthorhalls

  committed
  3b3dea1

  Copy full SHA for 3b3dea1

• Cleaned up some more

  hthorhalls

  committed
  d63185e

  Copy full SHA for d63185e

• Even more cleanup

  hthorhalls

  committed
  e74f6db

  Copy full SHA for e74f6db

• grunnur að main menu

  

  Sölvi Logason

  committed
  6d32b47

  Copy full SHA for 6d32b47

• ný grafík fyrir play skjá

  

  Sölvi Logason

  committed
  f00af2a

  Copy full SHA for f00af2a

Commits on Nov 18, 2014

• 2 Power ups, hopefully bug free

  hthorhalls

  committed
  812e449

  Copy full SHA for 812e449

• Merge branch 'master' into powerups

  hthorhalls

  committed
  93cf162

  Copy full SHA for 93cf162

• Succesful merge of powerups and new graphics

  hthorhalls

  committed
  df989d0

  Copy full SHA for df989d0

• Betrumbætt Bubble fall

  Show description for 30c1bd1
  GunnarPalss

  committed
  30c1bd1

  Copy full SHA for 30c1bd1

• Merged with physics revamp

  hthorhalls

  committed
  8fb7103

  Copy full SHA for 8fb7103

• Lagaði tíma á powerups

  hthorhalls

  committed
  279560a

  Copy full SHA for 279560a

• Added logical levels (more balls) and fixed powerUpbug

  hthorhalls

  committed
  83f7c7b

  Copy full SHA for 83f7c7b

Commits on Nov 19, 2014

• nýjar bakgrunnsmyndir

  BjarkiThor

  committed
  dc2dc8b

  Copy full SHA for dc2dc8b

• Aukalíf, controls og popo

  BjarkiThor

  committed
  b6e4e61

  Copy full SHA for b6e4e61

• Fixes Powerups

  hthorhalls

  committed
  f8601f0

  Copy full SHA for f8601f0

• controls menu og hover i menu

  

  Sölvi Logason

  committed
  ff748ad

  Copy full SHA for ff748ad

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  hthorhalls

  committed
  b51150f

  Copy full SHA for b51150f

• merge conflict fix

  

  Sölvi Logason

  committed
  f9ea124

  Copy full SHA for f9ea124

• merge conflict

  

  Sölvi Logason

  committed
  95365c5

  Copy full SHA for 95365c5

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  a4d404f

  Copy full SHA for a4d404f

• Stærri HönnuHaus

  BjarkiThor

  committed
  74e22ab

  Copy full SHA for 74e22ab

• Added reset functions to the managers

  hthorhalls

  committed
  fb412d7

  Copy full SHA for fb412d7

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  hthorhalls

  committed
  32a69b6

  Copy full SHA for 32a69b6

• líf birtast uppí hornunum

  

  Sölvi Logason

  committed
  e9c06f9

  Copy full SHA for e9c06f9

• Added support for lives

  hthorhalls

  committed
  0056711

  Copy full SHA for 0056711

• backgroundar fyrir hvert level

  

  Sölvi Logason

  committed
  af6f219

  Copy full SHA for af6f219

• Bakgrunnar og powerups

  BjarkiThor

  committed
  0062e15

  Copy full SHA for 0062e15

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  7c16b7d

  Copy full SHA for 7c16b7d

• icons fyrir efst á skjánum

  BjarkiThor

  committed
  a0562e5

  Copy full SHA for a0562e5

• Hanna OST

  BjarkiThor

  committed
  7e3cc82

  Copy full SHA for 7e3cc82

• no insta-death

  GunnarPalss

  committed
  f3883e0

  Copy full SHA for f3883e0

• HönnuQuotes

  BjarkiThor

  committed
  b8ba596

  Copy full SHA for b8ba596

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  BjarkiThor

  committed
  2135fbb

  Copy full SHA for 2135fbb

• Two player virkar

  hthorhalls

  committed
  51de723

  Copy full SHA for 51de723

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  hthorhalls

  committed
  47b7e97

  Copy full SHA for 47b7e97

• ýmis hljóð (forljótur kóði)

  BjarkiThor

  committed
  cb72067

  Copy full SHA for cb72067

• badges

  

  Sölvi Logason

  committed
  672a9ea

  Copy full SHA for 672a9ea

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  48bea70

  Copy full SHA for 48bea70

• PowerUps cleaned up and bug free

  hthorhalls

  committed
  65b4cae

  Copy full SHA for 65b4cae

Commits on Nov 20, 2014

• power up icon minnka með tíma

  

  Sölvi Logason

  authored and

  Sölvi Logason

  committed
  7a8a96e

  Copy full SHA for 7a8a96e

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  authored and

  Sölvi Logason

  committed
  adc9676

  Copy full SHA for adc9676

• Clean up halfdone

  hthorhalls

  committed
  0d64aba

  Copy full SHA for 0d64aba

• Sorrý sölvi

  hthorhalls

  committed
  04c500e

  Copy full SHA for 04c500e

• more cleanup in player, wire and e.manager

  hthorhalls

  committed
  f989ea9

  Copy full SHA for f989ea9

• Merge branch 'master' into cleanup

  hthorhalls

  committed
  36b8348

  Copy full SHA for 36b8348

• Bug free power ups

  hthorhalls

  committed
  225c4a0

  Copy full SHA for 225c4a0

• Fixed issue with two player not starting

  hthorhalls

  committed
  4a5e73b

  Copy full SHA for 4a5e73b

• Wire revamp

  hthorhalls

  committed
  a6f223e

  Copy full SHA for a6f223e

• Bubble revamped

  hthorhalls

  committed
  4b21d9a

  Copy full SHA for 4b21d9a

• Hljóð fært yfir á dauða, controls menu breytt

  BjarkiThor

  committed
  b54a719

  Copy full SHA for b54a719

• Merge remote-tracking branch 'origin/master'

  BjarkiThor

  committed
  597eb63

  Copy full SHA for 597eb63

• Gísli fær núna að tala í friði

  BjarkiThor

  committed
  aabf7fe

  Copy full SHA for aabf7fe

• Cleanup and fixed powerUps moving between levels

  hthorhalls

  committed
  7d5ae17

  Copy full SHA for 7d5ae17

• Extreme makeover, Gísli edition

  BjarkiThor

  committed
  e3cc3fe

  Copy full SHA for e3cc3fe

• Joan Rivers

  BjarkiThor

  committed
  6c818c1

  Copy full SHA for 6c818c1

• cleanUP

  hthorhalls

  committed
  03400fd

  Copy full SHA for 03400fd

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  hthorhalls

  committed
  33f7787

  Copy full SHA for 33f7787

• win og loose screen

  

  Sölvi Logason

  committed
  8866969

  Copy full SHA for 8866969

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  f3a704a

  Copy full SHA for f3a704a

• Playagain feature

  hthorhalls

  committed
  baf6e14

  Copy full SHA for baf6e14

• win screen fix

  

  Sölvi Logason

  committed
  fe2cd33

  Copy full SHA for fe2cd33

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  Show description for 6cf9b82
  

  Sölvi Logason

  committed
  6cf9b82

  Copy full SHA for 6cf9b82

• mute takki

  

  Sölvi Logason

  committed
  5455e2f

  Copy full SHA for 5455e2f

• escape debug

  

  Sölvi Logason

  committed
  8e40107

  Copy full SHA for 8e40107

• Mute ætti að virka núna

  BjarkiThor

  committed
  9e43b4a

  Copy full SHA for 9e43b4a

• error fix

  

  Sölvi Logason

  committed
  5861a63

  Copy full SHA for 5861a63

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  b781a5e

  Copy full SHA for b781a5e

• Mute ætti að virka

  BjarkiThor

  committed
  4d63e08

  Copy full SHA for 4d63e08

• controls final

  BjarkiThor

  committed
  fb502fb

  Copy full SHA for fb502fb

• mute all SFX*

  BjarkiThor

  committed
  4c26bc0

  Copy full SHA for 4c26bc0

• updated win graphic

  

  Sölvi Logason

  committed
  7654ea3

  Copy full SHA for 7654ea3

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  

  Sölvi Logason

  committed
  0f17571

  Copy full SHA for 0f17571

• last minute changes

  hthorhalls

  committed
  a583b07

  Copy full SHA for a583b07

• Merge branch 'master' of https://github.com/halldorbjarni/bubbleTrouble

  hthorhalls

  committed
  d9b6482

  Copy full SHA for d9b6482

Commits on Nov 21, 2014

• compression

  

  Sölvi Logason

  authored and

  Sölvi Logason

  committed
  602af50

  Copy full SHA for 602af50