Merge branch 'master' of https://github.com/eternalcodes/EternalJK

eternalcodes · Oct 10, 2018 · 2af3821 · 2af3821
2 parents f6882ab + 5aa4d58
commit 2af3821
Show file tree

Hide file tree

Showing 21 changed files with 317 additions and 164 deletions.
diff --git a/assets/japro/shaders/japro.shader b/assets/japro/shaders/japro.shader
@@ -57,7 +57,7 @@ gfx/effects/sabers/RGBGlow
 {	
 	nopicmip
 	notc
-	cull	twosided
+	cull twosided
 	{
 		map gfx/effects/sabers/RGBGlow
 		blendFunc GL_ONE GL_ONE
@@ -71,7 +71,7 @@ gfx/effects/sabers/RGBCore
 {
 	nopicmip
 	notc
-	cull	twosided
+	cull twosided
 	{
 		map gfx/effects/sabers/RGBCore
 		blendFunc GL_ONE GL_ONE
@@ -157,17 +157,17 @@ gfx/2d/numbers/eight
 {
 	nopicmip
 	{
-			map gfx/2d/numbers/eight
-	blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		map gfx/2d/numbers/eight
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 	}
 }
 
 gfx/2d/numbers/nine
 {
 	nopicmip
 	{
-			map gfx/2d/numbers/nine
-	blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		map gfx/2d/numbers/nine
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
 	}
 }
 
@@ -184,7 +184,7 @@ gfx/2d/minimap
 
 gfx/effects/grapple_line
 {
-	cull	twosided
+	cull twosided
 	{
 		map gfx/effects/grapple_line
 		blendFunc GL_ONE GL_ONE
@@ -195,6 +195,9 @@ gfx/effects/grapple_line
 gfx/hud/jk2hudleft
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/static5
 		blendFunc GL_ONE GL_ONE
@@ -205,6 +208,7 @@ gfx/hud/jk2hudleft
 		map gfx/hud/static8
 		blendFunc GL_ONE GL_ONE
 		rgbGen vertex
+
 	}
 	{
 		map gfx/hud/jk2hudleft
@@ -216,6 +220,9 @@ gfx/hud/jk2hudleft
 gfx/hud/jk2hudleft_innerframe
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/jk2hudleft_innerframe
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -226,7 +233,9 @@ gfx/hud/jk2hudleft_innerframe
 gfx/hud/prong_off
 {
 	nopicmip
-	cull	disable
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/prong_off
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -237,6 +246,9 @@ gfx/hud/prong_off
 gfx/hud/prong_on_weap
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/prong_on_w
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -247,6 +259,9 @@ gfx/hud/prong_on_weap
 gfx/hud/prong_on_item
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/prong_on_i
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -257,6 +272,9 @@ gfx/hud/prong_on_item
 gfx/hud/prong_on_force
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/prong_on_f
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -267,6 +285,9 @@ gfx/hud/prong_on_force
 gfx/hud/jk2hudrightframe
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/static5
 		blendFunc GL_ONE GL_ONE
@@ -288,6 +309,9 @@ gfx/hud/jk2hudrightframe
 gfx/hud/jk2hudright_innerframe
 {
 	nopicmip
+	nomipmaps
+	notc
+	cull disable
 	{
 		map gfx/hud/jk2hudright_innerframe
 		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -299,7 +323,8 @@ gfx/hud/saber_stylesfast
 {
 	nopicmip
 	nomipmaps
-	cull	disable
+	notc
+	cull disable
 	{
 		map gfx/hud/saber_stylesfast
 		blendFunc GL_ONE GL_ONE
@@ -311,7 +336,8 @@ gfx/hud/saber_stylesmed
 {
 	nopicmip
 	nomipmaps
-	cull	disable
+	notc
+	cull disable
 	{
 		map gfx/hud/saber_stylesmed
 		blendFunc GL_ONE GL_ONE
@@ -323,7 +349,8 @@ gfx/hud/saber_stylesstrong
 {
 	nopicmip
 	nomipmaps
-	cull	disable
+	notc
+	cull disable
 	{
 		map gfx/hud/saber_stylesstrong
 		blendFunc GL_ONE GL_ONE
@@ -335,7 +362,8 @@ gfx/hud/saber_stylesstaff
 {
 	nopicmip
 	nomipmaps
-	cull	disable
+	notc
+	cull disable
 	{
 		map gfx/hud/saber_stylesstaff
 		blendFunc GL_ONE GL_ONE
@@ -347,6 +375,7 @@ gfx/hud/i_icon_healthdisp
 {
 	nopicmip
 	nomipmaps
+	notc
 	cull disable
 	{
 		map gfx/hud/i_icon_healthdisp.tga
@@ -359,6 +388,7 @@ gfx/hud/i_icon_ammodisp
 {
 	nopicmip
 	nomipmaps
+	notc
 	cull disable
 	{
 		map gfx/hud/i_icon_ammodisp.tga

diff --git a/codemp/cgame/cg_consolecmds.c b/codemp/cgame/cg_consolecmds.c
@@ -905,12 +905,12 @@ static void CG_Lowjump_f(void)
 static void CG_NorollDown_f(void)
 {
 	if ((cgs.isJAPro && cg.predictedPlayerState.stats[STAT_RACEMODE]) || (cgs.restricts & RESTRICT_DO)) {
-		trap->SendConsoleCommand("+speed;wait 2;+movedown;-speed\n");
+		trap->SendConsoleCommand("+speed;wait 2;-moveup;+movedown;-speed\n");
 		return;
 	}
 
 	trap->SendConsoleCommand("+speed\n");
-	Com_sprintf(cg.doVstr, sizeof(cg.doVstr), "+movedown;-speed\n");
+	Com_sprintf(cg.doVstr, sizeof(cg.doVstr), "-moveup;+movedown;-speed\n");
 	cg.doVstrTime = cg.time;
 }
 
@@ -1212,7 +1212,7 @@ static qboolean japroPlayerStyles[] = {
 	qtrue,//LOD player model
 	qtrue,//Fade corpses immediately
 	qtrue,//Disable corpse fading SFX
-	//qfalse//Santa Hat
+	qtrue//Color respawn bubbles by team
 };
 
 //JA+ Specific = amaltdim ?
@@ -1233,7 +1233,7 @@ static qboolean japlusPlayerStyles[] = {
 	qtrue,//LOD player model
 	qtrue,//Fade corpses immediately
 	qtrue,//Disable corpse fading SFX
-	//qfalse
+	qtrue//Color respawn bubbles by team
 };
 
 static bitInfo_T playerStyles[] = { // MAX_WEAPON_TWEAKS tweaks (24)
@@ -1249,10 +1249,10 @@ static bitInfo_T playerStyles[] = { // MAX_WEAPON_TWEAKS tweaks (24)
 	{ "VFX am alt dim 1" },//9
 	{ "Hide non duelers" },//10
 	{ "Hide ysal shell" },//11
-	{ "LOD player model"},//12 need better name for this
+	{ "LOD player model" },//12 need better name for this
 	{ "Fade corpses immediately" },//13
 	{ "Disable corpse fading SFX" },//14
-	//{ "Santa hat" }//15
+	{ "Color respawn bubbles by team" }//15
 };
 static const int MAX_PLAYERSTYLES = ARRAY_LEN(playerStyles);
 
@@ -1310,7 +1310,7 @@ void CG_StylePlayer_f(void)
 
 		//if (index == ..., ...)
 		if (0) { //Radio button these options
-																					 //Toggle index, and make sure everything else in this group (0,1,2,3,13) is turned off
+			//Toggle index, and make sure everything else in this group (0,1,2,3,13) is turned off
 			int groupMask = (1 << 0) + (1 << 1) + (1 << 2) + (1 << 3) + (1 << 13);
 			int value = cg_strafeHelper.integer;
 
@@ -2035,6 +2035,8 @@ static const char *gcmds[] = {
 	"clanInfo",
 	"clanWhoIs",
 	"say_team_mod",
+	"master",
+	"masterlist",
 	"amForceTeam",
 	"amLockTeam",
 	"amWhois",

diff --git a/codemp/cgame/cg_cvar.c b/codemp/cgame/cg_cvar.c
@@ -23,9 +23,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 #include "cg_local.h"
 
-int strafeHelperActiveColorModificationCount = -1;//japro
-int enginePatchModificationCount = -1; //japro
-
 //
 // Cvar callbacks
 //