qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-18 18:51:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
3259 commits 17 branches 20 tags 29 MiB
Commit graph

130 commits

Author SHA1 Message Date
Bill Currie
e75a2b96e9 cl_entities[0] is no longer referred to in the sw renderer. insted, 
r_worldentity is used.
 2001-05-18 17:50:19 +00:00
Bill Currie
e61c33c9d9 merge of cl_tents and r_efrag. 2001-05-15 21:34:54 +00:00
Ragnvald Maartmann-Moe IV
4206b93721 diff noise reduction 2001-05-15 19:00:53 +00:00
Bill Currie
40cbc5ed3c cl.items in nq is now cl.stats[ITEMS] as per qw 2001-05-15 17:22:53 +00:00
Bill Currie
eb65d61322 more merge madness 2001-05-15 03:27:55 +00:00
Bill Currie
afef935399 95% merge gl_rmain.c 
nq is actually generally working again, except alias models are black
 2001-05-14 06:47:38 +00:00
Bill Currie
c7ee39acbb rename the qw c declaration of the client name cvar from name to cl_name 2001-05-13 04:01:06 +00:00
Ragnvald Maartmann-Moe IV
220f8a6e38 Renderer merge continues. gl_rlight, gl_rmisc, gl_rmain, and gl_rsurf the current victims. 2001-05-13 00:28:50 +00:00
Bill Currie
105d1ee7d9 well, that didn't last long, did it? 
merge r_cvar.h
 2001-05-11 19:33:17 +00:00
Bill Currie
4ff86056db pull all rendering cvar declarations and initialisations out of the misc 
files and put them into r_cvar.[ch] getting ready for the renderer merge
 2001-05-11 19:21:48 +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
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
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
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
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
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
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
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
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
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
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
Bill Currie
734461092f fix redef of APIENTRY 2001-04-11 21:02:56 +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
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
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
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
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
Bill Currie
5a48f987a5 scripted fixups for the QF include move 2001-03-27 23:36:02 +00:00
Adam Olsen
31295c1f63 Bring qw and nq snd_*.c files into sync. Should be able to move them 
into a common dir now.
Also fix some #include path changes.
 2001-03-27 22:30:25 +00:00
Bill Currie
f78b973978 move the api headers into include/QF and clean up (most of) the resulting mess. 
target specific files that I don't build won't compile yet. just put QF/
infront of the offending headers.

Also move ver_check into libqfutils
 2001-03-27 20:33:07 +00:00
Bill Currie
f6073d756f better progs access error checking and cleanups resulting from it. Fixes 
mega2k and nq.
 2001-03-27 03:57:17 +00:00
Joseph Carter
3ac2bc72aa The quakefs similarization.. Essentially, we're now using qw's quakefs in 
nq, with the exception that some things were removed and others added.  I
could have merged this, but I don't feel the system's ready for merging at
the moment.  The quakefs code needs a bit of a cleanup and a tuneup before
it goes common.  Like so many other things, that's dependant on other bits
of the puzzle being completed first.
 2001-03-09 07:58:10 +00:00
Bill Currie
09b58f7e5f merge math code into utils 2001-03-05 02:06:05 +00:00
Joseph Carter
3ab3941c81 NQ's menu is gone too, menu.c is laying around till I add more info to the 
TODO file, then it dies too.
 2001-03-04 07:43:27 +00:00
Bill Currie
cf3629b3b3 merge in my progs work off the `taniwha' branch. This prigs us a few nice 
thinks:
  o Full progs modularity
  o CSQC should now be just a matter of creating the builtin functions and
    loading the code.
  o total independence from progs globals, functions and entity field layouts
    on the conditoin that their definitions have not been stripped from the
    progs file.
  o optional (though currently forced on) type checking on access to progs
    entity fields from C
  o the progs engine is fully shared between nq and qw.
 2001-03-04 06:30:30 +00:00
Bill Currie
4137fbabb5 nq seems to like the new progs setup (got to e2m2 in medium without problems) 2001-03-04 05:27:29 +00:00
Bill Currie
baa5ce01a1 more independence cleanups and nq is closer to running 2001-03-03 08:59:55 +00:00
Bill Currie
6d6c34320f nq compiles with the new progs setup, but doesn't have a hope of running yet. 
None of the globals etc structs are filled in and there will be a lot of type
errors in SVFIELD usage.
 2001-03-03 08:31:58 +00:00
Joseph Carter
0aa6110272 An evil (but temporary) hack. NQ has no concept of ca_active. This 
should change to fix a few outstanding NQ bugs at some point, but in the
meantime it has been defined to be the same as ca_connected.  Yeah, that's
damned evil.  It's been clearly marked and WILL go away when not needed.
 2001-02-28 08:53:17 +00:00
Bill Currie
9f2dacd2e1 re-think edict_t. this is going to massivly break things for a while, but 
tough, progs should never have known about entity_state_t in the first place.
Nor should it have been mod spefic.
 2001-02-28 01:59:31 +00:00
Bill Currie
e5543eb0a6 next step of the progs merge done. just need to sort out interdependencies, 
fix PR_SetString, and a few other things.
 2001-02-28 00:56:03 +00:00
Bill Currie
2367b0dc5f initial work at bringing nq's progs code up-to-snuff with qw's. Doesn't work 
yet :( nq segs due to either mangled strings or mangled functions, not sure
yet.
 2001-02-26 20:52:14 +00:00
Bill Currie
95e5b5e4cf all -snd* params and environment checking have been removed from the sound 
subsystem in favor of Cvars. These new cvars are:
 o  snd_device  defaults to "" which selects the default device of the system
    (eg, plug:0,0 for ALSA 0.9 or /dev/dsp for OSS)
 o  snd_rate    defaults to 0 which selects the system default rate.
 o  snd_bits    defaults to 0 which selects the system default bit depth.
 o  snd_stereo  defaults to 1 (0 is mono)
 2001-02-26 17:12:13 +00:00
Bill Currie
df916ef2c7 fix up the support for -<game> 2001-02-24 06:38:01 +00:00
Bill Currie
2bfeed6820 looks like utils is more or less complete for now, except for some fixes in 
nq for abyss etc (ie, the magical -<mod> args).
The interface to the message subsystem got a revamp and all the mods to the .c
files reflect this. currently a little ugly, but I plan on abstracting msg
further to clean it up and make it more oo.
 2001-02-23 23:16:13 +00:00
Bill Currie
981d067000 merge qw's net_com.c and checksum.c (net_com.c was identitcle to nq's 
checksum.c) and then move the resutlting checksum.c into libs/utils
ditching nq's. Due to net_com.c, qw's libqfnet.a will need to be deleted or
you will get duplicate symbol link errors. Also merge crc.[ch] and move
qfplits.[ch] to their final homes. Also, remove a slightly overzealous use
of "static" in qfplist.[ch].
 2001-02-23 18:31:48 +00:00
Ragnvald Maartmann-Moe IV
efad87a4b7 Fiend is getting full, but I force fed it some more typos anyways. 2001-02-23 05:44:57 +00:00
Bill Currie
be075686bf move the win32 includes to the top level using qw's stuff 2001-02-22 04:10:24 +00:00
Bill Currie
cff964427a remove redundant files 2001-02-22 04:00:09 +00:00
Bill Currie
10b8c5e8ad ok, nq compiles again 2001-02-21 21:44:57 +00:00
Jeff Teunissen
de96c6c3b8 Configure updates. QSG_VERSION has completed its change to 
{QW,NQ}_QSG_VERSION, because NQ and QW support differing versions.
 2001-02-21 21:38:07 +00:00
Bill Currie
95f6db7775 start merging stuff into libs/util and fix the concequences in nq. nq doesn't 
build yet though (keys.c, *screen.c and *view.c) due to console fun.
 2001-02-21 19:35:06 +00:00
Joseph Carter
c2cea45217 NEWSTYLE is gone, sortof. The Cvar defaults for NEWSTYLE are now just the 
defaults in non-win32 targets.  BASEDIR/SKINBASE are gone and the Cvars
which use them in the code are just given the oldstyle defaults now.  Use
of "base" is gone.  It was a half-assed solution to a problem that doesn't
exist yet.  When it finally does exist, we'll fix it right.
 2001-02-20 23:06:48 +00:00
Joseph Carter
2ae91bbbc6 Finished cleaning out the unused Cvar flags. The only ones we actually 
ever used were CVAR_NONE, CVAR_ARCHIVE, CVAR_USERINFO, CVAR_SERVERINFO,
CVAR_ROM, and CVAR_USER_CREATED.  I kept CVAR_NOTIFY and CVAR_LATCH as
well since the latter was supposed to actually be implemented at some
point and the former would make a useful debug feature.
 2001-02-20 15:31:49 +00:00
Joseph Carter
089fb150db CVAR_INIT was unused, we have always used CVAR_ROM for that. Removed the 
cruft.
 2001-02-20 11:25:46 +00:00
Zephaniah E. Hull
75618f96c9 Working on one common configure which lets nq and qw compile. 
There, needs a little clean up though.
 2001-02-20 03:10:06 +00:00
Bill Currie
87854e1a0c initial checkin of most recent newtree and nuq(?) source 2001-02-19 21:15:25 +00:00