Repository navigation

Testing git/slack integration - #1

Open

gitdev481 wants to merge 43 commits into

gitdev481:masterfrom

GREEDYHD:master

Open

Testing git/slack integration#1
gitdev481 wants to merge 43 commits into
gitdev481:masterfrom
GREEDYHD:master

Commits on Feb 21, 2016
Commits on Feb 22, 2016
- Testing Slack integration
  GREEDYHD
  committed
  7f8b0ec
- Testing Github/Slack Integration v2
  gitdev481
  committed
  38b11cb
Commits on Feb 23, 2016
- New PlayerHUD Prototype
  gitdev481
  committed
  0cf763b
- Holes work + 2 players in
  normyp
  committed
  40e9864
- Players now collide properly with holes
  normyp
  committed
  e7fcff5
- Allowed sprite swapping for multiple players
  gitdev481
  committed
  741a24a
- Revert "Allowed sprite swapping for multiple players"
  gitdev481
  committed
  45328d5
- Re-attempting previous commit due to Scene conflict
  gitdev481
  committed
  3f33b6c
- Increased the size of the player's hitbox
  gitdev481
  committed
  be8aac7
Commits on Feb 24, 2016
- Added in a basic walled arena
  gitdev481
  committed
  be6e859
- HUD now hidden by default, use back button to enable
  gitdev481
  committed
  60299eb
Commits on Feb 26, 2016
- Added in Giorgio's code from 24/02/
  gitdev481
  committed
  686f85d
Commits on Feb 28, 2016
Commits on Mar 1, 2016
- Disabled old playerHUDs from the oldHUD.
  gitdev481
  committed
  83866c1
- Players can now die
  gitdev481
  committed
  d85d64b
- Cleaned up game object hierarchy and put the timer script on the timer
  gitdev481
  committed
  41fcd36
- Stat Tracker attached to player.
  normyp
  committed
  eefda23
- Merge branch 'master' of https://github.com/GREEDYHD/ShellShock
  normyp
  committed
  f87859b
- Players can now respawn after dying.
  gitdev481
  committed
  e7a20cb
- Merge remote-tracking branch 'origin/master'
  gitdev481
  committed
  187456c
- Fixed reticle disabling/enabling during player respawn
  gitdev481
  committed
  9940a61
- Package
  normyp
  committed
  5640bf1
- Hopefully fixed the conflicts
  normyp
  committed
  66df8d7
- Revert "Hopefully fixed the conflicts"
  gitdev481
  committed
  d8ee66b
- Revert "Package"
  gitdev481
  committed
  8df22b0
- Fixed Player 2's pistol, and the resetting of ammo and HP sliders
  gitdev481
  committed
  81f5168
- Revert "Revert "Hopefully fixed the conflicts""
  gitdev481
  committed
  c55090d
- Revert "Revert "Package""
  gitdev481
  committed
  d94d97d
- Player 1's ammo count and slider now positioned correctly. Also re-reverted (added) Pauls stuff in
  gitdev481
  committed
  df2273d
Commits on Mar 2, 2016
- Players can now score points (work in progress)
  gitdev481
  committed
  d02fab5
- Player's default weapon is now pistol with infinite ammo
  gitdev481
  committed
  c6066d7
- Players now get -1 for a suicide
  gitdev481
  committed
  47a13fe
- Helicopter now has its own sorting layer, disabled ammo count text
  gitdev481
  committed
  88e78e3
- Grenade damage
  GiorgioBufa
  committed
  f7c68f8
- Added ShellShock namespace to every script and set up namespaces correctly in every script for ArmadHeroes push preparation
  gitdev481
  committed
  60034e1