Dan Olson
899180733a
Moving some files around for Jason Nelson (Win32 target)
2000-02-22 04:59:08 +00:00
Bill Currie
19206928b4
merge qw_client/model.c and uquake/model.c into common/model.c
...
common/gl_model.c uquake/Makefile.in:
allow checksums in uquake
2000-02-21 21:13:45 +00:00
Bill Currie
15e4001bf2
merge qw_client/gl_cl_parse.c and uquake/gl_cl_parse.c into common/gl_cl_parse.c
2000-02-21 12:47:23 +00:00
Bill Currie
f56e2a12c2
more merges
...
qw_client/gl_model.c + uquake/gl_model.c = common/gl_model.c
qw_client/gl_rlight.c + uquake/gl_rlight.c = common/gl_rlight.c
common/gl_rmisc.c:
call R_InitBubble for both uq and qw
2000-02-21 12:36:38 +00:00
Bill Currie
21f934a4a4
move gl_ngraph.c from qw_client to common in anticipation of it being
...
backported to uquake. Might as well pre-merge it :)
2000-02-21 11:22:10 +00:00
Bill Currie
61bce24653
more mergine
...
qw_client/gl_screen.c + uquake/gl_screen.c = common/gl_screen.c
2000-02-21 11:16:13 +00:00
Bill Currie
007b9a47ee
merge qw_client/resource.h and uquake/resource.h into common/resource.h
2000-02-21 10:38:51 +00:00
Bill Currie
0196064c51
merge qw_client/r_misc.c and uquake/r_misc.c int common/r_misc.c
...
merge qw_client/r_sprite.c and uquake/r_sprite.c int common/r_sprite.c
2000-02-21 10:28:22 +00:00
Bill Currie
981acbc014
merge qw_client/r_part.c and uquake/r_part.c into common/r_part.c
...
merge qw_client/gl_rpart.c and uquake/gl_rpart.c into common/gl_rpart.c
r_part.c tested for uquake and seems ok, but gl_rpart.c untested
2000-02-21 08:12:35 +00:00
Dan Olson
8ac1385c9f
Jason Nelson's patch for fixing Win32 targets
2000-02-20 21:19:50 +00:00
Zephaniah E. Hull
2afdb1db5f
Little bug fixes here and there, should work again..
2000-02-20 20:49:36 +00:00
Zephaniah E. Hull
d356761b93
Fix for the QW protocol problem by Dabb..
...
Some profiling changes as well..
Code now compiles with profiling support, will disable later..
2000-02-20 20:46:13 +00:00
Marcus Sundberg
636b73cc11
Synced some code between UQ/QW.
2000-02-19 15:43:42 +00:00
Marcus Sundberg
10cc5228c5
Remove redundant shared stuff from Makefiles.
2000-02-19 13:53:08 +00:00
Zephaniah E. Hull
1e9f882fee
Whoops, minor compile fixes..
2000-02-19 08:44:02 +00:00
Zephaniah E. Hull
0fae0e01d3
Reverting away from modules in the main branch..
...
-3dfx, -x11, and -glx all work, at least for qw-client, no promices on uquake.
I can't test any other targets at the moment, so....
2000-02-19 08:24:15 +00:00
Loring Holden
6b9563b880
Until we use libtool, we need to specify in configure.in how to create and
...
use shared libraries (-rdynamic and -shared does not work everywhere)
We also have to use this information in */Makefile.in
2000-02-17 16:21:23 +00:00
Dan Olson
7d387042f7
New CVAR flag system. Appears to work perfectly
2000-02-16 21:30:20 +00:00
Joseph Carter
50167d5e71
Console now hauls ass by default ala quake2 and such. Did not change the
...
scr_conspeed default from 300 to quake2's 3 because I want to be sure of
how I am doing it compared to how it was done later. Will ask Zoid when
both of us are awake at the same time.
2000-02-16 11:28:27 +00:00
Dan Olson
b03c0a094e
More menu stuff and input plugin loading for -glx targets
2000-02-15 18:45:26 +00:00
Dan Olson
c878ab64f4
Prep of menus for video modularization.
2000-02-15 14:25:03 +00:00
Dan Olson
35fb941db1
Correction of spelling errors. Mostly for CVS practice.
2000-02-14 23:06:13 +00:00
Bill Currie
9ed247178f
common/plugin.c:
...
add path searching. currently unix style only (ie ':') and defaults to
".:${LIBDIR}/quakeforge".
*/Makefile.in:
fix up the clean targets a little, so they actually work
2000-02-14 11:30:37 +00:00
Joseph Carter
f11f71d8a7
we now define LIBDIR when we build targets
2000-02-14 00:35:13 +00:00
Joseph Carter
1d7260195f
Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause
...
less confusion that way (even if I have to type an extra letter..)
2000-02-13 09:06:11 +00:00
Zephaniah E. Hull
3b1494b153
Fixed some little errors with the plugin code..
2000-02-12 11:42:56 +00:00
Zephaniah E. Hull
dd7d064733
in_x11.so, and actually check in the plugin code..
...
vid_x works, aside from a few, err, qwirks, in the input focus handling..
2000-02-12 08:08:31 +00:00
Zephaniah E. Hull
0e8ba8d814
Sledge hammer applied..
...
The input stuff is now somewhat modular, I'll get everything working
soon enough, right now things are hardwired to svgalib, but its ok..
2000-02-12 05:34:22 +00:00
Bill Currie
e3d564905d
put REQUIRED worlda.s back in. it will not cause probelms for non-x86 archs as
...
generates an empty .o file if id386 is 0 or undefined
2000-02-11 11:07:04 +00:00
Loring Holden
0442e797e4
Remove redundant worlda.s that caused problems on non-x86 systems
2000-02-11 06:50:15 +00:00
Bill Currie
ce9580f237
sufflin' shufflin' shuflin'.. raaw-source
...
qw-client now links, but qw-server won't compile (yet)
2000-02-11 04:21:10 +00:00
Bill Currie
3585aab0eb
merges:
...
qw_server/world.[ch] and uquake/world.[ch] into common/world.[ch]
uquake/chasecam.c into common/cl_cam.c
move physics type defines from server.h to phys.h
2000-02-10 23:38:19 +00:00
Bill Currie
314cca66b8
common/common.h:
...
add #include <cvar.h>
move qw_client/cl_cam.c to common/cl_cam.c
2000-02-10 13:56:47 +00:00
Bill Currie
fa875465d7
add host.c
2000-02-10 05:29:45 +00:00
Pontus Lidman
d608249a38
Added --enable-ipv6 option to configure to enable IPv6 networking.
...
It substitutes @NET_SOURCE@ for net_udp.c or net_udp6.c.
2000-02-08 21:23:06 +00:00
Bill Currie
7d5b301d80
common/quakeio.c:
...
support gzipped files
common/quakefs.c:
qw_client/cl_parse.c:
qw_server/sv_ccmds.c:
uquake/host_cmd.c:
uquake/menu.c:
use "z" in mode flags when reading files
uquake/Makefile.in:
take cl_ents.c out again (too much work atm to get it to compile)
2000-02-08 20:59:36 +00:00
Bill Currie
1983cf894b
move cl_ents.c from qw_clent to common
...
uquake/Makefile.in:
add cl_ents.c (doesn't work yet)
qw_client/gl_vidlinux_x11.c:
not used, waste of bandwidth
2000-02-08 07:44:02 +00:00
Bill Currie
a078544d38
Replaced every single fscking FILE and gzFile (except in quakeio.*) with QFile
...
and fixed up as many f* and gz* calls as gcc found (and, where sensible, grep)
Unfortuanatly, demos are broken again.
2000-02-08 07:23:09 +00:00
Bill Currie
edbb589045
merge qw_client/cl_main.c and uquake/cl_main.c into common/cl_main.c
...
For the rest, convert all refs to FILE and gzFile to QFile, and similar for
file functions (eg fprintf, fgets, fread, etc)
2000-02-08 05:06:58 +00:00
Joseph Carter
7633189c91
cl_tent.c is merged - uquake still has some issues but they're smaller now
2000-02-07 22:54:33 +00:00
Bill Currie
56c8badd2d
merge qw_client/r_edge.c and uquake/r_edge.c into common/r_edge.c
2000-02-07 04:31:25 +00:00
Bill Currie
ea4390157a
merge qw_client/r_efrag.c and uquake/r_efrag.c into common/r_efrag.c
2000-02-07 04:18:27 +00:00
Joseph Carter
3c55b43e25
Committing my merges of client.h and net.h.. Got rid of snd_dma.c changes
...
made before, it breaks a few things but it needs to be committed so they
can be fixed..
2000-02-07 01:32:12 +00:00
Bill Currie
4b77a46ca6
merged qw_client/cl_input.c and uquake/cl_input.c into common/cl_input.c
2000-02-07 00:12:21 +00:00
Marcus Sundberg
2cb28b8f01
Prevent division by zero in CalcFov().
2000-02-05 16:03:37 +00:00
Joseph Carter
dc627d6b28
uquake has the beginning of netchan support, netchan.message works fine
...
now, the rest I don't know how much of it I can do without breaking the
protocol's compatibility.
client_state_t has moved back to client.h in qw_common and uquake. Seems
like that's a step backward, but the way it was being used while common
was far worse! This required massive reworking of headers and such.
Speaking of using cl (the global client_state_t) badly, the sound code did
exactly that. Mercury should be shot for not fixing that when he did the
sound_lib.a stuff. The fix illustrates what we need to start doing to the
code to make modularization possible. I'll be sending a message to the
list about this shortly..
2000-02-04 13:40:04 +00:00
Joseph Carter
218d2fcb9b
random QW changes which should help with sbar stuff later on
2000-02-03 21:16:57 +00:00
Loring Holden
713e84ecae
Workaround for isspace() with sgi and gcc
2000-02-03 08:44:01 +00:00
Bill Currie
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +00:00
Bill Currie
64a5b117ab
Demoes are working again (for uncopressed .dem files, anyway)
2000-02-03 01:49:11 +00:00
Bill Currie
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
Bill Currie
0d679d1648
qw_client/Makefile.in:
...
put the gl specific rules back in (some of us have GL in
/usr/X11R6/include rather than /usr/local/include or /usr/include,
nudge, nudge).
2000-01-30 09:36:45 +00:00
Joseph Carter
4f9ce178c1
Merc missed a few things, cleaned the makefiles up a little more
2000-01-30 00:36:41 +00:00
Loring Holden
3357d40344
Explicitly list patterns instead of using the following:
...
$(shell echo $(BUILD_DIR)/{client,common_lib}/%.d)
That does not work properly on various platforms (AIX, SGI, Solaris)
2000-01-29 23:18:26 +00:00
Zephaniah E. Hull
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
Jeff Teunissen
ad90a0508d
Added part of what we'll require for automatically generating dependency
...
information. This is not activated yet, and will be quite annoying at the
very least to activate before we are in a more traditional build tree,
with a single source directory and self-contained (except for headers, of
course) subdirs for modules.
2000-01-29 15:02:45 +00:00
Bill Currie
5e4575222d
do alsa (sound in general) lib support the Right Way (tm)
...
missed 3dfx for gl
2000-01-29 10:59:02 +00:00
Jeff Teunissen
e489bb2b00
Makefile.in cleanups. Software targets are once again built before GL
...
targets. A few .o's changed to .@OBJEXT@, although most Unix-based systems
won't care about that. :)
2000-01-29 10:08:02 +00:00
Bill Currie
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
Joseph Carter
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
Jeff Teunissen
6ccfe788c9
Removed unnecessary #include "glquake.h"
2000-01-27 19:05:44 +00:00
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
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
Jeff Teunissen
9be70be1b0
Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware!
2000-01-22 22:21:46 +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
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
Marcus Sundberg
c156232c95
Link the *-gl binaries with @DYN_LIBS@.
2000-01-19 01:24:41 +00:00
Marcus Sundberg
7f6a114dd9
Removed bogus checks on unused variable.
2000-01-18 22:41:06 +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
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
a3c55dc1cf
Added dga_check.c to qw-client-gl
2000-01-15 03:33:10 +00:00
Marcus Sundberg
8f29fd21f1
Incorporated the VID_ExtraOption* stuff from uquake/menu.c
2000-01-15 03:31:37 +00:00
Marcus Sundberg
a43852a7d7
Ops, should be tab instead of spaces...
2000-01-12 21:36:45 +00:00
Marcus Sundberg
95c0a50665
Added the not-so-useless ifneqs back - they prevents warnings from make
2000-01-12 21:18:44 +00:00
Marcus Sundberg
3866cc3771
Removed useless ifndefs.
...
Added rule for gl/dga_check.@OBJEXT@
2000-01-11 01:17:16 +00:00
Nelson Rush
7560771b16
beginnings of IPv6 support by Pontus Lidman
...
(pali) i had to personally fix this so that it's optional, if anyone wants to enable this (it's not ready yet, it's just a star) you have to uncomment the line\
for QW_NET_SRC in qw_client/Makefile.in and qw_server/Makefile.in, you also have to uncomment LINUX_IPV6 definition in qw_common/net.h
here's an excerpt of Pontus's explaination:
I've started to work on IPv6 support. I guess it's not a top priority, as
the intersections of quake players and people with 6bone access is pretty
small, but at least I'm one of them ;)
If anyone else is interested in working on IPv6 support, or have
opinions/advice on how to go about it, I'd like to get in touch.
2000-01-09 22:11:12 +00:00
Loring Holden
131086c25c
{uquake,qw_client}/glquake.h combined and moved to common
2000-01-09 19:42:33 +00:00
Jeff Teunissen
5f62210608
Added @DGA_LIBS@ to OpenGL target builds
2000-01-09 07:15:41 +00:00
Marcus Sundberg
b6bb5c9190
Added in_svgalib.c to svga and 3dfx targets.
2000-01-09 02:45:58 +00:00
Marcus Sundberg
a0c6d434ec
Removed includes
2000-01-09 02:28:12 +00:00
Marcus Sundberg
9bc4ef12af
Call VID_Init() before IN_Init().
...
Removed ifdef __linux__
2000-01-09 02:14:48 +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
Nelson Rush
aa00566766
added additional copyright information
...
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
2000-01-08 22:02:43 +00:00
Marcus Sundberg
219acb9ce1
Fixed install target
2000-01-08 21:35:03 +00:00
Marcus Sundberg
754215066b
Fix warnings.
2000-01-08 17:37:36 +00:00
Marcus Sundberg
f2d4e5f06a
#pragmas are for som Windows compiler. Until we know what compiler we #ifdef them out like this.
2000-01-08 17:37:08 +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
Marcus Sundberg
775a02fbce
Fixed a nasty bug that only showed up on 64-bit platforms (or platforms where sizeof(float) != sizof(float*) to be precise)
2000-01-08 07:14:08 +00:00
Marcus Sundberg
dada532112
Removed pointless #ifdef __alpha__
...
Fixed alignment of size in D_SCAlloc() for 64-bit platforms.
2000-01-08 05:57:44 +00:00
Marcus Sundberg
0a9edb73c5
Removed pointless #ifdef __alpha__
2000-01-08 05:55:20 +00:00
Marcus Sundberg
64e8e448e1
Convert map checksums to little endian format - now QW client works on big endian machines.
2000-01-08 05:47:55 +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
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
Nelson Rush
2151636145
added copyrights for buffer overrun fixes
2000-01-07 05:47:53 +00:00
Zephaniah E. Hull
acc475fa16
Typo fix, and adding a chunk in authors which apparently got lost..
2000-01-06 21:59:55 +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
859cdee6a5
Define INADDR_LOOPBACK in a clean way.
2000-01-06 17:49:39 +00:00