Merge branch 'Mario/entrap_nade' into 'master'

Merge branch Mario/entrap_nade (M merge request)

Adds a new nade type; Entrap (slows down enemies that enter the large orb, lasts 10 seconds)

See merge request !324

diff --git a/cmake/qcc.sh b/cmake/qcc.sh
index 2e8ea7062576c9fda587f1f44dd4a892d25353f5..b7c77fd563a35a24ca2b4c1c1b5a4319861b5d52 100755 (executable)
--- a/cmake/qcc.sh
+++ b/cmake/qcc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 CPP=${CPP:-cpp}
 QCC=${QCC:-$PWD/../../gmqcc/gmqcc${CMAKE_EXECUTABLE_SUFFIX}}
 case $1 in

diff --git a/qcsrc/tools/qcc.sh b/qcsrc/tools/qcc.sh
index 40223c113a85281b1a641aa0b0bffa82b1bbb40f..b115c196ecc75f4bb1ea0bcef52c15f962b9169c 100755 (executable)
--- a/qcsrc/tools/qcc.sh
+++ b/qcsrc/tools/qcc.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 IFS=$' \n\t'