qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-25 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
1107 commits 2 branches 3 tags 3.5 MiB
Commit graph

295 commits

Author SHA1 Message Date
Joseph Carter
9e973574e4 bspfile.h is now really common 2000-02-21 22:16:39 +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
Dan Olson
e0dc6fa673 Removal of duplicated files. 2000-02-21 14:29:25 +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
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
Bill Currie
592b054f82 common/gl_vidglx.c: 
some tweeks in an attempt to improve shutdown. NOT the final say
qw_server/sv_ccmds.c:
	comment correction
common/quakefs.c uquake/host_cmd.c:
	knghtbrd's gamedir patch, plus some Hunk_Alloc -> Z_Malloc changes.
 2000-02-20 04:20:00 +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
Bill Currie
a5c3e6519c misc fixes to get uquake to link with the new input code 2000-02-19 08:55:10 +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
Bill Currie
502d171cbf turns out uquake can handle (build time anyway) qw's pmove*.c as is, so make 
them common
 2000-02-13 04:32:18 +00:00
Bill Currie
5b595a370a fix linking for plugins 2000-02-12 23:54:54 +00:00
Bill Currie
f63afc8e0f plugin fixups for uquake 2000-02-12 21:30:01 +00:00
Bill Currie
d0ae0cb63c uquake finally links again 2000-02-12 11:25:12 +00:00
Bill Currie
b0fba33d43 uquake /almost/ links now (is that link being sort of pregnant?) 2000-02-12 10:02:22 +00:00
Bill Currie
111e599bc9 add a stripped down pmove.c. untested 2000-02-12 09:39:57 +00:00
Bill Currie
8b8d089502 copy same vars from qw_client in the ongoing quest to get uquake to link 2000-02-12 05:08:37 +00:00
Bill Currie
149c6c6523 getting closer to haveing a compiling uq 2000-02-11 05:47:57 +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
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
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
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
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
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
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
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
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
eef00e39f3 stopped some cvar and cmd clashes 2000-02-09 09:55:58 +00:00
Bill Currie
688d7d470a quick bandaid to stop uquake from segfaulting. 2000-02-09 07:30:45 +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
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
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
e023ae7ffe qw-client and server work again, sound_lib builds, uquake doesn't 2000-02-07 03:49:50 +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
004003ccb0 merge qw_common/common.h and uquake/common.h into common/common.h 2000-02-07 00:43:02 +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
Marcus Sundberg
6403d62a28 Include qargs.h 2000-02-05 16:02:39 +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
7e04ceced5 The pretty green/yellow/blue pixels that hang around after things like 
biosuits, pents, and quads wear off are now gone.  Sort of.  They are
caused by places where two texture edges meet and there are little gaps
at the seams where nothing gets drawn.  This is also why noclip screws w/
the screen if you walk outside of the map in the GL targets.  We now draw
a backdrop whose color is set by r_clearcolor, ala software renderer.
 2000-02-04 04:01:23 +00:00
Joseph Carter
2606dee353 how many times have you wished there was a -nodemos parameter to make the 
demos at startup not happen in uquake?  Guess what?
 2000-02-04 01:24:39 +00:00
Joseph Carter
c0dc03a8ff Other minor changes for uquake, nothing visible 2000-02-03 20:27:25 +00:00
Joseph Carter
9c399a04e5 ixed he irst etter issing roblem 2000-02-03 12:46:08 +00:00
Joseph Carter
cdee91b71f talk sound now happens in UQ again 2000-02-03 10:56:46 +00:00
Loring Holden
f7f02c7b58 client.h: Allow build without zlib 
net_dgrm.c: Get rid of warnings about unknown functions
sys_unix: function warnings, unused variable warning
net_udp.c: use socklen_t always (it is guaranteed to be defined)
 2000-02-03 08:42:14 +00:00
Bill Currie
083021da12 no-asm patch from Darius 2000-02-03 02:34:26 +00:00
Bill Currie
64a5b117ab Demoes are working again (for uncopressed .dem files, anyway) 2000-02-03 01:49:11 +00:00
Bill Currie
e9a2a3fab5 Add gzip support, add -Werror to gcc CFLAGS, clean up misc warnings. 
NOTE: demos are broken for gzipped demo files (possibly normal ones too, not
yet tested).
 2000-02-03 00:34:12 +00:00
Bill Currie
0d679d1648 qw_client/Makefile.in: 
put the gl specific rules back in (some of us have GL in
	/usr/X11R6/include rather than /usr/local/include or /usr/include,
	nudge, nudge).
 2000-01-30 09:36:45 +00:00
Joseph Carter
4f9ce178c1 Merc missed a few things, cleaned the makefiles up a little more 2000-01-30 00:36:41 +00:00
Loring Holden
ff664f9b75 Makefile.in - conditionally run ranlib 
sys_unix.c - copied Sys_DebugLog() from sys_linux.c
 2000-01-29 23:24:16 +00:00
Zephaniah E. Hull
925344be77 uquake now works! All targets I can test! 
I also merged console.[ch] while I was at it..
 2000-01-29 18:46:26 +00:00
Bill Currie
5e4575222d do alsa (sound in general) lib support the Right Way (tm) 
missed 3dfx for gl
 2000-01-29 10:59:02 +00:00
Bill Currie
1c6834bf91 fixed up the #include's so it now compiles (cleanly) 2000-01-29 02:58:16 +00:00
Zephaniah E. Hull
63978c73c6 uquake compile updates.. 2000-01-28 01:03:09 +00:00
Zephaniah E. Hull
f18b3bcf02 HUGE changes.. 
Basicly, sound_lib.a is built, and is compiled into the clients..
Note, uquake is SERIOUSLY FSCKED..
 2000-01-27 17:06:02 +00:00
Loring Holden
88344ef21a glquake.h now included from only the files that use OpenGL, and not from 
common_quakedef.h (and thus all files)

This solves a build break when the OpenGL includes are not in /usr/include,
since the OpenGL include path is only used when compiling files that use
OpenGL.
 2000-01-26 19:00:36 +00:00
Loring Holden
4b42baa382 #ifdef _EXPERIMENTAL did not include all unz* references 2000-01-26 18:56:26 +00:00
Eric Windisch
4440ef4090 Quake3 Pak file support in EXPERIMENTAL, we need -lz and unzip.c included 
for this to work.
--
Eric Windisch
 2000-01-26 02:06:38 +00:00
Joseph Carter
8e85621d15 A few of Mercury's local changes and things I've done to stable.. We're 
attempting to get a build WITHOUT GL to work again...
 2000-01-25 05:59:19 +00:00
Jeff Teunissen
9be70be1b0 Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware! 2000-01-22 22:21:46 +00:00
Jeff Teunissen
6f01303711 Created cl_sbar definitions for UQ in client.h 2000-01-22 22:09:54 +00:00
Zephaniah E. Hull
427b74299d No more -DGLQUAKE!!! 
Took me 9+ hours straight to do it, but its done!
 2000-01-22 12:54:51 +00:00
Jeff Teunissen
35169e2b94 Merged r_main.c -- it wasn't the chore it looked like it was going to be. 
It's still #ifdef'ed all over the place, but there are max. 100 lines that
aren't common.
 2000-01-22 10:51:27 +00:00
Joseph Carter
fd5c61e51a Multiple dirs may be specified on cmdline now. -game dir1,dir2,...,dirN 
Use commas, not spaces or quotes or anything---the function used to do the
parsing is ... unintelligent.  ;>  Something better than the current
method will appear when we migrate to a better cmdline parser.
 2000-01-22 09:16:19 +00:00
Zephaniah E. Hull
34391442c7 Merged render.h, to fix compile warnings.. 
No more compile warnings! A completely clean build on my system!
Wrapped all the unistd.h includes with #ifdef HAVE_UNISTD_H.
Seems like there is more, but that looks like it..
 2000-01-19 11:01:04 +00:00
Nelson Rush
b452b57f5c added the rest of the win32 support, added README.WIN to explain changes 2000-01-19 05:48:59 +00:00
Nelson Rush
45e2b45148 fixed VC win32 support for standalone, thanks to Jason Nelson 
i think i got it all
 2000-01-19 05:40:58 +00:00
Joseph Carter
2d6be70bd7 Technically a new feature, but every developer asked wanted it provided it 
didn't break anything.  It doesn't, so here it is:  show_fps for uquake!
 2000-01-19 05:31:22 +00:00
Marcus Sundberg
c156232c95 Link the *-gl binaries with @DYN_LIBS@. 2000-01-19 01:24:41 +00:00
Marcus Sundberg
b82d8d0e9f Starting up with all IP-addresses banned seems like a very bad idea... 2000-01-18 20:15:35 +00:00
Jeff Teunissen
ebf2aef910 Moved some do_not_include stuff where it belongs...Thanks go to Thad Ward 
<coderjoe@grnet.com>
 2000-01-18 04:10:34 +00:00
Joseph Carter
3f74fe38b8 ./configure --enable-newstyle now actually does something. It changes the 
default game name from "id1" to "base".  This allows you to have full and
shareware version's of Id's pak's installed, as well as other full TC's
you want..  You may want to make base a symlink to id1 for now since you
currently can't have multiple -game's, that's my next fix.
 2000-01-18 03:13:38 +00:00