Skip to content

Commit 2af3821

Browse files
videoPvideoP
committed
2 parents f6882ab + 5aa4d58 commit 2af3821

21 files changed

+317
-164
lines changed

‎assets/japro/shaders/japro.shader

+42-12
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ gfx/effects/sabers/RGBGlow
5757
{
5858
nopicmip
5959
notc
60-
cull twosided
60+
cull twosided
6161
{
6262
map gfx/effects/sabers/RGBGlow
6363
blendFunc GL_ONE GL_ONE
@@ -71,7 +71,7 @@ gfx/effects/sabers/RGBCore
7171
{
7272
nopicmip
7373
notc
74-
cull twosided
74+
cull twosided
7575
{
7676
map gfx/effects/sabers/RGBCore
7777
blendFunc GL_ONE GL_ONE
@@ -157,17 +157,17 @@ gfx/2d/numbers/eight
157157
{
158158
nopicmip
159159
{
160-
map gfx/2d/numbers/eight
161-
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
160+
map gfx/2d/numbers/eight
161+
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
162162
}
163163
}
164164

165165
gfx/2d/numbers/nine
166166
{
167167
nopicmip
168168
{
169-
map gfx/2d/numbers/nine
170-
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
169+
map gfx/2d/numbers/nine
170+
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
171171
}
172172
}
173173

@@ -184,7 +184,7 @@ gfx/2d/minimap
184184

185185
gfx/effects/grapple_line
186186
{
187-
cull twosided
187+
cull twosided
188188
{
189189
map gfx/effects/grapple_line
190190
blendFunc GL_ONE GL_ONE
@@ -195,6 +195,9 @@ gfx/effects/grapple_line
195195
gfx/hud/jk2hudleft
196196
{
197197
nopicmip
198+
nomipmaps
199+
notc
200+
cull disable
198201
{
199202
map gfx/hud/static5
200203
blendFunc GL_ONE GL_ONE
@@ -205,6 +208,7 @@ gfx/hud/jk2hudleft
205208
map gfx/hud/static8
206209
blendFunc GL_ONE GL_ONE
207210
rgbGen vertex
211+
208212
}
209213
{
210214
map gfx/hud/jk2hudleft
@@ -216,6 +220,9 @@ gfx/hud/jk2hudleft
216220
gfx/hud/jk2hudleft_innerframe
217221
{
218222
nopicmip
223+
nomipmaps
224+
notc
225+
cull disable
219226
{
220227
map gfx/hud/jk2hudleft_innerframe
221228
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -226,7 +233,9 @@ gfx/hud/jk2hudleft_innerframe
226233
gfx/hud/prong_off
227234
{
228235
nopicmip
229-
cull disable
236+
nomipmaps
237+
notc
238+
cull disable
230239
{
231240
map gfx/hud/prong_off
232241
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -237,6 +246,9 @@ gfx/hud/prong_off
237246
gfx/hud/prong_on_weap
238247
{
239248
nopicmip
249+
nomipmaps
250+
notc
251+
cull disable
240252
{
241253
map gfx/hud/prong_on_w
242254
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -247,6 +259,9 @@ gfx/hud/prong_on_weap
247259
gfx/hud/prong_on_item
248260
{
249261
nopicmip
262+
nomipmaps
263+
notc
264+
cull disable
250265
{
251266
map gfx/hud/prong_on_i
252267
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -257,6 +272,9 @@ gfx/hud/prong_on_item
257272
gfx/hud/prong_on_force
258273
{
259274
nopicmip
275+
nomipmaps
276+
notc
277+
cull disable
260278
{
261279
map gfx/hud/prong_on_f
262280
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -267,6 +285,9 @@ gfx/hud/prong_on_force
267285
gfx/hud/jk2hudrightframe
268286
{
269287
nopicmip
288+
nomipmaps
289+
notc
290+
cull disable
270291
{
271292
map gfx/hud/static5
272293
blendFunc GL_ONE GL_ONE
@@ -288,6 +309,9 @@ gfx/hud/jk2hudrightframe
288309
gfx/hud/jk2hudright_innerframe
289310
{
290311
nopicmip
312+
nomipmaps
313+
notc
314+
cull disable
291315
{
292316
map gfx/hud/jk2hudright_innerframe
293317
blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
@@ -299,7 +323,8 @@ gfx/hud/saber_stylesfast
299323
{
300324
nopicmip
301325
nomipmaps
302-
cull disable
326+
notc
327+
cull disable
303328
{
304329
map gfx/hud/saber_stylesfast
305330
blendFunc GL_ONE GL_ONE
@@ -311,7 +336,8 @@ gfx/hud/saber_stylesmed
311336
{
312337
nopicmip
313338
nomipmaps
314-
cull disable
339+
notc
340+
cull disable
315341
{
316342
map gfx/hud/saber_stylesmed
317343
blendFunc GL_ONE GL_ONE
@@ -323,7 +349,8 @@ gfx/hud/saber_stylesstrong
323349
{
324350
nopicmip
325351
nomipmaps
326-
cull disable
352+
notc
353+
cull disable
327354
{
328355
map gfx/hud/saber_stylesstrong
329356
blendFunc GL_ONE GL_ONE
@@ -335,7 +362,8 @@ gfx/hud/saber_stylesstaff
335362
{
336363
nopicmip
337364
nomipmaps
338-
cull disable
365+
notc
366+
cull disable
339367
{
340368
map gfx/hud/saber_stylesstaff
341369
blendFunc GL_ONE GL_ONE
@@ -347,6 +375,7 @@ gfx/hud/i_icon_healthdisp
347375
{
348376
nopicmip
349377
nomipmaps
378+
notc
350379
cull disable
351380
{
352381
map gfx/hud/i_icon_healthdisp.tga
@@ -359,6 +388,7 @@ gfx/hud/i_icon_ammodisp
359388
{
360389
nopicmip
361390
nomipmaps
391+
notc
362392
cull disable
363393
{
364394
map gfx/hud/i_icon_ammodisp.tga

‎codemp/cgame/cg_consolecmds.c

+9-7
Original file line numberDiff line numberDiff line change
@@ -905,12 +905,12 @@ static void CG_Lowjump_f(void)
905905
static void CG_NorollDown_f(void)
906906
{
907907
if ((cgs.isJAPro && cg.predictedPlayerState.stats[STAT_RACEMODE]) || (cgs.restricts & RESTRICT_DO)) {
908-
trap->SendConsoleCommand("+speed;wait 2;+movedown;-speed\n");
908+
trap->SendConsoleCommand("+speed;wait 2;-moveup;+movedown;-speed\n");
909909
return;
910910
}
911911

912912
trap->SendConsoleCommand("+speed\n");
913-
Com_sprintf(cg.doVstr, sizeof(cg.doVstr), "+movedown;-speed\n");
913+
Com_sprintf(cg.doVstr, sizeof(cg.doVstr), "-moveup;+movedown;-speed\n");
914914
cg.doVstrTime = cg.time;
915915
}
916916

@@ -1212,7 +1212,7 @@ static qboolean japroPlayerStyles[] = {
12121212
qtrue,//LOD player model
12131213
qtrue,//Fade corpses immediately
12141214
qtrue,//Disable corpse fading SFX
1215-
//qfalse//Santa Hat
1215+
qtrue//Color respawn bubbles by team
12161216
};
12171217

12181218
//JA+ Specific = amaltdim ?
@@ -1233,7 +1233,7 @@ static qboolean japlusPlayerStyles[] = {
12331233
qtrue,//LOD player model
12341234
qtrue,//Fade corpses immediately
12351235
qtrue,//Disable corpse fading SFX
1236-
//qfalse
1236+
qtrue//Color respawn bubbles by team
12371237
};
12381238

12391239
static bitInfo_T playerStyles[] = { // MAX_WEAPON_TWEAKS tweaks (24)
@@ -1249,10 +1249,10 @@ static bitInfo_T playerStyles[] = { // MAX_WEAPON_TWEAKS tweaks (24)
12491249
{ "VFX am alt dim 1" },//9
12501250
{ "Hide non duelers" },//10
12511251
{ "Hide ysal shell" },//11
1252-
{ "LOD player model"},//12 need better name for this
1252+
{ "LOD player model" },//12 need better name for this
12531253
{ "Fade corpses immediately" },//13
12541254
{ "Disable corpse fading SFX" },//14
1255-
//{ "Santa hat" }//15
1255+
{ "Color respawn bubbles by team" }//15
12561256
};
12571257
static const int MAX_PLAYERSTYLES = ARRAY_LEN(playerStyles);
12581258

@@ -1310,7 +1310,7 @@ void CG_StylePlayer_f(void)
13101310

13111311
//if (index == ..., ...)
13121312
if (0) { //Radio button these options
1313-
//Toggle index, and make sure everything else in this group (0,1,2,3,13) is turned off
1313+
//Toggle index, and make sure everything else in this group (0,1,2,3,13) is turned off
13141314
int groupMask = (1 << 0) + (1 << 1) + (1 << 2) + (1 << 3) + (1 << 13);
13151315
int value = cg_strafeHelper.integer;
13161316

@@ -2035,6 +2035,8 @@ static const char *gcmds[] = {
20352035
"clanInfo",
20362036
"clanWhoIs",
20372037
"say_team_mod",
2038+
"master",
2039+
"masterlist",
20382040
"amForceTeam",
20392041
"amLockTeam",
20402042
"amWhois",

‎codemp/cgame/cg_cvar.c

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
2323

2424
#include "cg_local.h"
2525

26-
int strafeHelperActiveColorModificationCount = -1;//japro
27-
int enginePatchModificationCount = -1; //japro
28-
2926
//
3027
// Cvar callbacks
3128
//

0 commit comments

Comments
 (0)