Server centred update

COPYING

@@ -36,3 +36,21 @@ assets/ui/main_menu_music/Black_mistUntiteled_3.ogg:
 
 assets/ui/main_menu_music/Granger_Foley_v1.ogg:
     by Akane licensed CC-BY-SA-2.5
+
+assets/fonts/font:
+    Teko (Regular) by Indian Type Foundry licensed under the Open Font License.
+
+assets/fonts/smallfont:
+    Teko (Light) by Indian Type Foundry licensed under the Open Font License.
+
+assets/fonts/bigfont:
+    Electrolize (Regular) by Gaslight licensed under the Open Font License.
+
+assets/fonts/chat:
+    Rajdhani (Medium) by Indian Type Foundry licensed under the Open Font License.
+
+assets/fonts/alien:
+    Audiowide (Regular) by Astigmatic licensed under the Open Font License.
+
+assets/fonts/human:
+    Orbitron (Regular) by Matt McInerney licensed under the Open Font License.

Makefile

@@ -436,7 +436,7 @@ ifeq ($(PLATFORM),darwin)
   OPTIMIZEVM=
   #CXXFLAGS+=-stdlib=libc++
 
-  # FIXME This is probably bad idea to comment this out 
+  # FIXME This is probably bad idea to comment this out
   #BASE_CFLAGS += -mmacosx-version-min=10.7 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070
 
   GRANGER_LIBS = -framework Cocoa -framework Security
@@ -522,7 +522,7 @@ ifeq ($(PLATFORM),darwin)
   SHLIBCFLAGS=-fPIC -fno-common
   #SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec
   SHLIBLDFLAGS=-dynamiclib -Wl,-U,_com_altivec
- 
+
   NOTSHLIBCFLAGS=-mdynamic-no-pic
 
 else # ifeq darwin
@@ -604,7 +604,7 @@ ifdef MINGW
       CLIENT_LDFLAGS += $(OPENAL_LDFLAGS)
     endif
     ifeq ($(USE_LOCAL_HEADERS),1)
-    CLIENT_CFLAGS += -I$(ALHDIR) 
+    CLIENT_CFLAGS += -I$(ALHDIR)
     endif
   endif
 
@@ -1470,7 +1470,7 @@ ifeq ($(ARCH),x86)
 endif
 endif
 
-GRANGER_CFLAGS += $(ARCHFLAG) -fPIC -fpic $(LUACFLAGS) 
+GRANGER_CFLAGS += $(ARCHFLAG) -fPIC -fpic $(LUACFLAGS)
 
 ifeq ($(PLATFORM),darwin)
 GRANGER_CFLAGS += -DLUA_USE_MACOSX
@@ -1556,7 +1556,7 @@ endef
   $(Q)$(call EXEC_CC,-std=gnu99 -DGRANGER ${GRANGER_CFLAGS} ${OPTIMIZE},'$@','$<')
   $(Q)$(call LOG_CC,granger,-std=gnu99 ${GRANGER_CFLAGS} ${OPTIMIZE},$@,$<)
 endef
- 
+
 $(B)/granger.dir/src/lua/%.o: $(LUADIR)/%.c
 	$(DO_GRANGER_CC)
 
@@ -1574,7 +1574,7 @@ $(B)/granger.dir/src/%.o: $(GRANGERDIR)/%.cpp
 
 $(B)/granger$(FULLBINEXT): $(GRANGEROBJ)
 	$(echo_cmd) "LD $@"
-	$(Q)$(CC) $(LDFLAGS) -o $@ $(GRANGEROBJ) $(GRANGER_LIBS) 
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(GRANGEROBJ) $(GRANGER_LIBS)
 
 ifneq ($(BUILD_GRANGER),0)
 TARGETS += $(B)/granger$(FULLBINEXT)
@@ -1734,7 +1734,7 @@ $(B)/nettle/%.o: $(NETTLEDIR)/nettle/%.c
 	$(DO_NETTLE_CC)
 
 #############################################################################
-# Semver 
+# Semver
 #############################################################################
 
 SEMVERCFLAGS=$(ARCHFLAG) -fPIC -fpic -I$(SEMVERDIR)/src/include
@@ -1773,6 +1773,7 @@ Q3OBJ = \
   $(B)/client/cl_scrn.o \
   $(B)/client/cl_ui.o \
   $(B)/client/cl_updates.o \
+  $(B)/client/cl_feedback.o \
   $(B)/client/cl_rest.o \
   $(B)/client/cl_avi.o \
   \
@@ -2274,7 +2275,7 @@ ifneq ($(USE_RENDERER_DLOPEN),0)
 $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN)
 	$(echo_cmd) "LD $@"
 	$(Q)$(CXX) -std=c++1y $(CXXFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(Q3OBJ) \
-		$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) -o $@ 
+		$(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) -o $@
 
 $(B)/renderer_opengl1$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ)
 	$(echo_cmd) "LD $@"
@@ -2447,6 +2448,7 @@ CGOBJ_ = \
   $(B)/$(BASEGAME)/cgame/cg_particles.o \
   $(B)/$(BASEGAME)/cgame/cg_tutorial.o \
   $(B)/$(BASEGAME)/cgame/cg_rangemarker.o \
+  $(B)/$(BASEGAME)/cgame/cg_feedback.o \
   $(B)/$(BASEGAME)/cgame/ui_shared.o \
   \
   $(B)/$(BASEGAME)/qcommon/q_math.o \
@@ -2497,6 +2499,7 @@ CGOBJ11_ = \
   $(B)/$(BASEGAME)/cgame/cg_particles.o \
   $(B)/$(BASEGAME)/cgame/cg_tutorial.o \
   $(B)/$(BASEGAME)/cgame/cg_rangemarker.o \
+  $(B)/$(BASEGAME)/cgame/cg_feedback.o \
   $(B)/$(BASEGAME)/cgame/ui_shared.o \
   \
   $(B)/$(BASEGAME)/qcommon/q_math.o \
@@ -2618,7 +2621,7 @@ $(B)/$(BASEGAME)_11/vm/ui.qvm: $(UIVMOBJ11) $(UIDIR)/ui_syscalls_11.asm $(Q3ASM)
 $(B)/$(BASEGAME)/vms-gpp-$(VERSION).pk3: $(B)/$(BASEGAME)/vm/ui.qvm $(B)/$(BASEGAME)/vm/cgame.qvm $(B)/$(BASEGAME)/vm/game.qvm
 	@(cd $(B)/$(BASEGAME) && zip -r vms-$(VERSION).pk3 vm/)
 
-$(B)/$(BASEGAME)_11/vms-1.1.0-$(VERSION).pk3: $(B)/$(BASEGAME)_11/vm/ui.qvm $(B)/$(BASEGAME)_11/vm/cgame.qvm 
+$(B)/$(BASEGAME)_11/vms-1.1.0-$(VERSION).pk3: $(B)/$(BASEGAME)_11/vm/ui.qvm $(B)/$(BASEGAME)_11/vm/cgame.qvm
 	@(cd $(B)/$(BASEGAME)_11 && zip -r vms-$(VERSION).pk3 vm/)
 
 

assets/configs/classes/builder.cfg

@@ -11,6 +11,7 @@ crouchMaxs        20 20 20
 deadMins          -20 -20 -4
 deadMaxs          20 20 4
 zOffset           0.0
+spriteOffset      -8.0
 
 viewheight        0
 crouchViewheight  0

assets/configs/classes/builderupg.cfg

@@ -11,6 +11,7 @@ crouchMaxs        20 20 20
 deadMins          -20 -20 -4
 deadMaxs          20 20 4
 zOffset           0.0
+spriteOffset      -8.0
 
 viewheight        0
 crouchViewheight  0

assets/configs/classes/human_base.cfg

@@ -11,6 +11,7 @@ crouchMaxs        15 15 16
 deadMins          -15 -15 -4
 deadMaxs          15 15 4
 zOffset           -2.0
+spriteOffset      6.0
 
 viewheight        24
 crouchViewheight  7

assets/configs/classes/human_bsuit.cfg

@@ -11,6 +11,7 @@ crouchMaxs        15 15 38
 deadMins          -15 -15 -4
 deadMaxs          15 15 4
 zOffset           -16.0
+spriteOffset      8.0
 
 viewheight        29
 crouchViewheight  29

assets/configs/classes/level0.cfg

@@ -11,6 +11,7 @@ crouchMaxs        15 15 15
 deadMins          -15 -15 -15
 deadMaxs          15 15 15
 zOffset           -5.0
+spriteOffset      0.0
 
 viewheight        0
 crouchViewheight  0

assets/configs/classes/level1.cfg

@@ -11,6 +11,7 @@ crouchMaxs        18 18 18
 deadMins          -18 -18 -4
 deadMaxs          18 18 4
 zOffset           0.0
+spriteOffset      0.0
 
 viewheight        0
 crouchViewheight  0

assets/configs/classes/level1upg.cfg

@@ -11,6 +11,7 @@ crouchMaxs        21 21 21
 deadMins          -21 -21 -4.666
 deadMaxs          21 21 4.666
 zOffset           0.0
+spriteOffset      0.0
 
 viewheight        0
 crouchViewheight  0

assets/configs/classes/level2.cfg

@@ -11,6 +11,7 @@ crouchMaxs        23 23 14
 deadMins          -23 -23 -4
 deadMaxs          23 23 4
 zOffset           0.0
+spriteOffset      0.0
 
 viewheight        8
 crouchViewheight  8

assets/configs/classes/level2upg.cfg

@@ -11,6 +11,7 @@ crouchMaxs        25 25 16
 deadMins          -25 -25 -4
 deadMaxs          25 25 4
 zOffset           0.0
+spriteOffset      0.0
 
 viewheight        10
 crouchViewheight  10

assets/configs/classes/level3.cfg

@@ -11,6 +11,7 @@ crouchMaxs        26 26 32
 deadMins          -26 -26 -4
 deadMaxs          26 26 4
 zOffset           0.0
+spriteOffset      8.0
 
 viewheight        24
 crouchViewheight  24

assets/configs/classes/level3upg.cfg

@@ -11,6 +11,7 @@ crouchMaxs        29 29 38
 deadMins          -29 -29 -4
 deadMaxs          29 29 4
 zOffset           0.0
+spriteOffset      8.0
 
 viewheight        27
 crouchViewheight  27

assets/configs/classes/level4.cfg

@@ -11,6 +11,7 @@ crouchMaxs        32 32 70
 deadMins          -32 -32 -34
 deadMaxs          32 32 34
 zOffset           0.0
+spriteOffset      32.0
 
 viewheight        64
 crouchViewheight  64

assets/configs/classes/spectator.cfg

@@ -11,6 +11,7 @@ crouchMaxs        15 15 15
 deadMins          -15 -15 -15
 deadMaxs          15 15 15
 zOffset           0.0
+spriteOffset      0.0
 
 viewheight        0
 crouchViewheight  0