qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 08:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
8616 commits 17 branches 20 tags 29 MiB
Commit graph

961 commits

Author SHA1 Message Date
Bill Currie
ae4a30089e Remove skin.c from nq. 
I forgot to zap it earlier.
 2012-01-26 13:48:20 +09:00
Bill Currie
8448a8f332 Minimize the skin calls in nq. 2012-01-24 11:59:49 +09:00
Bill Currie
fb2568e681 Fix team colors in glsl for nq. 
I forgot to ensure Skin_Init was called in nq. Doing things with texture 0
doesn't work too well.
 2012-01-24 11:49:42 +09:00
Bill Currie
7bfddd7ffe Gut most of the old skin code. 
Custom skins are smashed on most targets. Player colors don't work, etc.
However, this will let me do a much cleaner implementation.
 2012-01-23 16:16:30 +09:00
Bill Currie
6fe557b407 Ensure the beam entitys' angles get set. 
This fixes the incorrectly oriented beam entities.
 2012-01-21 16:18:20 +09:00
Bill Currie
ffa79eed01 Don't lie about the number of models. 
The renderer being told there were 2048 models when there were only ~160
was a bit of an unpleasant surprise :P
 2012-01-09 16:22:39 +09:00
Bill Currie
423e08ce21 Add demo to "movie" conversion. 
It currently writes a series of png files (QF/qfmvNNNNNN.png), at a fixed
rate of 30fps, with no sound recording.
 2012-01-05 19:19:37 +09:00
Bill Currie
297a4e2756 Put the D_FlushCaches mess back. 
It turns out that when it is called is highly timing sensitive :(
However, the rest of R_ClearState remains.
 2012-01-05 15:50:20 +09:00
Bill Currie
53d89bf85a Clean up the mess around D_FlushCaches. 
Create an R_ClearState and call that from the clients. It calls any
necessary functions itself.
 2011-12-23 12:51:47 +09:00
Bill Currie
497461b4c2 Make a start on making a pure GLSL renderer. 
For now, only nq-glslx will be built, but as there is no actual code, it
doesn't link. However, this gets the glsl stuff into the build system.
 2011-12-23 12:19:13 +09:00
Bill Currie
890963423b Big cleanup of Host_Init. 
Eventually, all init functions will chain to their dependencies.
 2011-12-22 16:54:22 +09:00
Bill Currie
0086fee233 Rename host_skin.c to cl_skin.c. 
I don't know why I thost host was a good idea.
 2011-12-22 16:54:22 +09:00
Bill Currie
29306f7799 Merge nq and qw sv_phys.c 
sv_move and world are now identical between the two directories.
 2011-12-22 16:54:22 +09:00
Bill Currie
2bec1ae1d9 Make qw's push/block handing the same as nq's. 
NQ's handling seems to be more correct. The only likely problems are if
something is pushed into (eg) a button, and things will be a little slower.
 2011-12-22 16:54:22 +09:00
Bill Currie
d1be716031 Tidy up the corpse related code in SV_Push. 2011-12-22 16:54:22 +09:00
Bill Currie
4ade879674 Make SV_PushEntity easier to read. 2011-12-22 16:54:22 +09:00
Bill Currie
b54f0587d1 Bring qw's entity-in-solid check into nq's SV_Push. 2011-12-22 16:54:22 +09:00
Bill Currie
7243de0d90 Remove entorg from nq's SV_Push (). 
It's been redundant since the moved_* arrays came in.
 2011-12-22 16:54:22 +09:00
Bill Currie
64115d3331 Clean up sv_phys.c a little before merging. 
Add some comments and make the code a little more readable so I know
what's going on.
 2011-12-22 16:54:22 +09:00
Bill Currie
d441dc9027 Sort the cvar declarations. 
The diff is still messy, but now it includes only new/old cvars, not moved
cvars.
 2011-12-22 16:54:21 +09:00
Bill Currie
cba27bc745 Allow NQ's SV_RunThink to loop. 
This brings NQ's physics a little closer to QW's. After studying both the
original WinQuake source and the progs source, this change should be
harmless, making very little difference. However, it does allow an
entity's think function to be called multiple times in the same frame (for
when the entity needs more time to think, but it would cause runaway loop
errors). Maybe need a "runaway think" check.
 2011-12-22 16:54:21 +09:00
Bill Currie
c598ce4b50 Remove more of the fitzquake lerp code. 
Missed this bit ealier.
 2011-12-22 16:54:21 +09:00
Bill Currie
3eb859a88f Move the entity transform setup into the clients. 
This has several benifits:
  o The silly issue with alias model pitches being backwards is kept out
    of the renderer (it's a quakec thing: entites do their pitch
    backwards, but originally, only alias models were rotated. Hipnotic
    did brush entity rotations in the correct direction).
  o Angle to frame vector conversions are done only when the entity's
    angles vector changes, rather than every frame. This avoids a lot of
    unnecessary trig function calls.
  o Once transformed, an entity's frame vectors are always available.
    However, the vectors are left handed rather than right handed (ie,
    forward/left/up instead of forward/right/up): just a matter of
    watching the sign. This avoids even more trig calls (flag models in
    qw).
  o This paves the way for merging brush entity surface rendering with the
    world model surface rendering (the actual goal of this patch).
  o This also paves the way for using quaternions to represent entity
    orientation, as that would be a protocol change.
 2011-12-15 17:09:01 +09:00
Bill Currie
4b515a961b Back out the fitzquake lerp changes. 
That's not the direction I wish to take the renderer.
 2011-12-13 17:01:15 +09:00
Bill Currie
60c9d05d47 Hipnotic/Rogue weapon mask comments and cleanup. 
This too has been sitting around for a while. Taken from fitzquake.
 2011-12-12 17:08:22 +09:00
Antti Harri
cc937828b8 Propagate flags set in pthread.m4 to nq and qw sources. Removes the need 
to have -pthread in CFLAGS on OpenBSD.
 2011-12-10 13:33:20 +02:00
Bill Currie
c3d41326b3 Do key dest changing properly. 
key_demo wasn't so well thought out. This seems to be much better (and nq
is known to be working nicely).
 2011-12-10 16:14:25 +09:00
Bill Currie
16c8b2a18d Use the new demo imt. 
There are some problems with menus and the console messing up the key_dest
state (they assume console/menu or game, nothing else), but otherwise
things seem to work.
 2011-12-10 15:18:50 +09:00
Bill Currie
054e52528e Revive the loading plaque. 
At the request of scar3crow.
 2011-12-09 18:41:52 +09:00
Bill Currie
91e65b6c80 Rename mplane_t to plane_t and clean up the mess. 
I got rather tired of there being multiple definitions of mostly compatible
plane types (and I need a common type anyway). dplane_t still exists for
now because I want to be careful when messing with the actual bsp format.
 2011-11-28 20:54:34 +09:00
Bill Currie
03abb3b27d Add support for ellipsoids. 
Not that boxes work yet, but the fix is the same.
 2011-11-28 20:54:33 +09:00
Bill Currie
5029fde3e1 Fix the bogus frags on death. 
I'd missed some casts in the MSG_ReadShort change.
 2011-09-11 17:49:24 +09:00
Bill Currie
e7f845ece1 Fix the accidentally broken model precaching. 
This fixes the explodebox bug reported by scar3crow (thanks!), caused by a
subtle difference between nq and qw precaching (nasty).
 2011-09-11 17:07:41 +09:00
Bill Currie
cb9a30e949 Fix registered game detection. 
registered detection needs qfs to be initted, but qfs needs game to be
inited... so move the qfs init into game init before the registered check.
 2011-09-11 15:40:36 +09:00
Bill Currie
d9ab3a1f54 Move the config file/command line parsing into qargs.c 
I don't like the COM prefix, but it will do for now.
 2011-09-11 14:57:05 +09:00
Bill Currie
a71acc9ae5 Move the essential init code into Sys_Init(). 2011-09-11 14:56:47 +09:00
Bill Currie
f921005a5d Nuke com.c. 
It's contents have been moved into game.c and massaged appropriately.
 2011-09-11 14:55:13 +09:00
Bill Currie
8bab548d16 Make the hud type configurable via dirconf. 
Currently only "id", "hipnotic" and "rogue" are supported (anything else is
treated as "id"). Has no effect in quakeworld (good thing too: changing
gamedirs is a little broken).
 2011-09-11 08:13:26 +09:00
Bill Currie
1f4a6daafb Fixes for win32. 
I'd forgotten why SDL_main had such a lame prototype.
It turns out my previous mingw testing wasing testing SDL :(
 2011-09-10 17:47:38 +09:00
Bill Currie
89ec14e0fc Make very tiny movements no-ops. 
This affects pushers in their think code. This makes NQ a little more like
QW, but doesn't really seem to change much.
 2011-09-07 09:41:05 +09:00
Bill Currie
9bd4bbee52 Make sure tossed entities with upward velocity can always move. 
If a tossed entity has ONGROUND set, it won't move, but if it has an upward
velocity, it can't possibly be ONGROUND, so clear the flag if the entity is
moving upwards.
 2011-09-07 09:41:05 +09:00
Bill Currie
e1b6f50345 Clean up the diffs a bit between qw and nq sv_pr_cmds 
Add some missing functions to nq.
In qw, Sys_Printf is mapped to SV_Printf, so no harm there.
 2011-09-07 09:41:05 +09:00
Bill Currie
dcbe23b3d3 Abandon the runequake stuff for now. 2011-09-04 20:32:57 +09:00
Bill Currie
cca9983a48 Clean up the startup file diffs. 
This also makes functionality consistent across the platforms, such as
adding support for -dedicated to sdl based nq, and various timing
calculations are now consistent.
 2011-09-04 12:04:03 +09:00
Bill Currie
be8277c8c4 Sanitize some of the differences in cl_parse.c. 
Most of the differences in CL_ParseServerMessage are now protocol specific.
 2011-09-04 09:58:12 +09:00
Bill Currie
9afb691dd9 Change MSG_ReadShort to return an unsigned short. 
Avoiding the sign extension by default seems to be more useful.
 2011-09-04 09:58:12 +09:00
Bill Currie
9ace9f2bfa Fix some bad timing with a dstring_delete. 
Opps :P, double free.
 2011-09-04 09:58:12 +09:00
Bill Currie
28d9c7234c A bit more diff reduction before attempting to merge client code. 2011-09-04 09:58:12 +09:00
Bill Currie
514f085e88 Reduce the diffs in cl_demo.c. 
Starting to look like a change in protocol rather than a complete rewrite.
 2011-09-04 09:58:12 +09:00
Bill Currie
d508da3cf0 Reduce cl_cmd.c diffs down to protocol specifics. 2011-09-04 09:58:11 +09:00
Bill Currie
85bcac3c8d Reduce cl_cam diffs to spectator specifics. 2011-09-04 09:58:11 +09:00
Bill Currie
73d11aedca Do a lot of diff reduction. 2011-09-04 09:58:11 +09:00
Bill Currie
fb9a095586 Fix include style mixup. 
"" for local, <> for system
 2011-09-04 09:58:11 +09:00
Bill Currie
62b17d3629 Split out the entity linking code. 
This should smooth the merge process a little.
 2011-09-04 09:58:11 +09:00
Bill Currie
62f7d14ed2 White space cleanups. 2011-09-04 09:58:11 +09:00
Bill Currie
245cfb0b6f Much diff reduction. 
In the process, found a bug where the yaw speed was not being limited as
desired.
 2011-09-04 09:58:11 +09:00
Bill Currie
88005f6710 Diff reduction. 2011-09-04 09:58:11 +09:00
Bill Currie
0d5bebabe2 Replace qsockaddr with AF_address_t. 
It seems qsockaddr's assumptions aren't necessarily portable, as OpenBSD
seems to be doing weird things with qsa_family. Even if that's not the
case, this is cleaner.
 2011-08-24 09:14:02 +09:00
Bill Currie
5d52810b9c Disable single character tokens when parsing old save games. 2011-08-11 14:23:25 +09:00
Bill Currie
6f0ab844ea Some more nq networking debug prints. 2011-08-06 16:54:01 +09:00
Bill Currie
07d5b114bc Clean out some dead code and variables. 
We haven't had serial or ipx support for a long time.
 2011-07-29 10:11:14 +09:00
Bill Currie
efa0105748 Rename some headers to fix doxygen warnings. 2011-07-23 15:58:45 +09:00
Bill Currie
d2894a6f68 Rename Cvar_AliasGet to Cvar_MakeAliase. 2011-07-05 20:28:57 +09:00
Bill Currie
0f7390dd60 Clean up all the "set but not used" warnings. 
gcc on my system is failing to treat this specific warning as an error :/
 2011-06-19 10:48:02 +09:00
Bill Currie
3061270d3a Support jumping off pretty much anything. 
See http://forums.inside3d.com/viewtopic.php?t=1675 for inspiration.

As this might break the gameplay of certain maps, the new sv_jump_any
cvar can be used to disable this feature (bringing back the old behavior).
 2011-06-11 13:19:31 +09:00
Bill Currie
628bd1367e Fix some warnings in recent gcc. 
gcc seems to be getting ever more picky (which is good, really)
 2011-06-11 13:17:22 +09:00
Bill Currie
d88c09a033 Fix the crash on timedemo interrupting a timedemo. 2011-06-04 18:14:30 +09:00
Bill Currie
2ecdec91a8 Clean up the demo api a little. 
This way, I can be more assured of what might be called from outside
cl_demo.c.
 2011-06-03 22:47:32 +09:00
Bill Currie
82038bb504 Remove another stack character buffer. 
While it was probably safe (snprintf was being used correctly) I prefer to
avoid the issue completely and centralize any potential problems.
 2011-06-03 22:18:08 +09:00
Bill Currie
55cc0f9206 Bring back the unsigned type (PROGS version bump) 
This is only low-level support (the unsigned keyword still does not work),
but sufficient to make switch statements using jump tables work.
 2011-04-09 10:07:47 +09:00
Bill Currie
75ec6bf244 Clean out some unnecessary types from the progs engine and clean up the mess. 
This is a nasty commit, sorry, but 99% of the commit is interdependent.
 2011-01-10 12:25:31 +09:00
Bill Currie
a85c0713aa Nuke libQFbuiltins. 
The gib and "common" builtins are now part of libQFruamoko.
 2011-01-04 21:21:19 +09:00
Jeff Teunissen
ec11282a33 fix worldspawn sky keys in NQ. 
sky/skyname/qlsky rather than sky/skyname/skyname :)
 2010-12-28 15:03:58 -05:00
Bill Currie
fdd59b9851 Support entity files in the client too. 
I'd forgotten about .ent files when I wrote the client side map parsing
(fog/sky) support.
 2010-12-27 09:34:24 +09:00
Bill Currie
14480fd1b4 Move the call to R_ClearEnts to the renderer. 
This fixes the hang on certain maps in qw-client.
 2010-12-25 19:59:34 +09:00
Jeff Teunissen
493466a8ec X targets don't need X_PRE_LIBS 2010-12-24 05:03:32 -05:00
Bill Currie
de04e1b602 Lots of win32 (mingw cross) build fixes. 
HTTP (curl) support is missing, but everything else builds.
 2010-12-23 11:40:16 +09:00
Bill Currie
8bb507f220 Alias "show_fps" to "hud_fps". 
"show_fps" is the quakeworld standard, so that's what most people expect to
use.
 2010-12-16 11:46:25 +09:00
Bill Currie
23d3407622 Change a few defaults as suggested by bigfoot. 
in_dga -> 0 (until X is fixed)
gl_multitexture -> 1 (why was this 0? not enough support back then?)
cl_usleep -> 1 (seems to be ok)
host_mem_size -> 40 (even 32 isn't enough these days)
rate -> 10000 (we're not in the modem era any more)
cl_mem_size -> 32 (16 is not enough, 32 sounds better than 24)
 2010-12-16 11:34:39 +09:00
Bill Currie
12da412871 Get entity alpha (mostly) working. 
I'm not sure if bsp model rendering is correct (backside issues), but
enities now sport transparency. Good test map:
http://www.celephais.net/board/view_thread.php?id=60157&
 2010-12-16 09:34:29 +09:00
Bill Currie
52eb6a6b08 "realtime" is a client var, not a server var. 
The correct var in the server is sv.time.
 2010-12-15 18:47:17 +09:00
Bill Currie
64f801f546 whitespace 2010-12-15 08:51:43 +09:00
Bill Currie
775f8e959b Rotating bsp model support. 
This is based on the code presented on
http://forums.inside3d.com/viewtopic.php?t=2376 (and updates linked from
that thread), but with modifications for hopefully supporting rotating
trains (and not duplicating big fuctions).

For now, only nq. qw will come after some more testing.
 2010-12-15 08:36:53 +09:00
Bill Currie
0e677ce0f0 Give nw qw's timedemo statistics. 2010-12-14 08:59:15 +09:00
Bill Currie
05be74510f Free the explosion objects when clearing tents. 
This fixes the hang after a few (3 or 4) play/timedemo runs of bigass1. Now
23 runs (and counting) seems to work well, though there seems to be a
memory leak somewhere.
 2010-12-14 00:13:13 +09:00
Bill Currie
ce96e6b055 The beginnings of fog support. 
gl_fog.c is taken from fitzquake with only minor modifications to get it
into QF. Other than worldspawn/network parsing, it's not used yet.
 2010-12-10 17:17:30 +09:00
Bill Currie
aad204e80c Set the skybox from the map's worldspawn sky field. 2010-12-10 17:17:30 +09:00
Bill Currie
4af6c8c108 Catch and ignore sky and fog fields. 
This way, we won't get spammed with "not a field" messages on map load.
 2010-12-10 17:17:30 +09:00
Bill Currie
51009cdc4b Clear the server progs data when loading progs. 
The baseline data doesn't matter so much, but the pointer fields relied on
the progs engine clearing them. I forgot about this :/
 2010-12-09 21:35:21 +09:00
Bill Currie
bc91faf51e Change back to storing the leafnum. 
Still unlimited, of course :)
 2010-12-09 17:24:38 +09:00
Bill Currie
3ae2ef8d11 Remove non-progs data from edict_t. 
All data that is irrelevant to the progs engine itself has been removed
from edict_t and moved into the sv_progs code.
 2010-12-09 17:24:37 +09:00
Bill Currie
a062c758fd white space 2010-12-09 13:34:37 +09:00
Bill Currie
1291766298 Remove all "cosmetic" differences between nq and qw sv_phys.c 2010-12-09 08:52:40 +09:00
Bill Currie
6e87c4cea6 Make sure the level name does not over write the secrets count. 2010-12-08 21:59:23 +09:00
Bill Currie
9b9fde244b Move the EndFrame function "pointer" into the sv_funcs struct. 2010-12-08 21:20:35 +09:00
Bill Currie
33d768ba73 Get nq and qw sv_phys.c mostly into sync. 
nq's SV_CheckVelocity will be a little different (spherical rather than
cubical), but sv_maxvelocity defaults high enough for it to not matter to
most players. It might even improve play.

The remaining differences need some careful thought before the physics
merge is done.
 2010-12-08 18:14:40 +09:00
Bill Currie
a893d8ead3 Get nq and qw world.c into sync (again:P) 2010-12-08 12:55:07 +09:00
Bill Currie
e46b52a81c Plug the edict_leaf memory leak. 2010-12-08 09:20:43 +09:00
Bill Currie
31cf4b0d78 Use a linked list for the leafs in which the entity is positioned. 
This allows the pvs to be used on an antity no matter how many leafs the
entity is touching. Seems to work nicely, but it will leak memory every
time a map is loaded.
 2010-12-08 08:44:52 +09:00
Bill Currie
9bce1630a6 Revert "Tidy up CL_RelinkEntities a little bit." 
This reverts commit ad7e7e45fe.

The cleanup broke entity linking, but fixing it would just duplicate the
previous tests, so might as well revert. Cleaning up the interpolation code
is probably a better approach.
 2010-12-04 22:41:44 +09:00