Bill Currie
b099908cc7
fix a potential buffer overflow
2000-02-14 20:28:22 +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
7670da27cf
Now just pass the filename (not path) when loading the plugin. Currently
...
assumes path of ./ but taniwha was going to add a cvar which can be used
if va("./%s", filename) doesn't exist..
2000-02-14 09:02:16 +00:00
Jeff Teunissen
17a4f34644
Whitespace changes to the opening comment
2000-02-14 08:50:30 +00:00
Bill Currie
173c556c0f
put TILE_SIZE back in (still needed by r_sky.c)
2000-02-14 06:15:09 +00:00
Bill Currie
a2e5a8be6d
some mods on the way to a better plugin system
2000-02-14 04:46:57 +00:00
Joseph Carter
fdd6112d74
svgalib input works again.
2000-02-14 03:27:10 +00:00
Eric Windisch
6bd0f67f8c
Deleted unused/obsolete code related to my last commit.
2000-02-14 03:23:04 +00:00
Eric Windisch
17eb4d012c
Some changes to quakefs.c for the pakzip (formerly pak3) support.
...
Found and deleted unused, obsolete functions in r_surf.c
2000-02-14 03:08:14 +00:00
Joseph Carter
6d8a39b2dd
Pass just the filename to the plugin loader, no path. taniwha will do
...
some black voodoo (is that a plug for 3dfx?) with the plugin code shortly
to make it work..
2000-02-14 00:46:43 +00:00
Joseph Carter
f11f71d8a7
we now define LIBDIR when we build targets
2000-02-14 00:35:13 +00:00
Joseph Carter
bb5623aa9e
input.h is gone - was empty anyway. vid_x11.c now is responsible for init
...
of the input routines it can use. All vid targets should do this for the
input method they should use. While this is essentially hardcoding, it's
kinda necessary for now. Once we have everything working and tested we
can work on an interdependency scheme so X input methods only work with X
output methods, etc...
2000-02-13 11:31:00 +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
9a2b4c0e5a
fix sound init
2000-02-13 05:45:38 +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
Zephaniah E. Hull
3b1494b153
Fixed some little errors with the plugin code..
2000-02-12 11:42:56 +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
84e7f8fb05
correct return type of S_IN_Init
2000-02-12 08:23:40 +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
0affdbf681
fixes for uquake
...
(ie #ifdef SERVERONLY -> #if defined(SERVERONLY) || defined(UQUAKE))
2000-02-12 04:18:42 +00:00
Jeff Teunissen
a2f8d0f212
Fixed "vvoid" and "oid" in server.h
2000-02-11 06:01:35 +00:00
Bill Currie
149c6c6523
getting closer to haveing a compiling uq
2000-02-11 05:47:57 +00:00
Bill Currie
e713452ba5
qw-server now compiles and links
2000-02-11 04:55:11 +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
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
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
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
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
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
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
16e636cc01
make independent of zlib (ie use HAS_ZLIB)
2000-02-09 09:12:55 +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
0b3798abff
Fixing consequences of merge + new macro for IPV6
2000-02-08 21:23:46 +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
Bill Currie
9a17811cd3
removed reference to cl_state.h
2000-02-07 03:21:08 +00:00
Bill Currie
aceca3eb86
this shouldn't be in cvs
2000-02-07 01:53:45 +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
Loring Holden
9ff456626f
snd_null.c - snd is another variable defined in snd_dma.c that has to be
...
defined here as well
vid_sunx.c - missing client.h include
2000-02-05 19:42:21 +00:00
Marcus Sundberg
840ff1c72f
Added support for numpad keys and some other ones missing.
2000-02-05 17:49:03 +00:00
Marcus Sundberg
662e6491eb
Make sure we don't use a negative index into sb_faces.
2000-02-05 16:01:15 +00:00
Marcus Sundberg
475353c278
typedef socklen_t here if it doesn't exist.
2000-02-05 15:59:39 +00:00
Marcus Sundberg
69cbd2e370
Now compiles.
2000-02-05 15:21:19 +00:00
Marcus Sundberg
461c66051c
Include <model.h>
2000-02-05 15:08:13 +00:00
Marcus Sundberg
0d77a4577e
Include <math.h>
2000-02-05 15:05:44 +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
Bill Currie
233984564e
configure.in:
...
remove a debug echo
snd_alsa.c:
#include "console.h"
2000-02-04 09:52:43 +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
23b33b7173
4 scrap textures oughtta be enough for anybody.
2000-02-04 01:58:27 +00:00
Bill Currie
0a46c1d979
configure.in:
...
make zlib enabled by default
common/nozip.h:
swap the size and count params to f{read,write} to prevent demo code
breaking
common/quakefs.c:
if zlib is unavailable, there is no point in supporting the .gz
extension
2000-02-03 21:44:46 +00:00
Joseph Carter
218d2fcb9b
random QW changes which should help with sbar stuff later on
2000-02-03 21:16:57 +00:00
Eric Windisch
9e47e221b6
Changed the name of the pak3 code to pakzip. Also a few assorted, trivial code cleanups.
...
-- Eric Windisch
2000-02-03 21:13:23 +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
Jeff Teunissen
9a9384f6a9
Cmd_InitFilesystem(): add -game support to the common cmd.c, #ifdef
...
QUAKEWORLD the Cmd_AddGameDirectory("%s/qw", ... ) call.
2000-02-03 11:29:22 +00:00
Jeff Teunissen
18fc5af9e9
Replaced Knghtbrd's command fix for UQ, added more for completeness.
2000-02-03 11:14:57 +00:00
Joseph Carter
cdee91b71f
talk sound now happens in UQ again
2000-02-03 10:56:46 +00:00
Joseph Carter
e9e147fe84
Most of the commands in uquake/host_cmd.c are simply passed to the server
...
when you type them. This includes say, god, etc... They never got there
however because Mercury forgot to add the uquake stuff to it. We _REALLY_
need to get cls.netchan backported to uquake!
2000-02-03 10:51:06 +00:00
Joseph Carter
51676c32e7
You can tell who has what hardware and libs because they tend to forget to
...
update the files for the stuff they don't use/have...
2000-02-03 10:32:56 +00:00
Joseph Carter
afe3589124
Fix for 3dfx target using lsh's macros
2000-02-03 09:55:11 +00:00
Loring Holden
8349f3e59f
Various changes to get build to work when zlib isn't available...
...
Various changes to get rid of warnings under AIX, Irix, Linux & Solaris...
2000-02-03 08:46:52 +00:00
Bill Currie
75bb541f81
more f*->gz*. forgot to save this one earlier.
2000-02-03 03:09:52 +00:00
Bill Currie
fe681d4427
some more f* -> gz*. need to get home to test this properly.
2000-02-03 02:59:11 +00:00
Bill Currie
73c6ffdde3
a few more f* -> gz* conversions. I don't have GL at work :)
2000-02-03 02:52:05 +00:00
Bill Currie
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +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
Jeff Teunissen
02dab8f828
Re-added Hipnotic/Rogue support to filesystem code. Cleaned up
...
COM_LoadGameDirectory().
2000-02-02 06:49:43 +00:00
Joseph Carter
7bc3e61e27
This isn't funny.. Typo fixed.
2000-02-02 05:33:23 +00:00
Joseph Carter
b210bffd3e
Note to self: ...test before you commit, test before you commit...
2000-02-02 05:10:56 +00:00
Joseph Carter
0393b88e5f
breaks are evil outside switch's, the for loop has an exit condition...
2000-02-02 05:07:29 +00:00
Eric Windisch
b1af7c3e37
Fixed bug that caused:
...
Error: Not enough RAM allocated. Try starting using "-mem 16" or higher
Quakefs.c
2000-02-02 05:01:07 +00:00
Eric Windisch
668fcd2143
Minor changes to quakefs.c; if generations and experimental are defined all files ending in .pak3 are loaded.
2000-02-01 05:13:30 +00:00
Bill Currie
19e937518c
can find "wadfile".gz as well as just "wadfile". NOTE: .gz files don't acutally
...
work yet.
2000-01-30 22:46:30 +00:00
Nelson Rush
8346bd1997
aa tty support, adds text mode qf keyboard/video support.
...
currently i have no idea if this even works because i cannot test it, if anyone is willing to make a target for it i can start debugging.
2000-01-30 07:32:33 +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
3c8f2939af
Makefile.in - Explicitly list patterns instead of using echo, conditionally
...
run ranlib
d_part.c, snd_sun.c, vid_sunx.c - missing includes
2000-01-29 23:22:00 +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
b87a49e6ba
fixed the netchan stuff for uquake
2000-01-29 02:53:28 +00:00
Bill Currie
6f213c8342
common/quakefs.c:
...
make pak3 support dependent on /both/ _EXPERIMENTAL_ and GENERATIONS
qw_client/Makefile.in:
move gl files into cleint/gl so thay can have their own build rules
conditionally added -lasound to LIBS if building for ALSA
2000-01-29 02:31:47 +00:00
Bill Currie
ee26684664
fix to work with Mercury's header changes
2000-01-28 11:13:13 +00:00
Joseph Carter
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
Zephaniah E. Hull
63978c73c6
uquake compile updates..
2000-01-28 01:03:09 +00:00
Bill Currie
b733915e6a
these should not be here (yet)
2000-01-27 22:56:15 +00:00
Bill Currie
8298748791
more work on the merge
2000-01-27 19:27:33 +00:00
Zephaniah E. Hull
fdec8fa33a
Quick fixup for compiling without the gl headers..
2000-01-27 19:10:22 +00:00
Jeff Teunissen
bbec99182c
Added Makefile to .gitignore
2000-01-27 19:08:46 +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
Joseph Carter
d38c50700e
sbar now works exactly like it does in stable, HUD and all for both UQ and
...
for QW. sbar.c is STILL a mess and will continue to be such until I can
check at runtime for QW/UQ.. When that happens the merge can move MUCH
faster for everybody (so somebody do it! hehe)
2000-01-27 07:54:49 +00:00
Bill Currie
335a822d3f
new files. not yet complete so the old ones have not been deleted.
2000-01-27 05:18:39 +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
Eric Windisch
7940ad28cd
Fixed waterwarp bug; athough entities no longer warp underwater.
...
for those interested, someone had added additional conditions which
waterwarp is applied that caused problems.
--
Eric Windisch
2000-01-26 18:15:18 +00:00
Eric Windisch
fb124072be
Adding unzip.h, note: unzip.h and unzip.c are directly copied from
...
aftershock. Several functions added to common.c were copied and
modified from aftershock as well. The rest of common.c's pak3 code (so far)
was written by me. All the standard disclaimers apply.
--
Eric W.
2000-01-26 04:22:33 +00:00
Eric Windisch
29d8ba0b55
Needed for pak3 support, btw. this uses Zlib so possibly not portable.
...
-- Eric Windisch
2000-01-26 02:08:47 +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
Marcus Sundberg
56a753d763
Don't include menu.h if SERVERONLY is defined.
2000-01-24 00:10:39 +00:00
Marcus Sundberg
79a286c45b
A '&' before an array variable is at best ignored, at worst it could do weird stuff.
2000-01-24 00:09:59 +00:00
Zephaniah E. Hull
eae2220a78
Making things even more generic, and a fix for compiling without GL support.
2000-01-23 04:42:43 +00:00
Jeff Teunissen
620ccc3e84
Updates to assist in merging...
2000-01-23 03:52:06 +00:00
Jeff Teunissen
9be70be1b0
Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware!
2000-01-22 22:21:46 +00:00
Marcus Sundberg
595d38cb89
Removed for the second time. If there is a problem with sys_dosa.s and Win32 - fix it right.
2000-01-22 16:43:42 +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
2930814d25
r_main.c cosmetic changes ("Globals missaligned" -> "Globals misaligned"),
...
cleaned up a couple #if's
2000-01-22 11:22:28 +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
1cc41775a7
Fixed r_wateralpha...
2000-01-22 03:41:35 +00:00
Eric Windisch
c2ac36e5ca
r_fog now specifies the fog density, and i moved the color back to white.
...
This is a minor change, I wasn't gonna do it but several users wanted it..
-- Eric Windisch
2000-01-20 04:11:12 +00:00
Eric Windisch
28a832f5ac
Disabled all waterwarp effects for the release, perhaps we will renable it
...
after we fix it. (r_waterwarp now defaults to 0)
-- Eric Windisch
2000-01-20 03:15:11 +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
Bill Currie
49fb4b7dcf
comment out the "Converting 8to24" message
2000-01-19 08:33:15 +00:00
Bill Currie
c5b98914ae
allow VID_ShiftPalette to do something in experimental code
2000-01-19 08:15:30 +00:00
Bill Currie
746d94487d
removed redundant file.
2000-01-19 08:12:37 +00:00
Nelson Rush
736ded3bfb
damnit
2000-01-19 06:02:33 +00:00
Nelson Rush
404afdad37
need to recommit this
2000-01-19 05:56:17 +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
Marcus Sundberg
87eb0216b5
Updated DGA and XMESA code;
...
We now use dlsym() to check for XMesaSetFXmode() at runtime.
If we find XMesaSetFXmode() all DGA code is disabled so it won't clash
with Glide (Glide on Voodoo 3 uses DGA internally...)
For XMESA we now check the MESA_GLX_FX environment variable at startup to
detect whether we are started in windowed or fullscreen mode, and then
set the cvar vid_glx_fullscreen to match that.
2000-01-19 01:55:15 +00:00
Marcus Sundberg
36512aff7f
Call S_Init() from VID_Init().
2000-01-19 01:43:39 +00:00
Marcus Sundberg
bc388056d0
Removed unused variable vidmodes.
2000-01-18 22:58:28 +00:00
Bill Currie
c494af94b6
Remove the #ifndef arround the wateralpha code. It doesn't actually fix the
...
wateraplha+mirroralpha problem according to knghtbrd
2000-01-18 20:33:23 +00:00
Marcus Sundberg
00fa83c923
Removed the stupid and pointless messing with O_NDELAY.
2000-01-18 20:18:35 +00:00
Marcus Sundberg
e47536bb85
The DGA checking code is hardly experimental.
2000-01-18 18:15:15 +00:00
Bill Currie
adeab9e9d8
quakeforge.spec.in:
...
a few corrections to get rpms building. NOTE: THIS WILL NOT WORK FOR
-pre VERSIONS because rpm doesn't like `-' in the version string.
common/gl_rsurf.c:
experimentally comment out some code that /seems/ to fix the
r_{water,mirror}alpha bug.
2000-01-18 05:36:42 +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
Eric Windisch
14168f693a
Removed _EXPERIMENTAL_ from waterripple as it is very stable..
...
also made the cvar a multiplier (the old multiplier was 8), defaults
to 0. The cvs2cl changelog should just be whitespace changes, whoops.
2000-01-18 03:38:04 +00:00
Bill Currie
8bd5fd1e35
added FreeBSD CNAME patch from Daniel J. O'Connor <darius@dons.net.au>
2000-01-17 08:22:36 +00:00
Zephaniah E. Hull
0391657e6b
We now have two versions, what we first identify ourselves as, which is
...
2.40, and the quakeforge version, fixes the annoying spectator bug..
2000-01-16 12:19:30 +00:00
Bill Currie
f5c1241960
missed a HAS_DGA in the _EXPERIMENTAL_ witch hunt. It wasn't critical, but
...
I did this one for completeness.
2000-01-16 07:01:59 +00:00
Bill Currie
22c0af3d0e
mismatched ()s don't help.
2000-01-16 06:55:09 +00:00
Bill Currie
b15fdf6acf
made DGA code _EXPERIMENTAL_
2000-01-16 06:51:01 +00:00
Marcus Sundberg
afba9fa5ba
Support compiling with older glide versions.
2000-01-16 00:51:03 +00:00
Zephaniah E. Hull
c188df7698
Some misc 3dfx changes..
...
Some keys changes for toggle console..
Some (not currently the /best/, but functional) speed cheat improvements..
And some stuff brought in from QuakeLives.. (max rate, and new ping system)
2000-01-15 22:52:56 +00:00
Marcus Sundberg
a0c361ea8a
We need to swap mouse buttons 2 and 3 in X.
2000-01-15 04:54:22 +00:00
Marcus Sundberg
cddc97a121
Took some input code from vid_x.c
2000-01-15 04:43:08 +00:00
Nelson Rush
b5e7641bce
do_grab() was a typo, should be do_grabs()
2000-01-15 04:41:33 +00:00
Marcus Sundberg
0206281103
Changed gl_vidlinuxglx.c to gl_vidglx.c as it really doesn't have anything
...
with Linux to do.
2000-01-15 04:14:04 +00:00
Marcus Sundberg
360e6f9f86
Enabled DGA code.
...
Added VidMode fullscreen mode.
Support for resizing the window on the fly.
Some code cleanups.
Please test!
2000-01-15 04:09:22 +00:00
Marcus Sundberg
bc1a8fa188
We need to pass the XF86VidModeModeInfo pointers to XF86VidModeSwitchToMode
...
so checking modes in VID_CheckVMode and converting them to our own format
isn't really useful.
2000-01-15 03:31:05 +00:00
Bill Currie
008039dd4f
Improved device handling. By default, quake will now grovel around ALSA'a
...
device list to find an available output device. This means that for systems
with multiple cards or a card with more than one playback device, quake and
another app can run at the same time (eg an mp3 player and quake)
2000-01-15 02:20:35 +00:00
Marcus Sundberg
9388195afb
Made it possible to pass NULL arguments for maj_ver and/or min_ver.
2000-01-14 22:31:08 +00:00
Bill Currie
61bf2de3ef
common/mdfour.c common/pr_edict.c common/pr_exec.c uquake/r_main.c:
...
various warning cleanups
configure.in:
check for XShm before enabling X
2000-01-14 03:41:40 +00:00
Marcus Sundberg
31eb4df88c
Applied patch from Ricardo Veguilla.
2000-01-13 18:31:45 +00:00
Bill Currie
14657882e5
alsa api changed slightly (for the better, though. more consistent)
2000-01-13 12:22:53 +00:00
Jeff Teunissen
c52edec836
Folded r_volfog into -D_EXPERIMENTAL_, since it currently does not work.
...
It can probably be uncommented now.
2000-01-13 10:33:15 +00:00
Marcus Sundberg
72f581c1cf
Big cleanups and some bug fixes in vid_sunx.c and vid_x.c.
...
They will be merged into one file soon.
2000-01-13 01:43:17 +00:00
Loring Holden
9169090a05
An "#ifdef _EXPERIMENTAL_" is required around gl_waterripple reference
2000-01-12 22:52:49 +00:00
Jeff Teunissen
9bc10e5940
Applied raptor's r_waterwarp enable/disable patch. r_waterwarp now works
...
-- we still have to find the waterwarp bug, but this is a start.
Moved raptor's r_waterripple effect into #define _EXPERIMENTAL_ until
release. It doesn't break anything that we know of, but this is _still_ a
freeze we're in, and this is a new feature.
2000-01-12 21:43:48 +00:00
Eric Windisch
b06d98de76
This is an extremely small feature that I figured out while trying to find the
...
waterwarp bug. This creates r_waterripple that causes a wave effect when
set to 1. Perhaps I will change it after release to adjust the size of the
waves...
-- Eric Windisch
2000-01-12 02:24:09 +00:00
Marcus Sundberg
f36c52b978
Made VID_CheckDGA() check for DirectVideo capability.
...
Made VID_CheckVMode() return a list of supported modes.
2000-01-12 00:53:21 +00:00
Bill Currie
fa44a7de11
applied Xoxus' patch to check for svgalib errors, but exiting if vga_setmode
...
fails.
2000-01-11 04:59:45 +00:00
Jeff Teunissen
9af36c78ff
Removed personally offensive copyright notice (mine -- I'll let anyone
...
else take all the credit they want, keep me out of it); edited so that the
DGA/Vmode detection functions return 0 if HAS_DGA is not defined.
2000-01-11 04:18:13 +00:00
Marcus Sundberg
923c6fa8d3
Made the code actually do something useful instead of segfaulting.
...
Changed functions so you get the version of the extensions.
2000-01-11 01:19:51 +00:00
Marcus Sundberg
60400e0537
config.h is included from the quake headers.
2000-01-11 01:18:23 +00:00
Bill Currie
b148faf259
common/snd_alsa.c:
...
do as much autodetection as possible, giveing the nicest sound possible
May need special handing for old cards that can only do mono at 44100,
but can do stereo at 22050 (eg sbpro). Depends on how alsa handles
these. It is prefereable to have 22050 stereo over 44100 mono.
common/snd_dma.c:
fixed passing structure instead of address of structure to Q_memset.
2000-01-10 08:38:18 +00:00
Eric Windisch
e688febe63
The previous 2 commits were on the rendering of menu.c
...
This commit makes it functional :) Wierd bug where fullscreen switch
isn't working, must fix...
-- Eric Windisch
2000-01-09 20:34:01 +00:00
Eric Windisch
e6c9e1e5cd
I forgot to modify vid_x.c, quake-x11 works now :)
...
--
Eric Windisch
2000-01-09 20:13:23 +00:00
Eric Windisch
2021a48efc
Menu system is a bit more modular now and we have a workaround the problem
...
with the 'holes', we are using a (local) variable and incrementing it by 8
instead of using static values.
--
Eric Windisch
2000-01-09 20:10:55 +00:00
Loring Holden
7b8c992435
draw.h - define Draw_Crosshair() always
...
vid_sunx.c - If can't get big enough shared memory image, try to get a
non-shared image (this is more of a problem with 24-bit than 8-bit - should
add a -bpp command for the SW targets)
glquake.h - combined version of {uquake,qw_client}/glquake.h
2000-01-09 19:40:44 +00:00
Joseph Carter
cf393a1068
Commented a couple lines out of vid_sdl.c which seem not to be needed
...
anymore (and were preventing building of the SDL target..)
2000-01-09 17:59:59 +00:00
Joseph Carter
3dfe70f066
ARGH! Mesa doesn't work with gl_ztrick 1 anymore and neither does Utah
...
GLX, so it now defaults to 0 for the linux -gl target..
2000-01-09 12:08:39 +00:00
Nelson Rush
78f728731c
added Ricardo Veguilla's patch (it was sooooo messed up had to hand add it)
...
i *hope* this works....
Here's the patch for fixing the _windowed_mouse cvar
on SDL binaries. Its now set by default to "0" to
match the default value in vid_x.c and
gl_vidlinuxglx.c.
2000-01-09 11:20:55 +00:00
Jeff Teunissen
e5baa7240c
Added header defs to dga_check.h
2000-01-09 08:12:18 +00:00
Jeff Teunissen
e54b1c0f6c
Repaired small screwup on my part in prototypes
2000-01-09 07:52:43 +00:00
Jeff Teunissen
e36fbe4d88
Added support for checking whether DGA/Vmode support is available at
...
runtime. These files are not used yet!
2000-01-09 07:50:39 +00:00
Eric Windisch
0097989a6d
Put CvarRegisterVariable(&vid_glx_mode) in the right spot, although it worked
...
before; now, it is organized :)
-- Eric Windisch
2000-01-09 06:52:34 +00:00
Marcus Sundberg
6a3e312d99
Fixed case values.
2000-01-09 06:45:17 +00:00
Eric Windisch
26c8db3327
Commented out Dga code in VID_ExtraOptionCmd() untill someone writes some that works :)
2000-01-09 06:14:30 +00:00
Eric Windisch
8450a21789
Hopefully, everything is somewhat working and everything compiles now.
...
Although i wouldn't be surprised if it doesn't :)
-- Eric Windisch
2000-01-09 06:10:20 +00:00
Marcus Sundberg
dc89973cae
Cleaned up includes.
...
#undef HAS_DGA until DGA extension is being properly used.
Added dgamouse variable.
Changed options_items into VID_options_items.
Made it start at 0 instead of 13.
Removed DGA code in VID_ExtraOptionCmd(). It doesn't do what it's supposed
to do, and DGA is not the right way to do it.
2000-01-09 05:55:26 +00:00
Eric Windisch
8dec8b28ff
Maybe gl_vidlinuxglx.c works now ? :)
...
if it doesn't sorry, if it does.. maybe everyone will get off my case ;)
-- Eric Windisch
2000-01-09 05:36:41 +00:00
Eric Windisch
8862780003
More bug fixes to gl_vidlinuxglx.c for fullscreen/windowed switching..
...
now requires XMESA and DGA to do fullscreen switching,
although it shouldn't need XMESA in the future if you have DGA.
(XMESA needs DGA as a fallback, or that would be a bug in itself)
--
Eric Windisch
2000-01-09 05:23:14 +00:00
Marcus Sundberg
e144f6ceee
Changed options_menu to VID_options_menu.
...
Made it start at 0 instead of 13.
Added support for 800x600 resolution.
2000-01-09 05:09:16 +00:00