Commit graph

3848 commits

Author SHA1 Message Date
Denis Pauk
642aeedc43 Merge remote-tracking branch 'yquake2/master' 2023-12-18 12:47:09 +02:00
Yamagi
18aa42653a
Merge pull request #1076 from protocultor/quick_weap
Faster "weapprev" and "weapnext" behavior
2023-12-17 11:58:28 +01:00
Denis Pauk
80ff901765 Fix build with Q_min/Q_max: 5da0e5f0 2023-12-16 23:37:20 +02:00
Denis Pauk
6b70251341 Merge remote-tracking branch 'yquake2/master' 2023-12-16 23:14:52 +02:00
Jaime Moreira
01ce6787dc Preview of the coming weapon for weapprev/weapnext
The weapon you are changing to appears in the HUD, in "pickup" format.
Requires g_quick_weap == 1.
2023-12-16 17:52:00 -03:00
Yamagi
be84f7fb89 Set the ambush spawnflag on monster_boss2 in biggun.
I encountered a bug where the monster_boss2 aka hornet in biggun.bsp
somehow slipped into the void while pushed out of it's compartment.
I'm unable to reproduce it, but analysis showed that the hornet isn't
spawned in ambush mode. As soon as the player fires a gun it starts
moving. Maybe that is enough to slip out of the compartment.

Additionally the hornet is a targeted monster. Monsters triggered by
level logic must be set to ambush, otherwise sound and level logic
triggering mess each other up.

Closes #1078.
2023-12-16 18:41:47 +01:00
Yamagi
5da0e5f00c
Merge pull request #1075 from apartfromtime/master
Rename min\max to avoid conflict with c-plus plus
2023-12-16 16:33:07 +01:00
apartfromtime
71570bb2ef Revert changes to shaders
Uses min/max from shader language.
2023-12-09 12:28:30 +11:00
Jaime Moreira
9eca08fd92 Faster "weapprev" and "weapnext" behavior
These commands can now "count" how many times they have been called,
similar to how "cycleweap" operates after #865.
This allows for changing to different weapons, instead of just going
"one down" or "one up".
New cvar "g_quick_swap" allows to enable/disable this behavior.
2023-12-07 23:57:19 -03:00
apartfromtime
f0d2c5afaa More min\max function renaming
Missed function renaming.
2023-12-04 22:59:31 +11:00
David Carlier
734422cbdf client: build warning fixes. 2023-12-02 13:05:29 +02:00
apartfromtime
9ac19de4ac Rename min\max to avoid conflict with c-plus plus
While trying to compile the yquake2 rebased heretic2 source from 0lvin, a name conflict with min\max of different parameter counts included by a std::cpp library occurred.
2023-12-01 11:58:21 +11:00
Denis Pauk
e673301dfb renders: fix maps with hardcoded image extensions 2023-11-28 00:31:33 +02:00
Denis Pauk
fbdc7e3f79 renders: Use pcx->wal->m32->m8->tga priority 2023-11-27 23:56:16 +02:00
Denis Pauk
53067535ea vk: clean up unused code 2023-11-27 00:02:37 +02:00
Denis Pauk
888e9bac9d render: Save original name of requested image 2023-11-26 23:50:29 +02:00
Denis Pauk
8d35e72606 client: support png skins in multiplayer 2023-11-26 16:47:49 +02:00
Denis Pauk
d48a8abf5c Merge remote-tracking branch 'yquake2/master' 2023-11-25 16:14:28 +02:00
Yamagi
4967b9d0ca Update miniz to e5700656b34b732f8d4e5df87cb0de00a6c8f319. 2023-11-24 09:26:14 +01:00
Yamagi
3d8fa3995c Update minizip unzip to 643e17b7498d12ab8d15565662880579692f769d. 2023-11-23 18:42:20 +01:00
Yamagi
90402c3f85 Move miniz into a subdirectory.
An upcoming update will add several files, having miniz in it's own
subdirectory makes it clear what belongs to it an whit to unzip.
2023-11-23 18:21:44 +01:00
Denis Pauk
dab662c8ba game: fix guardian and shambler save 2023-11-18 20:14:48 +02:00
Denis Pauk
38f2442d84 soft: move RE_SetSky to warp file
Same structure as other renders have
2023-11-18 17:52:43 +02:00
Denis Pauk
36c7528cc5 game: Update TODO list 2023-11-17 00:50:05 +02:00
Denis Pauk
9958db18d6 game: Add ReRelease Shambler Monster 2023-11-17 00:45:58 +02:00
Denis Pauk
1151c91069 game: Add ReRelease Guardian Monster 2023-11-12 23:51:58 +02:00
Denis Pauk
145027c240 game: fix actor save, revert of 038b7f01 2023-11-09 23:55:29 +02:00
Denis Pauk
6aece83adb game: restore rerelease target_actor used in biggun 2023-11-09 00:56:33 +02:00
Denis Pauk
081d0fffa4 game: add ReRelease Arachnoid monster 2023-11-09 00:15:23 +02:00
Denis Pauk
572bb883b9 Merge remote-tracking branch 'yquake2/master' 2023-11-09 00:15:05 +02:00
Yamagi
2b06ae4e95 s/Jaime Moreira/protocultor/g 2023-11-08 18:47:31 +01:00
Denis Pauk
015741ae4f Merge remote-tracking branch 'yquake2/master' 2023-11-06 00:37:49 +02:00
Denis Pauk
1270ae66d5 client: cache 8 maps in collision code 2023-11-05 18:50:02 +02:00
Yamagi
d4940703f0 Bump version number to 8.31pre. 2023-11-05 12:15:35 +01:00
Yamagi
11993ed7e6 Bump version number to 8.30. 2023-11-05 12:13:43 +01:00
Denis Pauk
51a8dfb6f3 client: cache four last maps 2023-11-05 02:49:00 +02:00
Denis Pauk
a50c75e069 Fix possible undefined code in recursive CM_BoxLeafnums_r
Found by @devnexen in https://github.com/0lvin/heretic2/pull/13/files
2023-11-04 23:00:37 +02:00
Denis Pauk
1ab34c87fd Combine credits for addons 2023-11-04 21:50:28 +02:00
Denis Pauk
172e8b743e game: merge ctf 2023-11-04 21:03:05 +02:00
Denis Pauk
f0155f0163 game: sync ctf g_ai 2023-11-04 20:22:01 +02:00
Denis Pauk
63d3e5ac74 Merge remote-tracking branch 'yquake2/master' 2023-11-04 19:45:48 +02:00
Denis Pauk
977dbc34e6 game: disable ctf menu if game != ctf 2023-11-04 19:45:23 +02:00
Denis Pauk
d27fc1f333 game: sync ctf player 2023-11-04 18:30:46 +02:00
Denis Pauk
802a874f64 game: sync ctf g_cmds 2023-11-04 17:32:56 +02:00
Denis Pauk
2b69f3774f game: sync ctf hud/trail 2023-11-04 17:01:06 +02:00
Yamagi
06017193fc
Merge pull request #1070 from devnexen/network_getaddrinfo_error
NET_Socket unix using getaddrinfo's error code in case.
2023-11-04 14:13:24 +01:00
Yamagi
ad9c115840
Merge pull request #1069 from devnexen/fix_bug_fix
fix curl uaf previous fix.
2023-11-04 14:13:10 +01:00
Denis Pauk
16dee61c78 game: sync ctf g_{spawn,phys} 2023-11-03 01:00:51 +02:00
Denis Pauk
9947744114 game: sync ctf g_{chase,func,items,misc,weapon} 2023-11-03 00:36:57 +02:00
Denis Pauk
c41b72125a game: sync with ctf g_svcmds, g_target, g_trigger 2023-11-02 00:58:27 +02:00