Bill Currie
ce9580f237
sufflin' shufflin' shuflin'.. raaw-source
...
qw-client now links, but qw-server won't compile (yet)
2000-02-11 04:21:10 +00:00
Bill Currie
de1e542ead
merge qw_server/qwsvdef.h qw_server/server.h uquake/server.h into
...
common/server.h
world.c some compile time fixups
2000-02-11 01:42:15 +00:00
Bill Currie
b10cc7fea4
forgot to remove this
2000-02-10 23:38:52 +00:00
Bill Currie
3585aab0eb
merges:
...
qw_server/world.[ch] and uquake/world.[ch] into common/world.[ch]
uquake/chasecam.c into common/cl_cam.c
move physics type defines from server.h to phys.h
2000-02-10 23:38:19 +00:00
Joseph Carter
c249d90a69
Slight reformat, nothing big
2000-02-10 17:25:27 +00:00
Joseph Carter
f79476c5ec
Don't declare SV_Shutdown twice
2000-02-10 16:46:47 +00:00
Joseph Carter
252621a4cd
*** empty log message ***
2000-02-10 16:29:11 +00:00
Loring Holden
796976d7b8
AIX needs stdlib.h so malloc is defined
2000-02-10 16:24:10 +00:00
Bill Currie
7d7d5faa18
add cl_cam.c to eliminate another undefined sybol. Now all that's left is
...
prediction stuff.
2000-02-10 14:02:36 +00:00
Bill Currie
314cca66b8
common/common.h:
...
add #include <cvar.h>
move qw_client/cl_cam.c to common/cl_cam.c
2000-02-10 13:56:47 +00:00
Bill Currie
fabe501768
the merge continues. qw_common/common.c and uquake/common.c have /finally/ been
...
merged with the command line args merged into common/qargs.c. Args rebuilding
in qargs.c should now be totally safe with no limits.
2000-02-10 13:49:39 +00:00
Bill Currie
c4797f95fe
added some more missing cvars
2000-02-10 11:19:51 +00:00
Jeff Teunissen
3f04be7021
Added prototype for SV_Shutdown to server.h
2000-02-10 10:43:22 +00:00
Joseph Carter
2425b04e3b
Host_ShutdownServer -> SV_Shutdown
2000-02-10 09:43:27 +00:00
Joseph Carter
df559eaf9f
Under a rare case in UQ (that you are playing with the QW HUD in a co-op
...
game), the color bar that was supposed to be the backdrop for your frag
counts would be drawn as if the statusbar was centered (which is never
the case if you're using the HUD), fixed.
I have more sbar.c fixes to do but I need a working UQ to be able to test
them out first. We're _almost_ there... We all owe Deek and taniwha big
for the progress made tonight I think---great job guys. But save SOME of
the merge for the rest of us willya? ;>
2000-02-10 09:36:00 +00:00
Bill Currie
f52457b0c7
moved many cvars in from the old host.c
2000-02-10 09:16:56 +00:00
Joseph Carter
ba5f5570eb
moved some text files to doc/
2000-02-10 09:10:08 +00:00
Jeff Teunissen
e0987665d8
Possible fix to the recently-uncovered UQuake segfault.
2000-02-10 09:07:26 +00:00
Bill Currie
866f2514d0
common/host.c:
...
put Host_GetConsoleCommands back
uquake/server.h:
proto for SV_Frame
uquake/sv_main.c
add SV_ClientPrintf SV_BroadcastPrintf SV_DropClient SV_Frame* from
old host.c
2000-02-10 09:03:30 +00:00
Jeff Teunissen
74e0de143a
host.c completions...might be able to link now. :)
2000-02-10 08:45:53 +00:00
Joseph Carter
44ec4f61d5
A couple cl_ents functions removed from cl_main for uquake, we're close to
...
being able to link uquake again! Reformatted the top of cl_ents
2000-02-10 06:22:29 +00:00
Loring Holden
aa720bf076
Small changes to compile (not link) under Solaris, AIX, & Irix
2000-02-10 06:18:57 +00:00
Bill Currie
ccbb656250
more uquake link fixups
2000-02-10 06:03:16 +00:00
Bill Currie
28088048b3
uquake now compiles, but doesn't link yet
2000-02-10 05:58:27 +00:00
Bill Currie
1cd0078fca
qw now links
2000-02-10 05:45:53 +00:00
Joseph Carter
dee1dd73ca
-DGLQUAKE in UQ gone---who left that in there? (Probably me...)
2000-02-10 05:43:45 +00:00
Bill Currie
3e1912f471
Host_* merging
2000-02-10 05:41:46 +00:00
Bill Currie
fa875465d7
add host.c
2000-02-10 05:29:45 +00:00
Bill Currie
eef00e39f3
stopped some cvar and cmd clashes
2000-02-09 09:55:58 +00:00
Bill Currie
16e636cc01
make independent of zlib (ie use HAS_ZLIB)
2000-02-09 09:12:55 +00:00
Bill Currie
688d7d470a
quick bandaid to stop uquake from segfaulting.
2000-02-09 07:30:45 +00:00
Bill Currie
88bc2bf209
common/gl_refrag.c common/gl_rmain.c:
...
fix to compile with cl_visedicts from qw in uq
common/quakeio.c:
fix bogus string copying
2000-02-09 06:27:30 +00:00
Bill Currie
1308793cce
moved qw_common{bothdefs.h,pmove.h,pmove_simple.h} to common
...
merged qw_common/quakedef.h and uquake/quakedef.h into common/quakedef.h (sort
of, bits of bothdefs.h too)
common/cl_ents.c common/client.h uquake/screen.c uquake/sv_user.c:
various fixups to cope with the merge.
UQ is still busted
2000-02-09 01:44:59 +00:00
Bill Currie
21416b0b94
qw_common/pmove.h:
...
add #include "net.h"
uquake/Makefile.in:
put cl_ents.c back it. might as well make a commitment :)
merge qw_common/protocol.h and uquake/protocol.h into common/protocol.h
2000-02-08 22:25:15 +00:00
Pontus Lidman
6dcee510f9
Converted the file to 100% UNIX newlines
2000-02-08 21:40:58 +00:00
Pontus Lidman
003f4be021
Now correctly handles IPv4 addresses returned by getaddrinfo();
...
also parses RFC 2732 IPv6 address/port numbers in the connect command etc.
2000-02-08 21:33:33 +00:00
Pontus Lidman
0b3798abff
Fixing consequences of merge + new macro for IPV6
2000-02-08 21:23:46 +00:00
Pontus Lidman
d608249a38
Added --enable-ipv6 option to configure to enable IPv6 networking.
...
It substitutes @NET_SOURCE@ for net_udp.c or net_udp6.c.
2000-02-08 21:23:06 +00:00
Bill Currie
7d5b301d80
common/quakeio.c:
...
support gzipped files
common/quakefs.c:
qw_client/cl_parse.c:
qw_server/sv_ccmds.c:
uquake/host_cmd.c:
uquake/menu.c:
use "z" in mode flags when reading files
uquake/Makefile.in:
take cl_ents.c out again (too much work atm to get it to compile)
2000-02-08 20:59:36 +00:00
Bill Currie
1983cf894b
move cl_ents.c from qw_clent to common
...
uquake/Makefile.in:
add cl_ents.c (doesn't work yet)
qw_client/gl_vidlinux_x11.c:
not used, waste of bandwidth
2000-02-08 07:44:02 +00:00
Bill Currie
a078544d38
Replaced every single fscking FILE and gzFile (except in quakeio.*) with QFile
...
and fixed up as many f* and gz* calls as gcc found (and, where sensible, grep)
Unfortuanatly, demos are broken again.
2000-02-08 07:23:09 +00:00
Bill Currie
e67f3dc07a
uquake now builds
2000-02-08 06:14:10 +00:00
Bill Currie
83fc2c0373
forgot to add these in the last checkin. They implement the QFile stuff.
2000-02-08 05:08:34 +00:00
Bill Currie
edbb589045
merge qw_client/cl_main.c and uquake/cl_main.c into common/cl_main.c
...
For the rest, convert all refs to FILE and gzFile to QFile, and similar for
file functions (eg fprintf, fgets, fread, etc)
2000-02-08 05:06:58 +00:00
Joseph Carter
bc28568890
there are still uquake issues...
2000-02-07 23:13:16 +00:00
Joseph Carter
7633189c91
cl_tent.c is merged - uquake still has some issues but they're smaller now
2000-02-07 22:54:33 +00:00
Bill Currie
56c8badd2d
merge qw_client/r_edge.c and uquake/r_edge.c into common/r_edge.c
2000-02-07 04:31:25 +00:00
Bill Currie
ea4390157a
merge qw_client/r_efrag.c and uquake/r_efrag.c into common/r_efrag.c
2000-02-07 04:18:27 +00:00
Joseph Carter
bcc96386cd
A few mods for uquake...
2000-02-07 04:18:18 +00:00
Joseph Carter
e023ae7ffe
qw-client and server work again, sound_lib builds, uquake doesn't
2000-02-07 03:49:50 +00:00
