bounce pads
Merge branch 'bouncepad' into ddwar_noadmin

Conflicts:
	src/game/collision.cpp
	src/game/server/gamemodes/mod.cpp
	src/game/variables.h
last bounce tick on a per player basis
Merge branch 'bouncepad' into ddwar_noadmin

Conflicts:
	src/game/server/gamemodes/mod.cpp
last weapon = active weapon if we do not have it
hammer spam -> take away hammer for some time
Merge branch 'hammerspam' into ddwar_noadmin

Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/character.h
	src/game/server/gamemodes/mod.cpp
	src/game/variables.h
loltext on too much chatkill
forgot actual hammerscore decrement o_O
Merge branch 'hammerspam' into ddwar_noadmin

Conflicts:
	src/game/server/entities/character.cpp
Merge branch 'ddwar' into ddwar_noadmin
Merge remote branch 'eeeee/ddwar' into ddwar_noadmin
Merge branch 'master' into ddwar_noadmin
Merge branch 'account' into ddwar_noadmin

Conflicts:
	bam.lua
	src/game/version.h
Merge branch 'ddwar' into ddwar_noadmin
Merge remote-tracking branch 'eeeee/ddwar' into ddwar_noadmin
Merge branch 'ddwar' into ddwar_noadmin
Merge branch 'ddwar' into ddwar_noadmin
Merge branch 'ddwar' into ddwar_noadmin
Merge remote-tracking branch 'eeeee/ddwar' into ddwar_noadmin