Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Japro update #166

Merged
merged 528 commits into from
Mar 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
528 commits
Select commit Hold shift + click to select a range
26687b7
damagenumbers improvement, mandatory checkpoint logic improvement
videoP Dec 30, 2023
0e8d666
fix damage number for npc
videoP Dec 30, 2023
a6b6a49
typo fix
videoP Dec 30, 2023
b87bab3
add courseid to checkpoints for eventual mandatory checkpoint
videoP Dec 30, 2023
543b3ff
Update japro_docs.md
videoP Dec 30, 2023
97ac7d4
Update w_force.c
videoP Dec 30, 2023
aaee113
Merge branch 'master' of https://github.com/videoP/jaPRO
videoP Dec 30, 2023
d92ffe1
deadstop fix for mv_tribes?
videoP Dec 30, 2023
662fd65
shield nerf tribes
videoP Dec 30, 2023
c450da3
ability to unset checkpoints
videoP Dec 30, 2023
a5fe468
tribes wep tweaks, dodgemove
videoP Dec 31, 2023
291f5ee
dodge tweak
videoP Dec 31, 2023
181aba7
tribes dodge tweak
videoP Dec 31, 2023
55c23d4
tribes weapon tweaks
videoP Dec 31, 2023
1503a42
oops
videoP Dec 31, 2023
ebf1c84
wep tweak
videoP Dec 31, 2023
a69e9ac
oops
videoP Dec 31, 2023
4858ad3
tribes wep tweaks, no more mortar weapontweak its part of tribes now
videoP Dec 31, 2023
299bcc7
rocket fix
videoP Dec 31, 2023
527caba
rewrite firetime overwrites
videoP Dec 31, 2023
697080a
redeemer tribes tweakz
videoP Dec 31, 2023
e9c0229
Update g_weapon.c
videoP Dec 31, 2023
af6f4f6
dashfix?
videoP Dec 31, 2023
6b30b7b
epic
videoP Dec 31, 2023
befafa5
fix redeemer tribes
videoP Dec 31, 2023
7d50281
buff dodge
videoP Dec 31, 2023
b9c8502
dodge uses fuel
videoP Dec 31, 2023
77f1cac
ep
videoP Dec 31, 2023
3215327
s6
videoP Jan 1, 2024
4b0cb0e
Update g_trigger.c
videoP Jan 1, 2024
68a8595
Update g_trigger.c
videoP Jan 1, 2024
2109e12
s6
videoP Jan 1, 2024
9fad975
splashdmg flag, edgebug fix option (test)
videoP Jan 1, 2024
9238cef
epic
videoP Jan 1, 2024
d422e76
1flag ctf
videoP Jan 2, 2024
fc360da
flagpunt nerf, racemode ctf fix?
videoP Jan 2, 2024
7b1babe
g_neutralflag 5 for other style of 1flagctf
videoP Jan 3, 2024
1c4a2a9
1flagctf timers
videoP Jan 3, 2024
40108ed
checkpoint and neutral flag timer tweak
videoP Jan 3, 2024
0fee2e4
timerfix
videoP Jan 3, 2024
a66aa79
add fix explosive hitbox as a wt
videoP Jan 3, 2024
15b779d
spawnflags 256 + 4 on newpush for absolute z vel
videoP Jan 3, 2024
e3d47b2
allowedstyle for trigger_newpush
videoP Jan 3, 2024
6d48af8
auto return pitted flags even if there is no surf_nodrop
videoP Jan 4, 2024
00c9a15
strange return fix?
videoP Jan 4, 2024
a5adda1
bug?
videoP Jan 4, 2024
1b07e2e
ok
videoP Jan 4, 2024
1318add
flag splash knockback fix, bounce fix
videoP Jan 4, 2024
5abc945
fixes from tom
videoP Jan 5, 2024
df0345d
tribes class system test
videoP Jan 5, 2024
db1c35b
tribes class fix
videoP Jan 5, 2024
7283346
tribes heavy hitbox
videoP Jan 5, 2024
3eba4ac
tribes class fix
videoP Jan 5, 2024
e678a76
modelname c hange
videoP Jan 5, 2024
7a5fced
tribes tweaks
videoP Jan 6, 2024
5baae4f
tribes balance
videoP Jan 6, 2024
a5f7486
tayst fix 1stperson ski view
videoP Jan 6, 2024
e58f7ab
tribes fixes
videoP Jan 6, 2024
73e5b3b
tribes fix
videoP Jan 6, 2024
8fe465a
tribes tweaks
videoP Jan 7, 2024
afad9a8
eweb tweaks
videoP Jan 7, 2024
9a6e4df
tribes vel tweaks (t2c) , crashfix, aagun
videoP Jan 7, 2024
59e02f8
fixfff
videoP Jan 7, 2024
ec74987
fix pill ghosting, score bug
videoP Jan 7, 2024
3b8a36a
heavy physics tweak
videoP Jan 7, 2024
5c5817c
fix
videoP Jan 7, 2024
fef0be3
ammo fix
videoP Jan 7, 2024
45568cc
faster jet refuel, give jetfuel on pills
videoP Jan 7, 2024
a582a9f
make tribes jetpack use forcepower instead of jetpackfuel
videoP Jan 7, 2024
83cfa44
nerf shrike ram damage in tribes mode
videoP Jan 7, 2024
159a97b
redeemer rework to not require perfect aim
videoP Jan 7, 2024
3a69772
make tribes alt rockets easier to hit
videoP Jan 7, 2024
cb60a62
re add redeemer explode when swap wep
videoP Jan 7, 2024
868de28
redeemer tweak
videoP Jan 7, 2024
9482294
redeemer tweak for turnspeed cap
videoP Jan 7, 2024
22faa6d
redeemer tweak
videoP Jan 7, 2024
6417c3d
instantupdate tribesclass, showhealth settings
videoP Jan 7, 2024
a51a544
heavy healthbar
videoP Jan 8, 2024
d149859
chaingun overheat mechanic
videoP Jan 8, 2024
fab993a
stunbaton for tribes
videoP Jan 8, 2024
3434149
let us walk up steeper slopes in tribes
videoP Jan 8, 2024
e32952a
test push, sabers in tribes. hardcode jetpack regen in tribes.
videoP Jan 8, 2024
6931c8d
re add full grapple to tribes but make it cost fuel
videoP Jan 8, 2024
d8cc403
fix
videoP Jan 8, 2024
d7848dd
fix
videoP Jan 8, 2024
bc2db70
push strength fix tribes
videoP Jan 8, 2024
21db074
crash fix
videoP Jan 9, 2024
c69884c
backslash tribes
videoP Jan 9, 2024
900b997
tribes push
videoP Jan 9, 2024
f1bd187
longer sabers in tribes
videoP Jan 9, 2024
6105e03
fix shields in tribes
videoP Jan 9, 2024
07b3deb
fix
videoP Jan 9, 2024
7453229
rCompare command
videoP Jan 9, 2024
8527b2a
plasma gun v1
videoP Jan 9, 2024
219c632
dont healthbar racemoders
videoP Jan 9, 2024
d523db6
3rd class for tribes (light)
videoP Jan 10, 2024
75cf3d2
boltlauncher tweak
videoP Jan 10, 2024
b3c4e9c
fix
videoP Jan 10, 2024
53dde79
dont require forcepoint menu for tribes powers
videoP Jan 10, 2024
e881087
fix
videoP Jan 10, 2024
544f25f
fix2
videoP Jan 10, 2024
7e7c538
tweak
videoP Jan 10, 2024
0089716
charge
videoP Jan 10, 2024
595c119
crashfix
videoP Jan 10, 2024
4351b03
fix
videoP Jan 10, 2024
14ecd3a
fix for tribes GLs not rendering explosions on direct hits with terra…
videoP Jan 10, 2024
9b9c337
scale net health when increasing health instead of just in g_damage
videoP Jan 10, 2024
5e5476b
superheavy damage nerf, superheavy knockback reduce, class based knoc…
videoP Jan 10, 2024
1fa4036
tribes class detection tweak
videoP Jan 10, 2024
2231ab1
tribes respawn delay
videoP Jan 11, 2024
b716ff8
no respawntimer in tffa
videoP Jan 11, 2024
46de6d0
nugget gives items, integer mins/maxs
videoP Jan 11, 2024
ef7cbe1
revert test?
videoP Jan 11, 2024
e937560
deadstop/stepsize fix
videoP Jan 11, 2024
56aa346
light chain,
videoP Jan 12, 2024
47e62be
fix?
videoP Jan 12, 2024
0afbc93
balances
videoP Jan 13, 2024
2ec088f
flagthrow physics
videoP Jan 13, 2024
d0861cd
crashfix
videoP Jan 14, 2024
50cfc79
jetpack hackscale fix, jetapck fuel regen delay, punting fix
videoP Jan 14, 2024
f410bcd
passive heal
videoP Jan 14, 2024
c06352f
fix i guess
videoP Jan 14, 2024
357c126
tribesclass health rework
videoP Jan 14, 2024
855660c
fix
videoP Jan 14, 2024
447f09e
tribes health regen, armor pickup fix
videoP Jan 14, 2024
53256b9
tribes light mass fix, regen fix, kb fix
videoP Jan 14, 2024
12778a9
fix health scaling, kb
videoP Jan 14, 2024
cccf7c0
protect fix
videoP Jan 14, 2024
659233a
dmg tribesmode tweaks
videoP Jan 14, 2024
d3bc705
tribes weps
videoP Jan 15, 2024
09b8aae
crashfix, npc damage fix
videoP Jan 15, 2024
0d6861c
vehicle damage scaling
videoP Jan 15, 2024
c0bb404
better npc health fix
videoP Jan 15, 2024
a23d2d6
tribes fixes, trigger newpush spawnflags 512
videoP Jan 15, 2024
d9129a2
coop conc fix
videoP Jan 15, 2024
dbcead4
tribes grapple tweaks
videoP Jan 16, 2024
8f20052
conc sniper uses energy like phase rifle, mortar FX tweak, bounce st…
videoP Jan 17, 2024
fccfe6b
lt fix
videoP Jan 18, 2024
64e5f16
pill regen
videoP Jan 19, 2024
ca7938f
superheavy dmg fix, pill amt fix
videoP Jan 19, 2024
72bbdff
redo tribes grapple
videoP Jan 20, 2024
59a5624
tribes grapple change
videoP Jan 20, 2024
48f69d4
crashfix???
videoP Jan 20, 2024
da20b57
tribes grapple tweaks
videoP Jan 20, 2024
b9459a2
hook forcepoints
videoP Jan 20, 2024
eefd385
proj sniper no drop
videoP Jan 21, 2024
ccc1a7d
proj sniper tweak
videoP Jan 21, 2024
1daf442
swap firemodes for stun and e11 in tribes mode.
videoP Jan 21, 2024
da4c53d
start of special pack moves for tribes
videoP Jan 22, 2024
b617e99
blink tweak
videoP Jan 22, 2024
8fbf13c
blinkmove tweaks
videoP Jan 22, 2024
20bb070
thrust pack
videoP Jan 23, 2024
55970f4
pack fix
videoP Jan 23, 2024
6629717
oops
videoP Jan 23, 2024
a058ceb
cgame compilefix?
videoP Jan 23, 2024
be47a75
cgame compile fix
videoP Jan 23, 2024
4766f8b
overdrive pack test
videoP Jan 24, 2024
334d34c
do the overdrive speed here so its predicted without needing client
videoP Jan 24, 2024
6a0b7db
sniepr dmg fix
videoP Jan 24, 2024
90f2a29
overdrive balance tweaks
videoP Jan 24, 2024
530010f
compilefix
videoP Jan 24, 2024
6cf389e
/pack to choose pack item
videoP Jan 24, 2024
0ae1144
pack default, proj sniper nerf tribes, inc course limit
videoP Jan 25, 2024
304da82
absorb delay tribes
videoP Jan 26, 2024
12e43a0
jetpack racemode fix, allowedstyle fix?
videoP Jan 26, 2024
ce75f01
few more warps
videoP Jan 27, 2024
59f2b3e
conc racemode fix, hitbox scaling (?),
videoP Jan 27, 2024
e32e4b4
flag phys tweak
videoP Jan 29, 2024
4936f5c
tribes racemode stuff
videoP Jan 30, 2024
50c801b
conc splash fix, some typo fixes
videoP Jan 30, 2024
c83a730
typo fix, will this change something with elevators in racemode?
videoP Jan 30, 2024
4b05082
int to time function change
videoP Feb 1, 2024
81b8944
fix racemode tribes kb
videoP Feb 1, 2024
c1e8698
tribes jet tweak (effective 20% energy drain buff heavy)
videoP Feb 1, 2024
aaf93bf
crashfix?
videoP Feb 1, 2024
721bc62
let search for rtop mapnames with spaces by using &
videoP Feb 1, 2024
0e4f73f
tribes balance tweaks for pack/grapple
videoP Feb 2, 2024
24750c3
don't consume tribes jetfuel in water
videoP Feb 2, 2024
6e0f8fa
mortar fix
videoP Feb 2, 2024
87fd3c7
grapple speedloss fix
videoP Feb 2, 2024
3bc8216
trigger_hurt spawnflags 32 is npc only, adjust tr_gravity in tribes
videoP Feb 3, 2024
b17dfe2
tired
videoP Feb 3, 2024
8020d44
cosmetics unlock fix
videoP Feb 3, 2024
eb3b119
thrownade command
videoP Feb 4, 2024
f4811f7
throw grenade fix
videoP Feb 4, 2024
0c74fb8
grapple tribes race fix
videoP Feb 4, 2024
d90ec8b
test per-weapon delays
videoP Feb 5, 2024
e6fe604
test slick terrain fix
videoP Feb 5, 2024
8ac5bcb
oops
videoP Feb 5, 2024
f09ad65
re add some delay to doomet wepswitch
videoP Feb 5, 2024
b9e13a4
tribes fixes
videoP Feb 7, 2024
61068da
surf v1 from devy / css
videoP Feb 7, 2024
b1e6695
surf fix?
videoP Feb 8, 2024
a0e6a5e
surf fix ?
videoP Feb 8, 2024
96ff53f
test surf strength cmd
videoP Feb 8, 2024
58ad339
A few small changes (cl_filterGames + MAX_PATCH_PLANES increase) (#1188)
Daggolin Feb 8, 2024
01697e6
Merge pull request #1184 from Daggolin/qol_console
Razish Feb 8, 2024
d67d77d
surf strength
videoP Feb 8, 2024
540edeb
replace PATCH_STITCHING preprocessor define with r_patchStitching cva…
Razish Feb 9, 2024
9f06082
re add crashland in skii but adjust it so it doesn't affect zspeed
videoP Feb 10, 2024
6cfd091
quick fix to stop crouching down tribes slopes to give more speed
videoP Feb 12, 2024
e065d13
comment rcompare
videoP Feb 15, 2024
f27555f
cache pb/wr sounds
videoP Feb 15, 2024
e30cf77
downjet tribes tweak, self kb buff
videoP Feb 16, 2024
2f25943
dont affect racemode with this until finalized
videoP Feb 16, 2024
29a1eb4
blink nerf range
videoP Feb 18, 2024
2daf749
fix thrownade
videoP Feb 18, 2024
2d618a5
render local entities as late as possible (#1200)
Razish Feb 19, 2024
1c3056e
Fix endless loop in Z_Malloc due to imageDeleted always being qtrue, …
Razish Feb 19, 2024
8e56d3c
ignore numBones assert if we're mixing jk2/jka models (#1210)
Razish Feb 19, 2024
4547d40
[Meta] trim EOL whitespace (#1202)
Razish Feb 19, 2024
7412f62
[Meta] deprecated WinXP builds, introduce macOS-14 runner for M1 buil…
Razish Feb 19, 2024
6a8a880
[Shared] misc loop overrun fixes (#1201)
Razish Feb 19, 2024
3a697c7
[Meta] Update readme (#1171)
Razish Feb 20, 2024
142e0b7
[MP] reconcile game module changes with the original source releases …
Razish Feb 20, 2024
1e8a799
[MP] Remove BASE_COMPAT define (#1211)
Razish Feb 20, 2024
ca17eb4
remove bloat
videoP Feb 23, 2024
057e259
let passengers eject from vehicles
videoP Feb 25, 2024
5fb9249
Thomas
videoP Feb 25, 2024
34071a0
crashfix
videoP Feb 25, 2024
b784f7a
replace saberthrow with backslash in tribes
videoP Feb 26, 2024
22b2d56
messy jetpack tribes test
videoP Feb 26, 2024
70ed83f
thrust buff, spread for light chain
videoP Feb 27, 2024
a87e0d1
better dropped flag physics (slide downhill)
videoP Feb 28, 2024
888718e
flag slide tweak
videoP Feb 28, 2024
c79e657
[MP] fix g_weaponDisable + g_forcePowerDisable regression when creati…
Razish Feb 29, 2024
e119927
g_forcelogin 2 blocks chat from people not logged in
videoP Feb 29, 2024
3d61209
g_forcelogin 3 block rename - need testing
videoP Feb 29, 2024
0f63567
add support for df_trigger_stop having worldrecordnoise field
videoP Feb 29, 2024
9a102df
cs style crouch to surf style
videoP Mar 1, 2024
0936d78
valid surf
videoP Mar 1, 2024
2b98bab
better highspeed jets
videoP Mar 1, 2024
4750bfa
river current support for trigger_newpush
videoP Mar 2, 2024
5188257
Update g_trigger.c
videoP Mar 3, 2024
3f21a83
dynamic scoring for CTF flag returns based on distance from bases
videoP Mar 3, 2024
8b4454a
v0 of tribes bots
videoP Mar 4, 2024
1715267
adjust ctf scoring option
videoP Mar 4, 2024
ddf712c
print fix
videoP Mar 4, 2024
ecb8228
dynamic scoring for CTF flag returns based on distance from bases
videoP Mar 3, 2024
e210ad0
v0 of tribes bots
videoP Mar 4, 2024
b38e767
adjust ctf scoring option
videoP Mar 4, 2024
641503c
print fix
videoP Mar 4, 2024
375e215
better tribes bot weapon decisions, jet Z tweak,
videoP Mar 5, 2024
2a7c526
avoid configstring index clash with base_entranced (#1218)
Razish Mar 5, 2024
62124e1
[Shared] add a custom CMake target to copy compilation DB from build …
Razish Mar 5, 2024
6ee0ab4
better tribes bot weapon decisions, jet Z tweak,
videoP Mar 5, 2024
bbffacf
Merge remote-tracking branch 'OpenJK/master' into japro-update
taysta Mar 5, 2024
c4c24cc
Fixup merge conflicts
taysta Mar 5, 2024
f63bb4a
Merge remote-tracking branch 'japro/master' into japro-update
taysta Mar 5, 2024
689e708
Fixup merge conflicts - japro
taysta Mar 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Thomas
videoP committed Feb 25, 2024

Verified

This commit was signed with the committer’s verified signature.
MichaReiser Micha Reiser
commit 5fb9249e1133efe198199a54ee3ea29965343ea2
6 changes: 3 additions & 3 deletions codemp/game/g_trigger.c
Original file line number Diff line number Diff line change
@@ -2084,9 +2084,9 @@ void NewPush(gentity_t *trigger, gentity_t *player, trace_t *trace) {//JAPRO Tim
return;
}

//if (trigger->genericValue1 && (trigger->genericValue1 & (1 << player->client->sess.movementStyle))) {
//}
//else return;
if (trigger->genericValue1 && !(trigger->genericValue1 & (1 << player->client->sess.movementStyle))) {
return;
}

if (player->client->sess.raceMode) {
if (trigger->spawnflags & 32 && player->client->ps.groundEntityNum == ENTITYNUM_NONE) { //Spawnflags 4 deadstops them if they are traveling in this direction... sad hack to let people retroactively fix maps without barriers