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

281 commits

Author SHA1 Message Date
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
Marcus Sundberg
08c6bbd84b Changed options_items to VID_options_items. 
Made it start at 0 instead of 13.
 2000-01-09 05:07:43 +00:00
Marcus Sundberg
fa34d3a742 Added M_Print() and M_DrawCheckBox() prototypes. 2000-01-09 05:02:41 +00:00
Eric Windisch
310ab78850 Fixed stupid bug where it can go into dga but not out of it.. untested. 
gl_vidlinuxglx.c
-- Eric Windisch
 2000-01-09 04:33:26 +00:00
Eric Windisch
e430dcb260 If mesa fullscreen/window hack doesn't work, toggle dga.. (gl_vidlinuxglx.c) 
--
Eric Windisch
 2000-01-09 04:29:55 +00:00
Zephaniah E. Hull
a227f53163 Support for a few more keys, and more importantly real support for the 
wheel!!!

Some more tweaks to the speed cheat prevention..
 2000-01-09 04:22:57 +00:00
Eric Windisch
a09bf9b081 Ok, removed all the #define's and everything should be working fine now. 
notify me of any bugs :)
--
Eric Windisch
 2000-01-09 03:03:42 +00:00
Marcus Sundberg
3b6b24ef51 Moved input code to in_svgalib.c. 
Some cleanups.
 2000-01-09 02:44:36 +00:00
Marcus Sundberg
1bf7ae178e Moved input code to in_svgalib.c. 
Cleaned up includes and code.
 2000-01-09 02:43:27 +00:00
Marcus Sundberg
5377871488 Input driver for svgalib, used by gl_vidlinux_3dfx.c and vid_svgalib.c. 2000-01-09 02:41:28 +00:00
Marcus Sundberg
06e87abc90 Avoid warnings about inline with gcc -pedantic 2000-01-09 02:12:25 +00:00
Eric Windisch
8e4c3039d6 Bug fixes for the option menu code, it should compile now :) 
You will not be able to select the new options until I fix that bug...
That bug should be fixed within a few minutes.
--
Eric Windisch
 2000-01-09 01:53:54 +00:00
Eric Windisch
9a2146c1da Added a bit to vid_null.c to aid those making new targets. Nothing big. 2000-01-09 01:23:36 +00:00
Eric Windisch
c5b5abd9ee This is a big change.. I added two new functions that must be in every 
target's video file.  These functions are VID_ExtraOptionDraw() and
VID_ExtraOptionCmd(int options_cursor).

These are to help modulize the option menu a bit, now all you have to do is
define #OPTIONS_ITEMS to one more then the number of items there are (this
is done in your target's vid*.c/gl_vid*.c file)

I also removed a bunch of #ifdefs, although a few #ifdef _WIN32's remain.
--
Eric Windisch
 2000-01-09 01:11:44 +00:00
Marcus Sundberg
bb990403cd Removed commited CVS conflict. 2000-01-08 23:15:03 +00:00
Marcus Sundberg
b227999f7a Fixed a bug in BSD code. 2000-01-08 22:35:21 +00:00
Joseph Carter
8f503d8209 Reverted Neal's GL fullbright patch till we can actually fix it properly 
after the release
 2000-01-08 22:28:07 +00:00