Commit graph

141 commits

Author SHA1 Message Date
Marcus Sundberg
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
Marcus Sundberg
bb1f7ac924 Define uiWheelMessage and mouseactive here.
Removed unused variables.
Some minor cleanups.
2000-01-04 23:31:14 +00:00
Marcus Sundberg
fce145168c Arm x86 assembly with #if id386 2000-01-04 23:30:00 +00:00
Marcus Sundberg
6120f2dab5 Server need mmsystem.h for timeGetTime() 2000-01-04 22:24:49 +00:00
Marcus Sundberg
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
Marcus Sundberg
f0a9fffc5a Add support for cd_win.c 2000-01-04 22:11:17 +00:00
Marcus Sundberg
5d5cfd6e4b Include mmsystem.h if we have it. 2000-01-04 22:09:43 +00:00
Nelson Rush
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
Nelson Rush
de56a6f223 removed extra m_filter registration 2000-01-04 05:38:27 +00:00
Nelson Rush
5f20ff0bd7 added loring's multi-platform, non-mesa OpenGL patch. 2000-01-04 05:33:00 +00:00
Joseph Carter
49d9711def Small mingw32 fix and updated debian/control 2000-01-04 04:14:35 +00:00
Joseph Carter
740177b2c0 Another merge from BigM 2000-01-04 03:34:56 +00:00
Zephaniah E. Hull
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
Joseph Carter
0b8df448c2 Major configure.in update, applied BigM's gl_rsurf.c merge patch 2000-01-04 01:03:18 +00:00
Zephaniah E. Hull
ced209c8ba Reordering the scancode stuff for some stuff I'm doing after release.. 2000-01-04 00:17:30 +00:00
Jeff Teunissen
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
Nelson Rush
0b480a8691 added copyright lines 2000-01-03 22:12:26 +00:00
Nelson Rush
d75ee8d6b7 Optimized VectorCompare() 2000-01-03 22:10:13 +00:00
Joseph Carter
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
Jeff Teunissen
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
Joseph Carter
7a6884e4fb Portability fix 2000-01-03 20:16:47 +00:00
Jeff Teunissen
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
Jeff Teunissen
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
Jeff Teunissen
978ccb3cc8 Merged nonintel.c into common/ 2000-01-03 13:45:02 +00:00
Jeff Teunissen
71b8dc4cad Merged r_bsp.c into common/ 2000-01-03 13:35:09 +00:00
Jeff Teunissen
a671482dd5 sys_linux.c merged and moved into common/ 2000-01-03 12:12:13 +00:00
Jeff Teunissen
202f794fbe The merge continues...sys_null.c (Portability aid) is common. 2000-01-03 11:14:42 +00:00
Jeff Teunissen
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
Joseph Carter
24312dcadd Fixed bug with shareware pak file 2000-01-03 09:19:02 +00:00
Joseph Carter
68785812de More BSD fixes from Darius 2000-01-03 08:00:46 +00:00
Nelson Rush
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
Nelson Rush
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
Joseph Carter
d0674e837c pandr's pr_* merge.. 2000-01-03 04:45:54 +00:00
Joseph Carter
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
Joseph Carter
cfa702ec38 pr_comp.h's identical, moved to common 2000-01-03 02:24:26 +00:00
Zephaniah E. Hull
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
Joseph Carter
590b4c1c58 crosshair 2 now works in UQ, as does crosshaircolor 2000-01-03 00:08:03 +00:00
Joseph Carter
91226eac59 Forgot to move the file... 2000-01-02 16:26:14 +00:00
Joseph Carter
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
Joseph Carter
6d9ae5f2ef Merged gl_draw.c! Yes, the version string is unscaled. 2000-01-02 15:53:47 +00:00
Joseph Carter
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
Joseph Carter
d7d4a3dcd6 Removed all traces of the useless gl_reporttjunctions cvar 2000-01-02 12:00:43 +00:00
Joseph Carter
ecac4a1474 Marcus' patch for the beginnings of mingw32 support in the tree 2000-01-02 11:32:21 +00:00
Joseph Carter
2417b5129b Oops, the GGI target won't work too well without this file... 2000-01-02 10:07:08 +00:00
Joseph Carter
365a1c144f draw.[ch] merge 2000-01-02 10:06:17 +00:00
Joseph Carter
b75354555d chase_active in uquake is now cl_chasecam like in qw-client 2000-01-02 05:46:52 +00:00
Joseph Carter
81121d7d44 Marcus' mdfour fix... Perhaps this should be sent to the rsync people? 2000-01-02 05:10:08 +00:00
Eric Windisch
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
Eric Windisch
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
Eric Windisch
2bfc08ccde Preliminary Volumetric fog :)
fixed problem where r_fog, r_waterwarp were not defined for quakeworld.
2000-01-02 03:12:59 +00:00
Eric Windisch
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
Eric Windisch
84d05a1c59 Removed some #ifdef and #ifundef's that didn't make much sense. 2000-01-02 02:52:38 +00:00
Joseph Carter
946bc3c79d Some recommended changes for win32 sound 2000-01-01 23:07:06 +00:00
Joseph Carter
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
Jeff Teunissen
81d5367062 Grr...teach me not to test before committing... 2000-01-01 16:37:03 +00:00
Jeff Teunissen
c2827bb3d7 Test changes in net_com.c for bad connects... 2000-01-01 16:35:48 +00:00
Jeff Teunissen
4abffbc7bb gl_ztrick is now saved in the config.cfg file 2000-01-01 16:20:38 +00:00
Jeff Teunissen
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
Jeff Teunissen
87419fbacc Fixed my slight GLX screwup with _windowed_mouse -- thanks to Marcus
Sundberg for supplying patch.
2000-01-01 12:31:54 +00:00
Jeff Teunissen
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
Jeff Teunissen
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
Joseph Carter
509647ba1d Added .gitignore files. Added clean-autoconf target to Makefile.in and
made distclean remove *~ files
2000-01-01 08:10:02 +00:00
Nelson Rush
23df922429 Turns out that common_quakedef.h was right, and I goofed. 2000-01-01 07:17:04 +00:00
Nelson Rush
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
Nelson Rush
c5e3135714 I optimized the math routines, they're faster and more compact. 2000-01-01 06:41:15 +00:00
Zephaniah E. Hull
2d821cdda6 Applied patch from Bill Currie to merge gl_rmain.c 2000-01-01 06:26:03 +00:00
Zephaniah E. Hull
a1d7ee772b More merging work.. 2000-01-01 04:41:14 +00:00
Zephaniah E. Hull
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
Jeff Teunissen
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
Joseph Carter
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
Nelson Rush
c1fb59b9b1 added snd_mme.c for MME sound system support (DUnix) 1999-12-31 05:55:26 +00:00
Zephaniah E. Hull
ea9c2f09b8 Whoops, one more.. 1999-12-31 05:10:16 +00:00
Zephaniah E. Hull
b416d81046 Tweaked the authors, missed a few .s files.. 1999-12-31 05:09:06 +00:00
Zephaniah E. Hull
f5c91c88af Compile fix on some stuff..
Mass movement of completely common files between qw_client and uquake.
1999-12-31 04:39:06 +00:00
Zephaniah E. Hull
e468985ee1 Added common/config.h.in, moving the version and a few other variables
there, more will be added later as needed..

Added -Wall to the cflags on a few things, may have missed some stuff..

Changed the tests on HAVE_GL_COLOR_INDEX8_EXT to actually function..
(Fixes the GL texture problem..)

Added tests for GLAPIENTRY and APIENTRY, there will alweys be
something..

Fixed the check for the 3dfxgl lib..

Some makefile tweaking..

Changed VERSION into a string so it can easily be 0.1.0..

Removed the generated configure script, does not merge sanely..
1999-12-31 02:59:25 +00:00
Joseph Carter
69168b6695 pandr's autoconf cleanup. Now uses common/cd_wrapper.c to replace some of
the things autoconf was doing before but really shouldn't have been.
1999-12-31 02:10:33 +00:00
Joseph Carter
46c70038b4 Ryan C. Gordon provided a small cleanup for snd_dma.c which fixes a crash
if sound could not be started properly for some reason.
1999-12-30 06:46:29 +00:00
Joseph Carter
e3ac6357dc Loring Holden's autoconf support. {qw-client,quake}-glide is currently not built since neither of us has the hardware available at the moment to test the 3dfx MiniGL target. Someone who does (Mercury?) will have to fix that. Bins all build in odd places for the moment. Thanks for staying up so late to help get this working Loring, you rock! 1999-12-29 13:58:47 +00:00
Zephaniah E. Hull
55891f5a7e s/APIENTRY/GLAPIENTRY/
We now REQUIRE mesa 3.1 to compile the GL stuff....
1999-12-29 05:38:57 +00:00
Jeff Teunissen
4a5ba0bcb1 Repaired undefined VID_UpdatePlanarScreen. 1999-12-29 04:58:08 +00:00
Zephaniah E. Hull
10d6962af3 :%s/GLAPIENTRY/APIENTRY/g
Again, who changed it back?

Also undid my change to the changelog..
1999-12-29 02:21:17 +00:00
Jeff Teunissen
b0bf08dad6 Nothing of note... 1999-12-28 11:39:14 +00:00
Zephaniah E. Hull
20ebd99a48 s/APIENTRY/GLAPIENTRY/, and some tweaking with uquake.. 1999-12-27 17:57:03 +00:00
Zephaniah E. Hull
d322adc60d POQ now actually works!! 1999-12-26 11:40:24 +00:00
Zephaniah E. Hull
7e9e2f177a QW Server, QW Client, and POQ all compile now..
(Provided you don't run out of disk space well compiling..)
1999-12-26 10:07:10 +00:00
Zephaniah E. Hull
13fbae68ce Erm, frogot to cvs add something.. 1999-12-26 07:36:21 +00:00
Zephaniah E. Hull
5765f7fe5d BIG merge work, POQ now compiles, though at least glquake.3dfx has, err, issues..
Hopefully QW will still compile and work, thats the next commit I think..
1999-12-26 06:37:28 +00:00
Zephaniah E. Hull
5bb26adda5 Moved keys.h into common, wrapped 3 quakeworld specific lines with
#ifdef QUAKEWORLD
1999-12-25 22:30:22 +00:00
Zephaniah E. Hull
6ba933cf80 Added the KP_* symbols, for the keys on the keypad.. 1999-12-25 21:50:55 +00:00
Zephaniah E. Hull
570ede5076 Changed the root makefile so any rule will be passed along, not just 'all'.
Removed qw_client/gl_vidlinux_svga.c, nothing uses it and its almost a exact duplicate of gl_vidlinux.c.

Cleaned up ALL the compile time warnings..
1999-12-25 19:37:15 +00:00
Jeff Teunissen
ff0aeecd3a Initial revision 1999-12-25 05:32:39 +00:00