Commit graph

1000 commits

Author SHA1 Message Date
Zephaniah E. Hull
75731706a0 Whoops, included glquake.h instead of cvars.h.. 2000-01-27 17:28:49 +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
Loring Holden
4b42baa382 #ifdef _EXPERIMENTAL did not include all unz* references 2000-01-26 18:56:26 +00:00
Eric Windisch
cc6e32b3f2 Added a few things to NEWS/TESTIFY/TODO 2000-01-26 18:42:06 +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
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
Joseph Carter
392ba79ded Merging debian/ from stable 2000-01-25 05:57:50 +00:00
Bill Currie
ba7ab28fe4 merge in changes from the Release_0_1 branch 2000-01-25 04:45:07 +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
Jeff Teunissen
6f01303711 Created cl_sbar definitions for UQ in client.h 2000-01-22 22:09:54 +00:00
Marcus Sundberg
90655dcadd Changed sys_wina to sys_dosa 2000-01-22 16:45:23 +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
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
Joseph Carter
1cc41775a7 Fixed r_wateralpha... 2000-01-22 03:41:35 +00:00
Joseph Carter
e4056d6d24 Added the NEWS file. 2000-01-22 03:20:25 +00:00
Nelson Rush
1b5ce392b9 merged identical categories 2000-01-21 06:29:30 +00:00
Nelson Rush
58af7440fe mentioned that marcus added the mingw32 support 2000-01-20 17:58:13 +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
ed009f1449 Ok, no more false triggers.. 2000-01-19 22:51:34 +00:00
Zephaniah E. Hull
488423edb7 Tweak a bit.. 2000-01-19 18:14:28 +00:00
Zephaniah E. Hull
b5034f28d6 The real speed cheat fix! 2000-01-19 16:35:26 +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
9f7c061fb0 find ... rm should not be needed now 2000-01-19 10:53:38 +00:00
Bill Currie
4ce6fd0de1 make distclean now does a better clean 2000-01-19 10:41:18 +00:00
Bill Currie
77ef82b00a forgot this stuff in the rpm stuff move 2000-01-19 10:34:31 +00:00
Bill Currie
9ab2718e56 moved build_rpm.in and quakeforge.spec.in to the rpm directory 2000-01-19 10:31:53 +00:00
Zephaniah E. Hull
1b35ce2acc Zapped. 2000-01-19 09:47:45 +00:00
Jeff Teunissen
b21a53861e Changed URL for Utah GLX 2000-01-19 09:02:12 +00:00
Jeff Teunissen
e28f7306aa Moved Linux opening-svgalib-targets-from-X notes to section 4.2,
"Platform-specific Issues".
2000-01-19 08:37:54 +00:00
Bill Currie
49fb4b7dcf comment out the "Converting 8to24" message 2000-01-19 08:33:15 +00:00
Nelson Rush
32f47abe81 added mention in the errata about x11 exiting and the need to 'xset r on' to get repeat back.. 2000-01-19 08:19:41 +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
Jeff Teunissen
a2a7c92e25 Possible fix to gas2masm for VC++ 2000-01-19 07:59:47 +00:00
Nelson Rush
53982ecb8f fixed directions 2000-01-19 06:30:19 +00:00
Jeff Teunissen
2ed2f5f7ca Added very evil, and very unportable, Makefile for gas2masm on Linux for
testing purposes. It may go away soon, or improved drastically -- I don't
know.
2000-01-19 06:29:45 +00:00