23b33b7173
4 scrap textures oughtta be enough for anybody.
2000-02-04 01:58:27 +00:00
0a46c1d979
configure.in:
...
make zlib enabled by default
common/nozip.h:
swap the size and count params to f{read,write} to prevent demo code
breaking
common/quakefs.c:
if zlib is unavailable, there is no point in supporting the .gz
extension
2000-02-03 21:44:46 +00:00
218d2fcb9b
random QW changes which should help with sbar stuff later on
2000-02-03 21:16:57 +00:00
9e47e221b6
Changed the name of the pak3 code to pakzip. Also a few assorted, trivial code cleanups.
...
-- Eric Windisch
2000-02-03 21:13:23 +00:00
c0dc03a8ff
Other minor changes for uquake, nothing visible
2000-02-03 20:27:25 +00:00
9c399a04e5
ixed he irst etter issing roblem
2000-02-03 12:46:08 +00:00
9a9384f6a9
Cmd_InitFilesystem(): add -game support to the common cmd.c, #ifdef
...
QUAKEWORLD the Cmd_AddGameDirectory("%s/qw", ... ) call.
2000-02-03 11:29:22 +00:00
18fc5af9e9
Replaced Knghtbrd's command fix for UQ, added more for completeness.
2000-02-03 11:14:57 +00:00
cdee91b71f
talk sound now happens in UQ again
2000-02-03 10:56:46 +00:00
e9e147fe84
Most of the commands in uquake/host_cmd.c are simply passed to the server
...
when you type them. This includes say, god, etc... They never got there
however because Mercury forgot to add the uquake stuff to it. We _REALLY_
need to get cls.netchan backported to uquake!
2000-02-03 10:51:06 +00:00
51676c32e7
You can tell who has what hardware and libs because they tend to forget to
...
update the files for the stuff they don't use/have...
2000-02-03 10:32:56 +00:00
afe3589124
Fix for 3dfx target using lsh's macros
2000-02-03 09:55:11 +00:00
8349f3e59f
Various changes to get build to work when zlib isn't available...
...
Various changes to get rid of warnings under AIX, Irix, Linux & Solaris...
2000-02-03 08:46:52 +00:00
75bb541f81
more f*->gz*. forgot to save this one earlier.
2000-02-03 03:09:52 +00:00
fe681d4427
some more f* -> gz*. need to get home to test this properly.
2000-02-03 02:59:11 +00:00
73c6ffdde3
a few more f* -> gz* conversions. I don't have GL at work :)
2000-02-03 02:52:05 +00:00
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +00:00
e9a2a3fab5
Add gzip support, add -Werror to gcc CFLAGS, clean up misc warnings.
...
NOTE: demos are broken for gzipped demo files (possibly normal ones too, not
yet tested).
2000-02-03 00:34:12 +00:00
02dab8f828
Re-added Hipnotic/Rogue support to filesystem code. Cleaned up
...
COM_LoadGameDirectory().
2000-02-02 06:49:43 +00:00
7bc3e61e27
This isn't funny.. Typo fixed.
2000-02-02 05:33:23 +00:00
b210bffd3e
Note to self: ...test before you commit, test before you commit...
2000-02-02 05:10:56 +00:00
0393b88e5f
breaks are evil outside switch's, the for loop has an exit condition...
2000-02-02 05:07:29 +00:00
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
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
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
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
8bd5fd1e35
added FreeBSD CNAME patch from Daniel J. O'Connor <darius@dons.net.au>
2000-01-17 08:22:36 +00:00
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
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
22c0af3d0e
mismatched ()s don't help.
2000-01-16 06:55:09 +00:00
b15fdf6acf
made DGA code _EXPERIMENTAL_
2000-01-16 06:51:01 +00:00
afba9fa5ba
Support compiling with older glide versions.
2000-01-16 00:51:03 +00:00
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
a0c361ea8a
We need to swap mouse buttons 2 and 3 in X.
2000-01-15 04:54:22 +00:00
cddc97a121
Took some input code from vid_x.c
2000-01-15 04:43:08 +00:00
b5e7641bce
do_grab() was a typo, should be do_grabs()
2000-01-15 04:41:33 +00:00
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
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
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
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
9388195afb
Made it possible to pass NULL arguments for maj_ver and/or min_ver.
2000-01-14 22:31:08 +00:00
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
31eb4df88c
Applied patch from Ricardo Veguilla.
2000-01-13 18:31:45 +00:00
14657882e5
alsa api changed slightly (for the better, though. more consistent)
2000-01-13 12:22:53 +00:00
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
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
9169090a05
An "#ifdef _EXPERIMENTAL_" is required around gl_waterripple reference
2000-01-12 22:52:49 +00:00
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
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
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
fa44a7de11
applied Xoxus' patch to check for svgalib errors, but exiting if vga_setmode
...
fails.
2000-01-11 04:59:45 +00:00
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
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
60400e0537
config.h is included from the quake headers.
2000-01-11 01:18:23 +00:00
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
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
e6c9e1e5cd
I forgot to modify vid_x.c, quake-x11 works now :)
...
--
Eric Windisch
2000-01-09 20:13:23 +00:00
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
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
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
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
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
e5baa7240c
Added header defs to dga_check.h
2000-01-09 08:12:18 +00:00
e54b1c0f6c
Repaired small screwup on my part in prototypes
2000-01-09 07:52:43 +00:00
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
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
6a3e312d99
Fixed case values.
2000-01-09 06:45:17 +00:00
26c8db3327
Commented out Dga code in VID_ExtraOptionCmd() untill someone writes some that works :)
2000-01-09 06:14:30 +00:00
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
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
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
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
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
08c6bbd84b
Changed options_items to VID_options_items.
...
Made it start at 0 instead of 13.
2000-01-09 05:07:43 +00:00
fa34d3a742
Added M_Print() and M_DrawCheckBox() prototypes.
2000-01-09 05:02:41 +00:00
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
e430dcb260
If mesa fullscreen/window hack doesn't work, toggle dga.. (gl_vidlinuxglx.c)
...
--
Eric Windisch
2000-01-09 04:29:55 +00:00
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
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
3b6b24ef51
Moved input code to in_svgalib.c.
...
Some cleanups.
2000-01-09 02:44:36 +00:00
1bf7ae178e
Moved input code to in_svgalib.c.
...
Cleaned up includes and code.
2000-01-09 02:43:27 +00:00
5377871488
Input driver for svgalib, used by gl_vidlinux_3dfx.c and vid_svgalib.c.
2000-01-09 02:41:28 +00:00
06e87abc90
Avoid warnings about inline with gcc -pedantic
2000-01-09 02:12:25 +00:00
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
9a2146c1da
Added a bit to vid_null.c to aid those making new targets. Nothing big.
2000-01-09 01:23:36 +00:00
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
bb990403cd
Removed commited CVS conflict.
2000-01-08 23:15:03 +00:00
b227999f7a
Fixed a bug in BSD code.
2000-01-08 22:35:21 +00:00
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
c19f07bf99
Fixed typo in BSD code.
2000-01-08 22:25:18 +00:00
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
e52d41a5b5
Remove unused variables.
2000-01-08 17:38:21 +00:00
754215066b
Fix warnings.
2000-01-08 17:37:36 +00:00
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
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
092d32cd23
Fixed gl_doubleeyes and made it common, whitesize cleanup to gl_warp.c
2000-01-08 07:42:14 +00:00
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
c797a758d5
Whitespace changes, cleanup of gl_rmain.c
2000-01-07 21:36:15 +00:00
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
c11b3873ff
Whitespace is not allowed before the '#' of pre-processor directives.
2000-01-07 21:09:58 +00:00
5123746344
Translate the outputs to ASCII..
2000-01-07 06:29:44 +00:00
2151636145
added copyrights for buffer overrun fixes
2000-01-07 05:47:53 +00:00
2bba6d05c2
Commented out volume fog until it works, or at least until after release.
2000-01-07 04:23:16 +00:00
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
682f7940d4
Some cleanups for future merge.
2000-01-07 01:49:28 +00:00
0279cc5a4b
Removed useless functions.
2000-01-07 01:25:33 +00:00
39b2b2c3b9
Use Sys_DoubleTime instead of Sys_FloatTime.
2000-01-07 01:16:26 +00:00
983243b577
Moved Sys_mkdir() and Sys_DoubleTime() into common/sys_common.c
2000-01-06 18:36:14 +00:00
3dc80e29b7
Moved Sys_FileTime() into common/sys_common.c
2000-01-06 17:46:47 +00:00
6e9074153f
Moved Sys_Printf into common/sys_common.c
2000-01-06 16:56:38 +00:00
e88e11d77c
Removed unused variables
2000-01-06 16:24:05 +00:00
2193966719
Copyright notice stuff
2000-01-06 13:48:07 +00:00
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
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
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
8a2d0d0e8f
Fix typo in BSD defines.
2000-01-06 03:13:59 +00:00
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
581e31b505
Fixed some warnings.
2000-01-06 01:43:44 +00:00
4120cda2d2
Include config.h and use #ifdef HAVE_SYM_PREFIX_UNDERSCORE instead of bogus #ifdef ELF
2000-01-06 00:52:51 +00:00
b86ca17101
Fixed bunch of unused variables.
2000-01-06 00:29:41 +00:00
04c438c55e
Check return code from mmap() properly.
2000-01-05 21:22:48 +00:00
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
b68f84619e
Fixes for portability issues..
2000-01-05 16:55:01 +00:00
dbbeff44fc
We now have fullbright textures for GL!
...
This is going in as a bug fix after talking it over with Knghtbrd and Deek..
2000-01-05 15:23:12 +00:00
6e6f044ef1
VERY IMPORTANT commit before release---crosshair 3 was a little high, you
...
could hit anything simple with it sure, but some of us snipe. Fixed it.
2000-01-05 10:25:30 +00:00
d28880656b
Win32 has snprintf and vsnprintf underscored. Use proper defines if needed.
2000-01-05 01:19:13 +00:00
8ce6e3d062
Removed the dummy VGA_* variables as they are not needed anymore.
2000-01-05 00:31:47 +00:00
705c1d0e3b
fixed some problems
2000-01-05 00:11:02 +00:00
a77bb35db6
Fixed buffer overflow problems, changed sprintf to snprintf don't use this yet, i have a few things that need to be fixed.
2000-01-05 00:05:48 +00:00
b9d6599958
Include mgraph.h here.
...
Made mouseactive extern (defined in in_win.c)
Removed unused variables.
Some minor cleanups.
2000-01-04 23:32:43 +00:00
bb1f7ac924
Define uiWheelMessage and mouseactive here.
...
Removed unused variables.
Some minor cleanups.
2000-01-04 23:31:14 +00:00
fce145168c
Arm x86 assembly with #if id386
2000-01-04 23:30:00 +00:00
6120f2dab5
Server need mmsystem.h for timeGetTime()
2000-01-04 22:24:49 +00:00
de443cad14
Mingw32 needs to include initguid.h before dinput.c - do that if we have it
...
uiWheelMessage needs to be defined here.
Avoid multi-line C++-comments.
2000-01-04 22:16:27 +00:00
f0a9fffc5a
Add support for cd_win.c
2000-01-04 22:11:17 +00:00
5d5cfd6e4b
Include mmsystem.h if we have it.
2000-01-04 22:09:43 +00:00
19b2728495
Applied prototype fix to vid_svgalib.c and removed unused variable from qw_client/cl_main.c
2000-01-04 05:52:00 +00:00
de56a6f223
removed extra m_filter registration
2000-01-04 05:38:27 +00:00
5f20ff0bd7
added loring's multi-platform, non-mesa OpenGL patch.
2000-01-04 05:33:00 +00:00
49d9711def
Small mingw32 fix and updated debian/control
2000-01-04 04:14:35 +00:00
740177b2c0
Another merge from BigM
2000-01-04 03:34:56 +00:00
6006adda7c
Backported and merged the qw_client/keys.c to uquake.
...
Added support for the KP_* keysyms..
2000-01-04 01:53:31 +00:00
0b8df448c2
Major configure.in update, applied BigM's gl_rsurf.c merge patch
2000-01-04 01:03:18 +00:00
ced209c8ba
Reordering the scancode stuff for some stuff I'm doing after release..
2000-01-04 00:17:30 +00:00
fbc21a8c5e
* Merged d_polyse.c from qw_client, _unchanged_ -- current data suggest it
...
works properly with UQ.
* Repaired my FIXME in r_alias.c (caused UQ's software targets to segfault)
2000-01-03 23:27:17 +00:00
0b480a8691
added copyright lines
2000-01-03 22:12:26 +00:00
d75ee8d6b7
Optimized VectorCompare()
2000-01-03 22:10:13 +00:00
55a4e4e01c
Fixed register_check(), renamed a couple of non-headers to the "standard"
...
naming of .-c, also the very beginnings of the eventual source reformat.
2000-01-03 21:54:18 +00:00
6337f34ba1
* Fixed an X11 software renderer crash in vid_x.c, thanks Justin A. McCright
...
* Renamed chase_* to cl_chasecam_* in UQ to match their parent cvar.
* Changed cl_chasecam* in UQ to be saved in config.cfg
* Moved dosasm.s to common, though it doesn't seem to be referenced at _all_
2000-01-03 21:20:01 +00:00
7a6884e4fb
Portability fix
2000-01-03 20:16:47 +00:00
a6a29bdb63
Moved skin.c to common/ -- it doesn't conflict with UQ, so it might as
...
well be moved now.
2000-01-03 16:53:06 +00:00
c8339f5d3a
Moved buildnum.c to common/ -- we don't use it any more, but we could.
...
Also changed it so that the starting build number would be 21 Dec 1999,
the date of the Q1 source release. Today would be build number 13. :)
2000-01-03 16:49:28 +00:00
978ccb3cc8
Merged nonintel.c into common/
2000-01-03 13:45:02 +00:00
71b8dc4cad
Merged r_bsp.c into common/
2000-01-03 13:35:09 +00:00
a671482dd5
sys_linux.c merged and moved into common/
2000-01-03 12:12:13 +00:00
202f794fbe
The merge continues...sys_null.c (Portability aid) is common.
2000-01-03 11:14:42 +00:00
518401c90c
Simplified COM_Block*Checksum (don't worry, it's still compatible -- I
...
tested it), merged r_alias.c (note the FIXME at the end of r_alias.c)
2000-01-03 10:41:24 +00:00
24312dcadd
Fixed bug with shareware pak file
2000-01-03 09:19:02 +00:00
68785812de
More BSD fixes from Darius
2000-01-03 08:00:46 +00:00
28d134d096
added vid_sdl.c and cd_sdl.c which are part of Maas patch for the SDL merge.
2000-01-03 06:26:49 +00:00
a841b90d2d
SDLQuake merge with our tree made possible by Sam Lantinga and Maas van den Berg, currently the video and cdrom audio are supported.
2000-01-03 06:18:32 +00:00
d0674e837c
pandr's pr_* merge..
2000-01-03 04:45:54 +00:00
d5217418ec
QW's crosshair 2 and crosshaircolor now work in UQ. Also because I felt
...
like adding a gratuitious feature, GL target users can crosshair 3 for a
completely new crosshair and higher resolution crosshair (oooh!) Software
renderer doesn't have it because...well look at Draw_Crosshair() in
draw.c, it's truly a nightmare! You have to plot each pixel individually,
makes you feel like you're coding in Applesoft BASIC. If you want it,
figure out how to do it sanely.
2000-01-03 04:33:43 +00:00
cfa702ec38
pr_comp.h's identical, moved to common
2000-01-03 02:24:26 +00:00
47e85cdd29
Version cleanup, not completely happy with it yet..
...
Removed the registered game checking, but added a little back for
backword compatibility..
2000-01-03 01:40:54 +00:00
590b4c1c58
crosshair 2 now works in UQ, as does crosshaircolor
2000-01-03 00:08:03 +00:00
91226eac59
Forgot to move the file...
2000-01-02 16:26:14 +00:00
8ee8699d16
Sound cleanups from Marcus: snd_linux.c -> snd_oss.c, the OSS API is used
...
on a lot more than just Linux. Updated Autoconf to check for OSS rather
than check for Linux and just assume OSS is there.
2000-01-02 16:18:22 +00:00
6d9ae5f2ef
Merged gl_draw.c! Yes, the version string is unscaled.
2000-01-02 15:53:47 +00:00
e02e3a8982
The stupid scaled version text is gone. Under QW's GL targets (only under
...
those targets) the version string was rendered using the standard console
font, unscaled. All software renderer targets now benefit from this.
2000-01-02 15:52:45 +00:00
d7d4a3dcd6
Removed all traces of the useless gl_reporttjunctions cvar
2000-01-02 12:00:43 +00:00
ecac4a1474
Marcus' patch for the beginnings of mingw32 support in the tree
2000-01-02 11:32:21 +00:00
2417b5129b
Oops, the GGI target won't work too well without this file...
2000-01-02 10:07:08 +00:00
365a1c144f
draw.[ch] merge
2000-01-02 10:06:17 +00:00
b75354555d
chase_active in uquake is now cl_chasecam like in qw-client
2000-01-02 05:46:52 +00:00
81121d7d44
Marcus' mdfour fix... Perhaps this should be sent to the rsync people?
2000-01-02 05:10:08 +00:00
0606295105
This is the first file I am adding, it should be in /common.
...
One step further into a merged qw/uquake tree :)
This code was submitted by Taniwha.
2000-01-02 04:31:53 +00:00
797b93f871
Taniwha pointed out that qw didn't compile, i put cvar_t r_waterwarp in a non-common file. I moved it to r_glmain.c, everything _SHOULD_ work now (I hope!).
2000-01-02 04:04:17 +00:00
2bfc08ccde
Preliminary Volumetric fog :)
...
fixed problem where r_fog, r_waterwarp were not defined for quakeworld.
2000-01-02 03:12:59 +00:00
abf1fae788
Didn't realize that quakeworld shouldn't use r_mirror (yet), added #ifdef so nobody encounters any segfaults :)
2000-01-02 02:57:59 +00:00
84d05a1c59
Removed some #ifdef and #ifundef's that didn't make much sense.
2000-01-02 02:52:38 +00:00
946bc3c79d
Some recommended changes for win32 sound
2000-01-01 23:07:06 +00:00
233d0af85f
Added autoheader support. Also added ./bootstrap to go from a freshly
...
checked out tree to something ./configure'able.
2000-01-01 20:45:27 +00:00
81d5367062
Grr...teach me not to test before committing...
2000-01-01 16:37:03 +00:00
c2827bb3d7
Test changes in net_com.c for bad connects...
2000-01-01 16:35:48 +00:00
4abffbc7bb
gl_ztrick is now saved in the config.cfg file
2000-01-01 16:20:38 +00:00
ee7164d21b
Repaired UQuake gl_rmail.c mess, commented out gl_reporttjunctions refs,
...
since they are apparently unused by either QW or UQuake.
2000-01-01 15:03:44 +00:00
87419fbacc
Fixed my slight GLX screwup with _windowed_mouse -- thanks to Marcus
...
Sundberg for supplying patch.
2000-01-01 12:31:54 +00:00
2c533427e5
Whoops! Forgot to add the declarations file for mdfour's unsigned int hack.
...
Here it is! :)
2000-01-01 11:19:32 +00:00
7d08fbe4fe
Replaced RSA MD4 source with GPLed mdfour.[ch] source, and net_com.c to
...
connect it all. Also modified Makefile.in for qw-(client|server) to use
them.
2000-01-01 11:18:00 +00:00
509647ba1d
Added .gitignore files. Added clean-autoconf target to Makefile.in and
...
made distclean remove *~ files
2000-01-01 08:10:02 +00:00
23df922429
Turns out that common_quakedef.h was right, and I goofed.
2000-01-01 07:17:04 +00:00
6f366830de
All the files in common include "quakedef.h" not "common_quakedef.h", I think someone inappropriately renamed it without checking.
2000-01-01 06:45:22 +00:00
c5e3135714
I optimized the math routines, they're faster and more compact.
2000-01-01 06:41:15 +00:00
2d821cdda6
Applied patch from Bill Currie to merge gl_rmain.c
2000-01-01 06:26:03 +00:00
a1d7ee772b
More merging work..
2000-01-01 04:41:14 +00:00
555871f7e2
Some GL fixes in configure.in
...
Merged the uquake and qw_client gl_vidlinux.c into common/gl_vidlinux_3dfx.c
2000-01-01 04:21:44 +00:00
e902071cbb
Made OpenGL targets in X remove the cursor when _windowed_mouse 1 is set.
...
Also, committed patch from Marcus Sundberg <mackan@stacken.kth.se> or
1999-12-31 13:22:02 +00:00
94dae8608e
Moved config.h.in to common/, updated Makefile.in's so configure works
...
from any dir, and removed a couple of autoconf errors when extensions that
aren't required happen to be unavailable.
1999-12-31 06:54:05 +00:00
c1fb59b9b1
added snd_mme.c for MME sound system support (DUnix)
1999-12-31 05:55:26 +00:00
ea9c2f09b8
Whoops, one more..
1999-12-31 05:10:16 +00:00
Joseph Carter
Bill Currie
Eric Windisch
Jeff Teunissen
Loring Holden
Nelson Rush
Zephaniah E. Hull
Marcus Sundberg