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
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
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
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
4f9ce178c1
Merc missed a few things, cleaned the makefiles up a little more
2000-01-30 00:36:41 +00:00
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
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
b87a49e6ba
fixed the netchan stuff for uquake
2000-01-29 02:53:28 +00:00
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
ee26684664
fix to work with Mercury's header changes
2000-01-28 11:13:13 +00:00
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
63978c73c6
uquake compile updates..
2000-01-28 01:03:09 +00:00
b733915e6a
these should not be here (yet)
2000-01-27 22:56:15 +00:00
8298748791
more work on the merge
2000-01-27 19:27:33 +00:00
fdec8fa33a
Quick fixup for compiling without the gl headers..
2000-01-27 19:10:22 +00:00
bbec99182c
Added Makefile to .gitignore
2000-01-27 19:08:46 +00:00
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
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
335a822d3f
new files. not yet complete so the old ones have not been deleted.
2000-01-27 05:18:39 +00:00
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
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
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
29d8ba0b55
Needed for pak3 support, btw. this uses Zlib so possibly not portable.
...
-- Eric Windisch
2000-01-26 02:08:47 +00:00
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
56a753d763
Don't include menu.h if SERVERONLY is defined.
2000-01-24 00:10:39 +00:00
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
eae2220a78
Making things even more generic, and a fix for compiling without GL support.
2000-01-23 04:42:43 +00:00
620ccc3e84
Updates to assist in merging...
2000-01-23 03:52:06 +00:00
9be70be1b0
Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware!
2000-01-22 22:21:46 +00:00
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
427b74299d
No more -DGLQUAKE!!!
...
Took me 9+ hours straight to do it, but its done!
2000-01-22 12:54:51 +00:00
2930814d25
r_main.c cosmetic changes ("Globals missaligned" -> "Globals misaligned"),
...
cleaned up a couple #if's
2000-01-22 11:22:28 +00:00
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
1cc41775a7
Fixed r_wateralpha...
2000-01-22 03:41:35 +00:00
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
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
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
49fb4b7dcf
comment out the "Converting 8to24" message
2000-01-19 08:33:15 +00:00
c5b98914ae
allow VID_ShiftPalette to do something in experimental code
2000-01-19 08:15:30 +00:00
746d94487d
removed redundant file.
2000-01-19 08:12:37 +00:00
736ded3bfb
damnit
2000-01-19 06:02:33 +00:00
404afdad37
need to recommit this
2000-01-19 05:56:17 +00:00
b452b57f5c
added the rest of the win32 support, added README.WIN to explain changes
2000-01-19 05:48:59 +00:00
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
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
36512aff7f
Call S_Init() from VID_Init().
2000-01-19 01:43:39 +00:00
bc388056d0
Removed unused variable vidmodes.
2000-01-18 22:58:28 +00:00
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
00fa83c923
Removed the stupid and pointless messing with O_NDELAY.
2000-01-18 20:18:35 +00:00
e47536bb85
The DGA checking code is hardly experimental.
2000-01-18 18:15:15 +00:00
Eric Windisch
Bill Currie
Nelson Rush
Joseph Carter
Loring Holden
Zephaniah E. Hull
Jeff Teunissen
Marcus Sundberg