1c6834bf91
fixed up the #include's so it now compiles (cleanly)
2000-01-29 02:58:16 +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
bc4882864e
Fixed compile for qw_server.
2000-01-28 04:14:49 +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
3012055a7b
this was meant to be gone a while ago
2000-01-28 00:28:12 +00:00
b733915e6a
these should not be here (yet)
2000-01-27 22:56:15 +00:00
7de2302a6c
mentioned some neato stuff
2000-01-27 21:57:00 +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
6ccfe788c9
Removed unnecessary #include "glquake.h"
2000-01-27 19:05:44 +00:00
75731706a0
Whoops, included glquake.h instead of cvars.h..
2000-01-27 17:28:49 +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
4b42baa382
#ifdef _EXPERIMENTAL did not include all unz* references
2000-01-26 18:56:26 +00:00
cc6e32b3f2
Added a few things to NEWS/TESTIFY/TODO
2000-01-26 18:42:06 +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
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
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
392ba79ded
Merging debian/ from stable
2000-01-25 05:57:50 +00:00
ba7ab28fe4
merge in changes from the Release_0_1 branch
2000-01-25 04:45:07 +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
6f01303711
Created cl_sbar definitions for UQ in client.h
2000-01-22 22:09:54 +00:00
90655dcadd
Changed sys_wina to sys_dosa
2000-01-22 16:45:23 +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
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
1cc41775a7
Fixed r_wateralpha...
2000-01-22 03:41:35 +00:00
e4056d6d24
Added the NEWS file.
2000-01-22 03:20:25 +00:00
1b5ce392b9
merged identical categories
2000-01-21 06:29:30 +00:00
58af7440fe
mentioned that marcus added the mingw32 support
2000-01-20 17:58:13 +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
ed009f1449
Ok, no more false triggers..
2000-01-19 22:51:34 +00:00
488423edb7
Tweak a bit..
2000-01-19 18:14:28 +00:00
b5034f28d6
The real speed cheat fix!
2000-01-19 16:35:26 +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
Bill Currie
Zephaniah E. Hull
Joseph Carter
Nelson Rush
Jeff Teunissen
Loring Holden
Eric Windisch
Marcus Sundberg