Commit graph

194 commits

Author SHA1 Message Date
Dan Olson
106dada0b2 Non functional cvar code. Compiles, but won't run. 2000-02-27 07:13:32 +00:00
Dan Olson
899180733a Moving some files around for Jason Nelson (Win32 target) 2000-02-22 04:59:08 +00:00
Bill Currie
19206928b4 merge qw_client/model.c and uquake/model.c into common/model.c
common/gl_model.c uquake/Makefile.in:
	allow checksums in uquake
2000-02-21 21:13:45 +00:00
Bill Currie
15e4001bf2 merge qw_client/gl_cl_parse.c and uquake/gl_cl_parse.c into common/gl_cl_parse.c 2000-02-21 12:47:23 +00:00
Bill Currie
f56e2a12c2 more merges
qw_client/gl_model.c + uquake/gl_model.c = common/gl_model.c
qw_client/gl_rlight.c + uquake/gl_rlight.c = common/gl_rlight.c

common/gl_rmisc.c:
	call R_InitBubble for both uq and qw
2000-02-21 12:36:38 +00:00
Bill Currie
21f934a4a4 move gl_ngraph.c from qw_client to common in anticipation of it being
backported to uquake. Might as well pre-merge it :)
2000-02-21 11:22:10 +00:00
Bill Currie
61bce24653 more mergine
qw_client/gl_screen.c + uquake/gl_screen.c = common/gl_screen.c
2000-02-21 11:16:13 +00:00
Bill Currie
007b9a47ee merge qw_client/resource.h and uquake/resource.h into common/resource.h 2000-02-21 10:38:51 +00:00
Bill Currie
0196064c51 merge qw_client/r_misc.c and uquake/r_misc.c int common/r_misc.c
merge qw_client/r_sprite.c and uquake/r_sprite.c int common/r_sprite.c
2000-02-21 10:28:22 +00:00
Bill Currie
981acbc014 merge qw_client/r_part.c and uquake/r_part.c into common/r_part.c
merge qw_client/gl_rpart.c and uquake/gl_rpart.c into common/gl_rpart.c

r_part.c tested for uquake and seems ok, but gl_rpart.c untested
2000-02-21 08:12:35 +00:00
Dan Olson
8ac1385c9f Jason Nelson's patch for fixing Win32 targets 2000-02-20 21:19:50 +00:00
Zephaniah E. Hull
2afdb1db5f Little bug fixes here and there, should work again.. 2000-02-20 20:49:36 +00:00
Zephaniah E. Hull
d356761b93 Fix for the QW protocol problem by Dabb..
Some profiling changes as well..
Code now compiles with profiling support, will disable later..
2000-02-20 20:46:13 +00:00
Marcus Sundberg
636b73cc11 Synced some code between UQ/QW. 2000-02-19 15:43:42 +00:00
Marcus Sundberg
10cc5228c5 Remove redundant shared stuff from Makefiles. 2000-02-19 13:53:08 +00:00
Zephaniah E. Hull
1e9f882fee Whoops, minor compile fixes.. 2000-02-19 08:44:02 +00:00
Zephaniah E. Hull
0fae0e01d3 Reverting away from modules in the main branch..
-3dfx, -x11, and -glx all work, at least for qw-client, no promices on uquake.
I can't test any other targets at the moment, so....
2000-02-19 08:24:15 +00:00
Loring Holden
6b9563b880 Until we use libtool, we need to specify in configure.in how to create and
use shared libraries (-rdynamic and -shared does not work everywhere)

We also have to use this information in */Makefile.in
2000-02-17 16:21:23 +00:00
Dan Olson
7d387042f7 New CVAR flag system. Appears to work perfectly 2000-02-16 21:30:20 +00:00
Joseph Carter
50167d5e71 Console now hauls ass by default ala quake2 and such. Did not change the
scr_conspeed default from 300 to quake2's 3 because I want to be sure of
how I am doing it compared to how it was done later.  Will ask Zoid when
both of us are awake at the same time.
2000-02-16 11:28:27 +00:00
Dan Olson
b03c0a094e More menu stuff and input plugin loading for -glx targets 2000-02-15 18:45:26 +00:00
Dan Olson
c878ab64f4 Prep of menus for video modularization. 2000-02-15 14:25:03 +00:00
Dan Olson
35fb941db1 Correction of spelling errors. Mostly for CVS practice. 2000-02-14 23:06:13 +00:00
Bill Currie
9ed247178f common/plugin.c:
add path searching. currently unix style only (ie ':') and defaults to
	".:${LIBDIR}/quakeforge".
*/Makefile.in:
	fix up the clean targets a little, so they actually work
2000-02-14 11:30:37 +00:00
Joseph Carter
f11f71d8a7 we now define LIBDIR when we build targets 2000-02-14 00:35:13 +00:00
Joseph Carter
1d7260195f Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause
less confusion that way (even if I have to type an extra letter..)
2000-02-13 09:06:11 +00:00
Zephaniah E. Hull
3b1494b153 Fixed some little errors with the plugin code.. 2000-02-12 11:42:56 +00:00
Zephaniah E. Hull
dd7d064733 in_x11.so, and actually check in the plugin code..
vid_x works, aside from a few, err, qwirks, in the input focus handling..
2000-02-12 08:08:31 +00:00
Zephaniah E. Hull
0e8ba8d814 Sledge hammer applied..
The input stuff is now somewhat modular, I'll get everything working
soon enough, right now things are hardwired to svgalib, but its ok..
2000-02-12 05:34:22 +00:00
Bill Currie
e3d564905d put REQUIRED worlda.s back in. it will not cause probelms for non-x86 archs as
generates an empty .o file if id386 is 0 or undefined
2000-02-11 11:07:04 +00:00
Loring Holden
0442e797e4 Remove redundant worlda.s that caused problems on non-x86 systems 2000-02-11 06:50:15 +00:00
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
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
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
fa875465d7 add host.c 2000-02-10 05:29:45 +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
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
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
3c55b43e25 Committing my merges of client.h and net.h.. Got rid of snd_dma.c changes
made before, it breaks a few things but it needs to be committed so they
can be fixed..
2000-02-07 01:32:12 +00:00
Bill Currie
4b77a46ca6 merged qw_client/cl_input.c and uquake/cl_input.c into common/cl_input.c 2000-02-07 00:12:21 +00:00
Marcus Sundberg
2cb28b8f01 Prevent division by zero in CalcFov(). 2000-02-05 16:03:37 +00:00
Joseph Carter
dc627d6b28 uquake has the beginning of netchan support, netchan.message works fine
now, the rest I don't know how much of it I can do without breaking the
protocol's compatibility.

client_state_t has moved back to client.h in qw_common and uquake.  Seems
like that's a step backward, but the way it was being used while common
was far worse!  This required massive reworking of headers and such.

Speaking of using cl (the global client_state_t) badly, the sound code did
exactly that.  Mercury should be shot for not fixing that when he did the
sound_lib.a stuff.  The fix illustrates what we need to start doing to the
code to make modularization possible.  I'll be sending a message to the
list about this shortly..
2000-02-04 13:40:04 +00:00
Joseph Carter
218d2fcb9b random QW changes which should help with sbar stuff later on 2000-02-03 21:16:57 +00:00
Loring Holden
713e84ecae Workaround for isspace() with sgi and gcc 2000-02-03 08:44:01 +00:00
Bill Currie
083021da12 no-asm patch from Darius 2000-02-03 02:34:26 +00:00