Commit graph

247 commits

Author SHA1 Message Date
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
Marcus Sundberg
c19f07bf99 Fixed typo in BSD code. 2000-01-08 22:25:18 +00:00
Marcus Sundberg
ef0921cfb7 Should work on NetBSD (and with some luck OpenBSD) too now.
Fixed bug in the BSD code.
2000-01-08 22:04:37 +00:00
Marcus Sundberg
e52d41a5b5 Remove unused variables. 2000-01-08 17:38:21 +00:00
Marcus Sundberg
754215066b Fix warnings. 2000-01-08 17:37:36 +00:00
Zephaniah E. Hull
67f8201590 Applied patch from Roger Sen Montero <rogersm@tau.uab.es> to switch to
using vsnprintf/snprintf..
2000-01-08 13:55:33 +00:00
Bill Currie
ef18af2a9b common/sound.h:
added extern for soundtime. Don't really know wy it wasn't there in the
	first place.
qw_client/Makefile.in uquake/Makefile.in:
	make the alsa objects say the right thing: snd_dma.c and snd_alsa.c
common/snd_alsa.c:
	New file. makes things go.
2000-01-08 12:14:07 +00:00
Jeff Teunissen
092d32cd23 Fixed gl_doubleeyes and made it common, whitesize cleanup to gl_warp.c 2000-01-08 07:42:14 +00:00
Nelson Rush
dfbfbb6711 readded a copyright notice that somehow got removed
added "Portions" statement to the copyright statement

Please note, if you want to put a copyright notice on a source file stating that a portion of it is copyright yourself or another author please put "Portions Copyright...", if adding a seperate .c file that contains otherwise author(s) this doesn't apply.
2000-01-08 04:50:26 +00:00
Jeff Teunissen
c797a758d5 Whitespace changes, cleanup of gl_rmain.c 2000-01-07 21:36:15 +00:00
Marcus Sundberg
19fd8a6816 A '&' before an array variable is at best ignored, at worst it could do
weird stuff.
2000-01-07 21:31:20 +00:00
Marcus Sundberg
c11b3873ff Whitespace is not allowed before the '#' of pre-processor directives. 2000-01-07 21:09:58 +00:00
Zephaniah E. Hull
5123746344 Translate the outputs to ASCII.. 2000-01-07 06:29:44 +00:00
Nelson Rush
2151636145 added copyrights for buffer overrun fixes 2000-01-07 05:47:53 +00:00
Eric Windisch
2bba6d05c2 Commented out volume fog until it works, or at least until after release. 2000-01-07 04:23:16 +00:00
Eric Windisch
d1ac3a1abf Added a "tested on" system in README (no big deal)
Added some stuff to TODO
Some more volumetric fog code, this isn't release quality but it won't affect
anything.
2000-01-07 03:59:52 +00:00
Marcus Sundberg
682f7940d4 Some cleanups for future merge. 2000-01-07 01:49:28 +00:00
Marcus Sundberg
0279cc5a4b Removed useless functions. 2000-01-07 01:25:33 +00:00
Marcus Sundberg
39b2b2c3b9 Use Sys_DoubleTime instead of Sys_FloatTime. 2000-01-07 01:16:26 +00:00
Marcus Sundberg
983243b577 Moved Sys_mkdir() and Sys_DoubleTime() into common/sys_common.c 2000-01-06 18:36:14 +00:00
Marcus Sundberg
3dc80e29b7 Moved Sys_FileTime() into common/sys_common.c 2000-01-06 17:46:47 +00:00
Marcus Sundberg
6e9074153f Moved Sys_Printf into common/sys_common.c 2000-01-06 16:56:38 +00:00
Loring Holden
e88e11d77c Removed unused variables 2000-01-06 16:24:05 +00:00
Joseph Carter
2193966719 Copyright notice stuff 2000-01-06 13:48:07 +00:00
Nelson Rush
d1efeccbf5 added loring's patch
The following patch fixes the build for those platforms that do not have CD
support (ie, are using null support)
2000-01-06 05:35:30 +00:00
Eric Windisch
930c9497b0 r_local.h was missing a few declarations killing glquake compile at least on my system. The declarations missing were:
void D_Start_Particle(void);
	void D_DrawParticle(void);
	void D_EndParticle(void);
2000-01-06 05:21:08 +00:00
Nelson Rush
6e69591b3f added loring's patch to fix non-linux platform problems
Solaris stuff:
* vid_sunx.c - Added missing S_Init() so sounds works
* vid_sunx.c - Don't XCloseDisplay() if x_disp is 0
* vid_sunx.c - ClientMessage references only apropos for QuakeWorld

Non-linux stuff:
* qw_client/Makefile.in - use QW_CL_SYS_SRC instead of SYS_SRC
2000-01-06 04:33:34 +00:00
Marcus Sundberg
8a2d0d0e8f Fix typo in BSD defines. 2000-01-06 03:13:59 +00:00
Marcus Sundberg
42154bc63f Moved CD_f from cd_linux.c and cd_win.c into cd_wrapper.c.
Added support for CDROM on (Free)BSD.
2000-01-06 02:43:04 +00:00
Marcus Sundberg
581e31b505 Fixed some warnings. 2000-01-06 01:43:44 +00:00
Marcus Sundberg
4120cda2d2 Include config.h and use #ifdef HAVE_SYM_PREFIX_UNDERSCORE instead of bogus #ifdef ELF 2000-01-06 00:52:51 +00:00
Marcus Sundberg
b86ca17101 Fixed bunch of unused variables. 2000-01-06 00:29:41 +00:00
Marcus Sundberg
04c438c55e Check return code from mmap() properly. 2000-01-05 21:22:48 +00:00
Joseph Carter
4ebf133971 Merged the makefile targets as much as is safe to do without a serious
code alteration.  Cut my build time from 20 minutes down to about 5 from
an autoconf-clean tree.
2000-01-05 19:10:52 +00:00
Zephaniah E. Hull
b68f84619e Fixes for portability issues.. 2000-01-05 16:55:01 +00:00