Commit graph

224 commits

Author SHA1 Message Date
Bill Currie
b775a6f308 remove some diff noise to ease merging 2001-05-11 06:11:17 +00:00
Bill Currie
8ce3fa5e8f `merge' gl_refrag.c and sw_refrag.c into r_efrag.c like what was done in qw 2001-05-11 06:09:01 +00:00
Bill Currie
44317f299e merge gl_mesh.c into libQFmodels 2001-05-11 05:59:17 +00:00
Bill Currie
d9874835ec forgot to make sure Mod_Init_Cvars got called 2001-05-11 02:03:02 +00:00
Ragnvald Maartmann-Moe IV
28c809d27e Alliteration Annoys Always 2001-05-11 01:01:27 +00:00
Ragnvald Maartmann-Moe IV
a5d3e614a0 More Merge Madness. 2001-05-10 17:45:05 +00:00
Ragnvald Maartmann-Moe IV
7aa70de483 *meld* 2001-05-10 17:26:03 +00:00
Bill Currie
d03e28a034 correct the link order of the libs 2001-05-10 16:29:11 +00:00
Bill Currie
77eed96c91 don't need these any more 2001-05-10 15:30:23 +00:00
Bill Currie
2c07108c65 model loading code merge. dragged in smoe merges and cleanups of d_iface.h,
r_local.h, r_shared.h, client.h and render.h at the same time (couldn't get
away from that:/) verly likely to be lots of breakage (eg, player and eye
models are NOT checksummed atm), but everything builds
2001-05-10 06:01:11 +00:00
Ragnvald Maartmann-Moe IV
5cd8ddb1aa *shuffle* 2001-05-10 04:16:39 +00:00
Ragnvald Maartmann-Moe IV
f5f3260dec Taniwha apparently lost interest after doing the hard part, so I'll just merge this... 2001-05-10 03:36:31 +00:00
Bill Currie
00f6e26419 clean up some nasty dependencies 2001-05-10 03:16:29 +00:00
Ragnvald Maartmann-Moe IV
9529f12f5b Mister Spock was here. 2001-05-10 02:37:55 +00:00
Ragnvald Maartmann-Moe IV
37a93b3e91 Merge draw.h. 2001-05-09 22:40:51 +00:00
Bill Currie
33e3f1209d fix a bug that should have been fixed eons ago (and was in qw) 2001-05-09 22:08:06 +00:00
Bill Currie
a5b2b78013 missed a removal of fnmatch.c 2001-05-09 22:07:35 +00:00
Bill Currie
20a25f7935 just not needed and if we ever need its contents again... well.. that's what
cvs is for :)
2001-05-09 20:55:49 +00:00
Bill Currie
b9ab6bbd9b never should have been there in the first place 2001-05-09 20:53:36 +00:00
Bill Currie
a590700249 move gib_*.h to include (internal headers)
move gib.h to include/QF
fix up the refs to gib.h
2001-05-09 20:50:38 +00:00
Ragnvald Maartmann-Moe IV
febf62ad9d Ack, where did all the chairs go! 2001-05-09 18:45:38 +00:00
Ragnvald Maartmann-Moe IV
910e76a900 More header musical chairs chaos. You there! No eating the chairs! 2001-05-09 18:42:37 +00:00
Ragnvald Maartmann-Moe IV
5afd16bea9 More header cleanups. 2001-05-09 18:34:46 +00:00
Ragnvald Maartmann-Moe IV
7fa4b01208 More header merges. 2001-05-09 18:28:08 +00:00
Ragnvald Maartmann-Moe IV
85de55a05c More header merging. 2001-05-09 17:29:07 +00:00
Ragnvald Maartmann-Moe IV
a454719fc7 Merge adivtab.h while I'm at it. 2001-05-09 17:24:41 +00:00
Ragnvald Maartmann-Moe IV
e0d43f4a7f Merge anorms.h and anorm_dots.h. 2001-05-09 17:22:27 +00:00
Ragnvald Maartmann-Moe IV
601556701c Whitespace, comment cleanups. 2001-05-09 17:12:49 +00:00
Bill Currie
226189cff7 whitespace 2001-05-09 06:57:35 +00:00
Bill Currie
e5c145c760 correct the mis-parsing of TE_GUNSHOT 2001-05-09 06:57:23 +00:00
Bill Currie
e96ab564af fix the init issues that stopped nq working after Despair's heroic efforts 2001-05-09 06:15:14 +00:00
Bill Currie
f818392e26 cruft removal 2001-05-09 06:02:23 +00:00
Ragnvald Maartmann-Moe IV
ce3218bce5 Whitespace, comment out bloodpuffs, which aren't used in nq. Instead we get colored dot explosions. Whoopie. 2001-05-09 06:00:19 +00:00
Ragnvald Maartmann-Moe IV
f6374b48ce First pass at updating nq particles. Compiles. Crashes. Taniwha wanted a look. Flee in terror.
Also has bunches of cleanups, including string.h/strings.h ifdefs, whitespace, and removal of pointless comments.
2001-05-09 05:41:34 +00:00
Bill Currie
80814f5437 remove these since they are no longer needed as they are in libs/util now 2001-05-08 22:29:48 +00:00
Bill Currie
b5df1c816a move fnmatch.c and dirent.c to libQFutil 2001-05-08 20:53:25 +00:00
Bill Currie
22a1a0d5d3 remove R_CullBox as it is now in mathlib.[ch] 2001-05-08 20:52:12 +00:00
Bill Currie
cc68e1a12e qf now links with NO optimisation (not even -O). R_CullBox has been moved from
glquake.h to mathlib.h (along with the declaration for frustum) and the
extern inline keyworws protected by an ifndef so that mathlib.c can cause
R_CullBox to be compiled publicly. The definition of frustrum has been moved
from its verious locations into mathlib.c.
2001-05-07 04:08:34 +00:00
Bill Currie
1fbb62d518 hook in the plugin system 2001-04-25 00:20:23 +00:00
Ragnvald Maartmann-Moe IV
b5d3508022 Small cleanups. 2001-04-20 19:39:38 +00:00
Bill Currie
4be4e5ccf6 clear not-yet allocated entities to 0xdeadbeef 2001-04-20 17:51:57 +00:00
Bill Currie
06acd3db1c massivly speed up qw/source/Makefile creation, and Makefile.in, too. ASM_ARCH
and PACKETLOG are gone from Makefile.am as the first was really redundant
and the latter now is.
2001-04-18 21:02:02 +00:00
Bill Currie
b5d3445cc7 I must have forgotten this way back when 2001-04-18 07:19:37 +00:00
Bill Currie
b4b27ee13b move the make dist stuff to the top level Makefile.am and get make dist to
work in that make doesn't barf. probably missing lots of files
2001-04-18 07:18:54 +00:00
Ragnvald Maartmann-Moe IV
75df0b6440 Makefile cleanups. 2001-04-18 07:05:37 +00:00
Bill Currie
527471a7de *-wgl finally links (who knows if it works?:) and some more conceptual
cleanup
2001-04-17 15:55:33 +00:00
Bill Currie
dbca31519f qw-client-wgl and nq-wgl get to (but fail) the link stage 2001-04-17 06:55:50 +00:00
Chris Ison
ba1408d56d fixed seg cause of uninitialized cvar in_freelook. Also remove double initialization of sensitivity and lookstrafe 2001-04-17 03:08:52 +00:00
Bill Currie
c59951b046 fix sw nq 2001-04-16 20:38:51 +00:00
Adam Olsen
311cbdbe59 Fix so building statically (--disable-shared) works. 2001-04-16 17:45:35 +00:00
Zephaniah E. Hull
61f369be94 Minor compile fixes. 2001-04-16 07:04:54 +00:00
Bill Currie
f9c9e4fba7 everything except *-3dfx (unknown status) now builds 2001-04-16 03:55:44 +00:00
Bill Currie
6fcf8395ca FBDEV GLX SVGAlib X11 all build, but nq-glx doesn't link yet due to some
changes between nq and qw (gl_mtexable, texture_mode and GL_CheckBrightness)
2001-04-15 21:11:41 +00:00
Bill Currie
a0ab26ff6b merge screen.h 2001-04-15 07:47:49 +00:00
Bill Currie
7e67fd56f3 getting closer to building the vid libs.
in_common.c is the main input interface. in_x11 has been modified suitably
2001-04-15 07:18:04 +00:00
Ragnvald Maartmann-Moe IV
20e0961ed2 *whack* Die Mole Die!!! 2001-04-15 06:18:06 +00:00
Ragnvald Maartmann-Moe IV
778f0c129c Finish move of vid.c to libs, kill a few stragglers. 2001-04-15 05:36:56 +00:00
Ragnvald Maartmann-Moe IV
554308e51d Makefile updates. 2001-04-15 05:17:09 +00:00
Ragnvald Maartmann-Moe IV
38a114fdb3 More merge madness. 2001-04-15 04:54:44 +00:00
Ragnvald Maartmann-Moe IV
84461e1f1f More merging. 2001-04-15 04:45:07 +00:00
Bill Currie
6a696881b3 these are now in libs/video/targets 2001-04-15 04:40:09 +00:00
Ragnvald Maartmann-Moe IV
66fafd3e0e First stage of video and input system merge. The city has collapsed, wreckage sifting ensues... 2001-04-15 04:18:22 +00:00
Bill Currie
bd0fab4ce1 vid_wgl in qw now uses vid_common_gl. probably doesn't work
compile fix for merged glquake.h in vid_wg.c in nq
2001-04-15 03:17:03 +00:00
Bill Currie
5859b3dd1f merge glquake.h. Rather messily done, but it works and all clashes were
sorted out on the nq side assuming that qw did it right (which it does:)
2001-04-14 21:22:08 +00:00
Chris Ison
1b40eb715a fixed m_filter CVAR type, started on gamma for 3dfx 2001-04-13 04:25:06 +00:00
Bill Currie
6b3b94bafc sound crashing bug fixes
snd_dma.c, {nq,qw}/source/cl_parse.c:
	change the type of snd_worldmodel from * to ** and init snd_worldmodel
	with the ADDRESS of cl.worldmodel so its changes get seen by snd_dma
snd_mixa.S:
	picize
2001-04-12 06:53:07 +00:00
Bill Currie
a3215e4dd0 at long last, nq-wgl builds. probably as broken as hell, though 2001-04-11 21:55:27 +00:00
Bill Currie
6a6d75b824 gah, more libqfsys. also fix up nq-wgl build info 2001-04-11 21:24:50 +00:00
Bill Currie
734461092f fix redef of APIENTRY 2001-04-11 21:02:56 +00:00
Bill Currie
99fd4ab464 libs/video/targets/Makefile.am:
out-of-tree compile fixes
nq/source/Makefile.am:
	missed the -lqfsys
2001-04-11 16:47:08 +00:00
Bill Currie
ebb7b6310a view.h:
it seems somebody forgot to commit this. just compied direct from qw
libs/video/targets/.gitignore:
	better ignore rules
nq/source/Makefile.am:
	libqfsys.a is dead :)
the rest:
	gamma compile fixes
2001-04-11 16:19:08 +00:00
Ragnvald Maartmann-Moe IV
f789b61c56 Merged joystick code. Great deal of cleanup in input, reduced bizarre overuse of protocol.h...
Maimed joy_win.c, very likely to get odd behavior there, even if it compiles.
2001-04-11 07:57:08 +00:00
Bill Currie
47d89d73c2 nq-wgl tries to build, but ld segs :( 2001-04-11 05:23:12 +00:00
Bill Currie
9cd83e178f various fixes for out-of-srcdir building
configure.in:
	foo/Makefile MUST come before foo/bar/Makefile or foo/bar will NOT be
	created.
libs/*...*/Mkaefile.am: add INCLUDES so $(top_scrdir)/include gets searched
{qw,nq}/source/Makefile.am: fix fbset compiling (and cleaning for nq)
2001-04-11 03:09:24 +00:00
Joseph Carter
75aa40276f A few more. Also removed a couple inaccurate comments. 2001-04-11 00:10:19 +00:00
Joseph Carter
2bc55b7828 Cvar cleanups.. NULL is now used in place of 0 for callbacks, this should
make Cvar_Get's a lot easier to read.
2001-04-10 23:39:30 +00:00
Bill Currie
051f3ca96e nq-{sdl,sgl,wgl} compile, but don't link 2001-04-10 23:17:47 +00:00
Bill Currie
8e2d89c4c2 fix up a mis-understanding about api headers
*taniwha larts himself for not explaining things to Despair
2001-04-10 21:45:42 +00:00
Ragnvald Maartmann-Moe IV
cbb4af711c Remove duplicate sound.h, move some things down from include/QF to include.
Prepare for joystick merge...
2001-04-10 20:15:18 +00:00
Bill Currie
334b528a40 forgot some bits 2001-04-10 20:11:50 +00:00
Adam Olsen
dcd924c355 Removed old files 2001-04-10 09:44:36 +00:00
Adam Olsen
69022c7ffb Move sound targets into a library. Still doesn't pick one at runtime though. 2001-04-10 09:40:09 +00:00
Bill Currie
a96536c896 nuke commdef.h and clean up the results by putting its contents where they
belong.
also, merge model.h and friends (MINUS render.h). this needed moving efrags_t
from render.h to model.h.
2001-04-10 06:55:28 +00:00
Bill Currie
e236ac4bb2 move mplane_t to qtypes.h so non-asm builds will build (so long as you're not
trying to build -svga)
2001-04-10 02:36:44 +00:00
Ragnvald Maartmann-Moe IV
d7eb585502 Merge cd. Doesn't dlopen different cd drivers or anything exciting... Yet. 2001-04-09 21:15:09 +00:00
Joseph Carter
9ea0605558 reverting this for Mercury 2001-04-06 02:12:19 +00:00
Joseph Carter
c9ecc7a9d2 The lighthalf qboolean is no more - replaced with a gl_lightmode callback
to do the job much more simply.  Also replaced lighthalf_v with white_v on
the QW side.
2001-04-05 17:28:28 +00:00
Bill Currie
e0c11b2f87 grr, it was r_part.c, not r_efrag, but that's sorted properly now 2001-04-04 21:53:09 +00:00
Bill Currie
eba467689a do the rename thing again (need to fix r_efrag and r_view, grr) 2001-04-04 21:47:21 +00:00
Bill Currie
7cb6245efa link libQFutil.so against libz so the clients (and tools) don't need to worry
about it
2001-03-31 03:51:25 +00:00
Bill Currie
e939ccc40a cvars now sport a callback function that gets called whenever the cvar changes
or on initial get.
2001-03-31 01:02:52 +00:00
Bill Currie
ad9142ff3c move Con_Printf, Con_DPrintf and Con_Print (weak) into libs/util/console.c.
Except for the cmd and cvar callbacks, libQFutil.so is now standalone.
2001-03-31 00:08:21 +00:00
Bill Currie
1e2e2f44c3 move the developer cvar into cvar.c 2001-03-30 23:35:48 +00:00
Bill Currie
99535102d7 bare bones sys stuff moved into libQFutil. unix stuff seems to work just fine,
but win32 is probably borked atm
2001-03-30 23:24:57 +00:00
Bill Currie
9145d45937 totally redundant 2001-03-30 05:03:52 +00:00
Bill Currie
4f2e22bfb8 merge and move quakefs.c into libQFutil where it belongs. at long last 2001-03-30 00:44:35 +00:00
Bill Currie
b432d0ea17 pull the game specific stuff out of quakefs.c in preparation for merging it 2001-03-30 00:30:38 +00:00
Bill Currie
80ee9eb8d1 merge and move quakeio.c into libQFutil 2001-03-29 21:16:16 +00:00
Bill Currie
dd3d2a073d make -fbdev build again AND make nq-fbdev a new target.
moved fbset.h from qw/include to include so it can be shared by nq. it's in
include instead of include/QF because I don't see any need to isntall it.
2001-03-29 17:31:15 +00:00
Jeff Teunissen
277c17cfd8 Shared library support. The util and gamecode libraries are now shared,
and this clears the way for an external API for utilities and
such. And yes, this means libtool is now used.
2001-03-29 09:07:44 +00:00