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
6560 commits 17 branches 20 tags 29 MiB
Commit graph

757 commits

Author SHA1 Message Date
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
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
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
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
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
Bill Currie
cb5c262ffc qtypes.h: 
remove includes of qdefs.h and compat.h
pr_comp.h:
	merge pr_comp.h from quake and qfcc, removing the copy in qfcc
cmdlib.[ch]:
	nuke the endian code.
qendian.c:
	initialise the LittleLong etc pointers at compile time rather than run
	time
com.c (both nq and qw):
	nuke the LittleLong etc init code
everything else:
	fix up after the qtypes.h cleanup
 2001-03-28 17:17:56 +00:00
Bill Currie
5a48f987a5 scripted fixups for the QF include move 2001-03-27 23:36:02 +00:00
Chris Ison
b6f6f959b9 fixed vid_3dfxsvga.c includes to match current tree 2001-03-27 23:29:31 +00:00
Adam Olsen
26d5b1ac67 Forgot these. 2001-03-27 22:42:23 +00:00
Bill Currie
067db089a2 make edict pruning, field parsing and the builtins part of progs_t like they 
should have been
 2001-03-27 22:39:21 +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
82b533e1ef forgot that .S files don't have dependency info :/ 2001-03-27 21:46:49 +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
Ragnvald Maartmann-Moe IV
3217faa319 Fix white sbars in -sgl. 
(Thanks to super_ice for the patch)
 2001-03-11 21:37:32 +00:00
Bill Currie
b4538150bc fix a type access error 2001-03-11 02:14:40 +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
Joseph Carter
ddd4c279fa The standard_quake qboolean now lives here, but Game_Init is now an empty 
function.  There's probably some use for it later on anyway (probably for
metadata defaults or something), but the -hipnotic and -rogue checks are
now in quakefs.c.
 2001-03-09 07:53:04 +00:00
Joseph Carter
1d04bc223d Commented out rogue/hipnotic sbar elements. Didn't outright delete them 
so they can be used in building the scripted HUDs for those trees.  This
commit removes all need for the hipnotic and rogue qbooleans.
 2001-03-09 07:50:45 +00:00
Bill Currie
645a791315 add pr_checkextentions as promised 2001-03-08 00:27:35 +00:00
Bill Currie
53c9732303 add PF_checkextension for later use. The pr_checkextension cvar will come 
when I've had some sleep.
 2001-03-07 10:22:51 +00:00
Bill Currie
e370eb3ce6 this should fix the abyss protocol compatability problems 2001-03-06 16:41:17 +00:00
Joseph Carter
4c3676b9ac Forgot to commit this removal. Mr. Menu, get the hell outta my tree! 2001-03-05 10:06:39 +00:00
Bill Currie
ff2828d82d thought something was wrong with the previous checkin. I keep forgetting .S 
files don't get dependencies in automake :(
 2001-03-05 02:18:03 +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
Joseph Carter
fe26a1c565 This should not be here yet, reverting 2001-03-03 10:01:49 +00:00
Joseph Carter
c057c27d9a Menu has been killed completely from qw. It's dead. I doubt anybody will 
even notice, given that QW's menu was crippled to the point that it was
completely useless anyway.
 2001-03-03 09:42:35 +00:00
Bill Currie
8e52f7dc39 more nq fixes, not there yet 2001-03-03 09:09:39 +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
168d47402a Mostly whitespace, these files are now identical and COULD be merged, if 
they weren't about to get a rewrite first.
 2001-03-03 06:51:18 +00:00
Joseph Carter
1094e146da COM_SkipPath now uses strrchr, it's much more readable now. 2001-03-01 07:42:28 +00:00
Joseph Carter
b2a53d4b46 The download bar is now seperate from Con_DrawConsole. This is currently 
not really for the best, but it will be soon.
 2001-03-01 02:51:51 +00:00
Joseph Carter
9564680d58 NQ's console is now identical to QW's, except for QW's download bar, which 
IMO doesn't belong there and will be moving.  Other things may be moving
too, but I'm still debating them.
 2001-02-28 10:49:39 +00:00
Bill Currie
dfaf767890 libqfgamecode now builds. Now for the fun part: getting qw and nq to work using 
the new setup.
 2001-02-28 09:12:01 +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
7e14a0fbf3 clean up RETURN_EDICT and RETURN_STRING definitions to be both easier to read 
and more correct for aliasing (and int size dependence, too:).
 2001-02-27 19:05:05 +00:00
Bill Currie
8f0272c04e fix some indent braindamage. 
change OP[ABC] to E_OP[ABC] and add OP[ABC] as the non-cast version.
 2001-02-27 05:37:35 +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
1fce1ea12e run indent over all the .c files using qw's .indent.pro. The real reason for 
this is I mistakenly did so while making some other changes (which I made sure
were NOT in the checkin:)
 2001-02-26 06:48:02 +00:00
Ragnvald Maartmann-Moe IV
4723086242 More comment updates! Flee in terror! (Right into the maw of that shambler behind you!) 2001-02-24 08:38:47 +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
Bill Currie
265680d2c2 snd_alsa_0_9.c now works on my cards. Hope it still works for Despair. 2001-02-23 06:36:19 +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
7227f77fb6 as alsa 0.6 never came out, ditch it and add 0.9 support (thanks, Abramo) 2001-02-22 20:51:51 +00:00
Bill Currie
42e52a7093 %s/libutil.a/libqfutil.a/g due to name space clash found when linking SDL. 
New naming convention, all libs will be libqf<subsys>.a (should we instead
use libQF<subsys>.a?). The .so libs, when we get to them, will have to be
sorted out then.
 2001-02-22 16:53:15 +00:00
Bill Currie
7516666084 libutil.a is now used by both qw and nq 2001-02-22 08:12:13 +00:00
Bill Currie
9aa50a847c clean up the mess caused by attempting to merge cmd.[ch]. When taken further, 
this might give us nice controlability of when cvars can be changed.
 2001-02-22 04:46:59 +00:00
Joseph Carter
4537b2daaa GGI has been eradicated. It's broken and none of us use it, therefore 
nobody's fixing it.  Given that without DGA it's not really much faster
than X11 anyway and the lack of a maintainer, it's deadwood.
 2001-02-22 00:24:45 +00:00
Ragnvald Maartmann-Moe IV
c6da49206e More typos, spelling corrections, and case fixes fed to the nearest handy fiend. 2001-02-22 00:15:03 +00:00
Bill Currie
42ce5b1184 nq now plays demos nicely (call Key_Init_Cvars and Con_Init_Cvars) 2001-02-21 22:34:42 +00:00
Bill Currie
c9ab2f1e10 forgot about all the automake macros 2001-02-21 22:26:47 +00:00
Bill Currie
8fc799f81c we finally have a bin naming scheme acceptable by all :) 
nq-*
nq-server
qw-client-*
qw-server
 2001-02-21 22:22:32 +00:00
Bill Currie
c6a37b31a4 s/stricmp/strcasesmp/ 2001-02-21 22:03:25 +00:00
Bill Currie
10b8c5e8ad ok, nq compiles again 2001-02-21 21:44:57 +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
9a47e3c92c A modification to the gun location hack code.. The QW HUD was supposed to 
give you a little more screen real-estate.  It does, but you still have a
big gun blocking most of your screen in the center.  If you turned off the
HUD, you got more screen and less gun.  That now happens whenever the HUD
is displayed.

This is a temporary measure.  At a later point, the gun will always be at
the bottom of the view area regardless of fov.
 2001-02-21 19:13:03 +00:00
Joseph Carter
23ed09f249 Slightly different gl_fires effect. taniwha may back this out if he hates 
it, but I kinda like it.
 2001-02-20 23:36:50 +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
4dd9f74fc0 NQ defined CVAR_HEAP for user-created Cvars, did nothing with it though. 2001-02-20 16:15:43 +00:00
Zephaniah E. Hull
a7b59259c1 New name scheme for generated bins. 
cougar-(qw|nq)-cl-*
cougar-(qw|nq)-sv

If someone really wants to a S&R on cougar in configure.in and the two
Makefile.am files will change it to something else.
 2001-02-20 13:46:04 +00:00
Bill Currie
c83f38d8bf bring Mercury's changes back in 2001-02-20 04:57:07 +00:00
Bill Currie
e3b7ab218e minor fixups 2001-02-20 03:51:04 +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