Commit graph

211 commits

Author SHA1 Message Date
Bill Currie
ee7d43f6ae fix the "Couldn't load skin skins/dvc-c.pcx" skins problem 2001-04-13 01:45:37 +00:00
Bill Currie
5278f9fd73 put the gamma code into vid.c where (IMO) it should have been.
give vid_fbdev VID_SetGamma
mame vid_common_gl and vid_common_sw of their gamma code (vid_common_sw is
now empty:/)
rewrite VID_InitGamma to do the right thing with cvars with callbacks
gl clients have [temporarily?] lost the CVAR_ROM on vid_gamma
2001-04-12 23:44:56 +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
Ragnvald Maartmann-Moe IV
3a395dd87f Fix black screens in -sdl, and lack of gamma correction in -sgl. 2001-04-12 06:26:14 +00:00
Ragnvald Maartmann-Moe IV
f2435b8a64 Round, rather than truncate. 2001-04-12 03:48:26 +00:00
Bill Currie
f7d9c1e8fc joy_win.c now builds, but very likely does not work AT ALL. also fix qw's
in_win.c for the new input api
2001-04-11 21:06:37 +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
Jeff Teunissen
5cd24de097 Hardware gamma support in QW. Currently, only -x11 and -glx will
build. Look at their vid files, as well as vid_common_{gl,sw}.c to find
out what will need to be added to the rest of the video targets.
2001-04-11 07:16:34 +00:00
Bill Currie
4ae2ad2949 qw-client-wgl now builds (nq-wgl next) 2001-04-11 05:10:42 +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
7f5d4cd7e9 clients now build (sdl, sgl, wgl), but don't link yet 2001-04-10 22:09:41 +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
Bill Currie
082c5ccae4 get qw-server to link in mingw 2001-04-10 21:43:57 +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
dfbfd9463c mingw cross compile fixes. qw-server (only, so far) compiles but does not
yet link due to Sys_Error :/
2001-04-10 20:07:11 +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
Bill Currie
2829f8b493 include config.h and string[s].h 2001-04-10 02:16:50 +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
Ragnvald Maartmann-Moe IV
0c00970ae1 Tweak particle effects extensively. Grenades and blood far cheaper, and better looking. 2001-04-08 21:41:53 +00:00
Timothy C. McGrath
9bdc1f02c4 Modified smoke trails for grenades and rockets so that we have an easter
egg temporarily until easter - They'll randomly choose between 255
colors. I'll eventually change this into a cvar, but for now enjoy ;)

This stuff is easily removed for the people who don't like colors: Just
remove my added lines, and uncomment the old ones :)

Misty-chan
2001-04-08 07:49:54 +00:00
Zephaniah E. Hull
7553f2b0a4 Tweaking the trails a bit more. 2001-04-08 04:56:24 +00:00
Zephaniah E. Hull
4873457160 Fixed how all particle trails are rendered, still needs a /lot/ of tweaking. 2001-04-08 04:07:19 +00:00
Ragnvald Maartmann-Moe IV
b897f96e51 Restore old grenade smoke trail, make order of texture generator mentions consistent. 2001-04-06 19:23:00 +00:00
Zephaniah E. Hull
a40130f7d7 Oops, non-smoke ring particles should work again. 2001-04-06 19:05:57 +00:00
Zephaniah E. Hull
a16b2c0070 Borrowed LH's VectorVectors.
Changed smoke trails a good bit.
2001-04-06 18:37:23 +00:00
Ragnvald Maartmann-Moe IV
1f25ab9ec2 New generated texture for spark particles. 2001-04-06 04:27:39 +00:00
Zephaniah E. Hull
b7ee9ba07d gl_draw.c: gl_lightmode now uses a callback.
gl_dyn_part.c:
  Now uses a (non-locked) vertex array to reduce GL calls.
  Gives a slight speed gain, I'll optimize it a bit more soon.
gl_rlight.c:
  Fixed much of the dlightframecount issues.
  (This gives cleaner code and a speed up.)
gl_rmain.c: A slight reorg of the dlight call order.
gl_rmisc.c: Enable some of the vertex arrays. (vertex, texcoord, color.)
gl_rsurf.c:
  Reworked R_BuildLightMap, smaller now code wise, also more optimized,
  and it builds a 0-2 lightmap in more cases now.

  Playing with GL_UploadLightmap.

  For non-lighthalf non-mtex lightmaps use a 0-2 range.
  (Makes gl_lightmode look a /lot/ better.)

gl_screen.c: More stuff with the gl_lightmode callback.
r_view.c: R_PushDlights is called elsewhere now.
sw_rmain.c:
  Moved the R_PushDlights call.
  Also killed the unused PASSAGES define.
2001-04-06 02:57:26 +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
ef66808016 this was accidently deleted 2001-04-04 21:24:28 +00:00
Bill Currie
0146992d67 rename (most of) r_*.[cS] to sw_r#1.#2 (mmv rocks:) to finally fix the borked
naming scheme of sw vs gl
2001-04-04 21:22:23 +00:00
Ragnvald Maartmann-Moe IV
4dc5da173b Rest of commit... 2001-04-04 05:40:29 +00:00
Ragnvald Maartmann-Moe IV
f4632ccd8b Merge fractalnoise into noisetextures.c, which will eventually add a few more fractal noise types. Current smoke is a blend of diamond-square and plasma noise.
Also make smoke less dense, in an attempt to fix Jin^eLD's problem with hwguy smoke.
2001-04-04 05:39:44 +00:00
Chris Ison
2ece48c535 alpha code for master server queries 2001-04-03 05:48:24 +00:00
Timothy C. McGrath
1843bb5839 Minor housecleaning. sw no longer spits out diagnostic output, comments
are now sane and match current code, I moved things around in GL so they
more closely match the sw code, as the sw code makes more sense now that
I *finally* understand what in gods name I was doing wrong. ;)

I also made minor changes to the help to indicate the minimum values of
the variables (sw can deal with 1, gl 0) as well as that you really
ought to use r_particles 0 instead of a setting of cl_max_particles 0 in
GL :P

Thanks for all the help taniwha, those last two bugs were kicking my
butt.

Misty-chan
2001-04-03 05:40:15 +00:00
Bill Currie
afaf10a2c8 fix the lost particles problem 2001-04-03 05:08:23 +00:00
Bill Currie
9bb7aee3fe this should fix misty-chan's problems :) 2001-04-03 04:11:29 +00:00
Timothy C. McGrath
d649508b5d This took half the hair on my head. Just kidding:
cl_max_particles now lives in *part.c - in GL it dynamically changes the
amount of particles on the fly! Needless to say this is fun, and this is
proboably the third cvar that uses the callbacks function at all - which
IMHO is really a cool trick Taniwha.

However I'm losing my SANITY in r_part.c - if someone could take a look,
I'd be greatly appreciative. It should be obvious to any developer that
I'm having a few problems. :P Basically the dynamic code is completely
and totally disabled, and I hacked in code which *works* but shouldn't
EVER EVER EVER be left there after we fix this as it is downright EVIL
the way I implimented it. SW client does work, and does still work with
+set cl_max_particles - however the hacks I made to get it to do that...
*shakes head* Tread softly in there, it's a mess.

Other notes of interest:
I changed show_time so it archives its setting. Got annoyed with it. If
someone finds this change to be bad, change it back. :)

glspeed.cfg got updated with a setting of 60 for cl_max_particles. 60
works nicely, and doesn't use too much speed on my aging hardware, so
I'm sure newer systems will just plain FLY with this on.

I also changed the cl_maxfps setting as 72 is great if you aren't using
a modem !.! due to the way cl_maxfps works, the higher it goes, the more
data is sent to you by the server. This causes a heck of a lot of lost
packets if you don't have the bandwidth OR if your card can't keep up
with the framerate. Either of which is bad. I set it to 30, the default
of the cvar is 0/32 so go figure out what works best for you I say.

Let me know if this blows up in your face and ESPECIALLY let me know if
you can fix the r_part.c problems!

Misty-chan
2001-04-03 02:56:39 +00:00
Bill Currie
f5c168b8a5 sw currently can't cope with 0 particles 2001-04-02 23:38:56 +00:00
Chris Ison
0e68cf838d Added slist update and slist # (shows details) 2001-04-02 10:24:23 +00:00
Chris Ison
999b8c94ac Start of console based server list 2001-04-01 22:09:12 +00:00
Bill Currie
fc99d7bd4d oooooooops, forgot to call Game_Init in the server 2001-04-01 01:42:40 +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
4162243287 eliminate Cmd_ForwardToServer from cmd.c. Cmd_ForwardToServer still needs to
be removed from cmd.h, but that can wait a bit.
2001-03-31 00:35:08 +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
c227fbc3cc forgot to remove this 2001-03-30 17:43:53 +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
Adam Olsen
9b31fca76d Add include for stdlib.h needed for malloc call. 2001-03-29 13:13:28 +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
Chris Ison
f1c31b6e1a added #include for QF/compat.h 2001-03-28 22:23:40 +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
d56a749e05 Well I *guess* this is needed, if only to make sure they have identical files. 2001-03-27 22:44:58 +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
Timothy C. McGrath
b25a437460 Very minor changes. cl_max_particles still cannot be used dynamically,
however I've removed the stupid limits that I'd accidentally left behind
in my panic to comment out the messed up code in r_part.c so software
clients now can use a setting of zero. Particles in sw clients will not
default to 2048 if you use a number less than 1 - it will now use 0.
Otherwise, I made comments to myself for when I actually fix this and
cleared up some silliness in comments I'd made. Nothing special.

Special note: To use cl_max_particles *right now* you can either set it
while playing and then restart the client (I think this should work,
it's archived. May not however) Or do this which I absolutely am
*positive* works:

clientname othercommands +set cl_max_particles number othercommands

So, again, while changing in game does not work, it at least is still
useful somewhat.

Misty-chan
2001-03-22 01:52:33 +00:00
Timothy C. McGrath
820715672b *DOH!*
I goofed up my code. cl_max_particles will not dynamically update with
this change, but ATM, this is safer until I can grok what I need to know
to fix the code I wrote.

Sorry guys,
Misty-chan
2001-03-20 00:27:22 +00:00
Timothy C. McGrath
264547d470 Okay, this patch REMOVES the -particles command line option, and adds a
new cvar: cl_max_particles. This cvar is archived, has no lower or
upper limits (well, less than 1 is not allowed) and can be changed in
game at any time.

BUGS:

Only one so far. I can't figure out why it's doing this, but in software
clients, (well, at least X11) if you set it to 1 particle, it acts like
you set it far higher. 2 acts like you set it to zero... Or maybe
it's showing 2 and I just can't see it on my 320x200 window. In any
case, the vagary must be something in the software particles code,
because I basically used the same code from the GL particles code for
this as I used for the software renderer.

If nobody can find fault with my code, I'll just make a special note in
the console help.

In any case, let me know of any problems.

Misty-chan
2001-03-18 07:04:47 +00:00
Forest Hale
cc85f21430 shrank lava splash particles from size 7 to size 3, makes spy gas grenades in TF faster 2001-03-16 15:25:31 +00:00
Ragnvald Maartmann-Moe IV
00e71e3cc5 Better failure reporting for vid_use8bit. 2001-03-13 04:43:15 +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
Ragnvald Maartmann-Moe IV
30cdd18174 Fix a typo. Oops... 2001-03-11 00:31:52 +00:00
Ragnvald Maartmann-Moe IV
e884846d57 Tighten up checks for 3dfx in gl_draw.c and restore default gl_texturemode to old setting. 2001-03-11 00:25:30 +00:00
Ragnvald Maartmann-Moe IV
fd3eafac77 Oops. 2001-03-09 21:21:50 +00:00
Ragnvald Maartmann-Moe IV
1b8928de00 Cleanup of gl_draw.c and beginnings of work for user-specifiable texture format/quality (monochrome quake anybody? :) 2001-03-09 21:10:44 +00:00
Joseph Carter
055fe8d222 Purely whitespace cleanups 2001-03-09 07:55:25 +00:00
Chris Ison
69fd58944e moved slist loading into cl_slist.c 2001-03-08 23:53:03 +00:00
Bill Currie
645a791315 add pr_checkextentions as promised 2001-03-08 00:27:35 +00:00
Chris Ison
16bc4735b1 adding rising smoke 2001-03-07 23:24:53 +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
771648a5b4 forgot to remove the old prstring stuff 2001-03-06 16:10:28 +00:00
Bill Currie
f40b361fb3 hash.[ch]:
slight api change: the getkey and free functions now take a user data
	parameter (which is an aditional parameter to Hash_New.
cmd.c, cvar.c, quakefs.c:
	clean up the resulting errors.
pr_edict.c:
	use hash tables for lookups of function, global and field definitions.
	should speed things up a bit, ESPECIALLY when type checking is enabled.
2001-03-05 05:11:26 +00:00
Bill Currie
09b58f7e5f merge math code into utils 2001-03-05 02:06:05 +00:00
Joseph Carter
fb9f7a1ba4 Forest's COM_FileBase rewrite. Doubt this is faster, but it's sure a lot
easier on the eyes.
2001-03-04 10:09:59 +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
6bb1f172d0 THOU SHALT NOT SCREW UP THY DOT-PRODUCT MACRO!!! :P 2001-03-04 06:08:28 +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
b507853b18 A number of keys should bring up the menu in demo playback, they now bring
up the console.
2001-03-04 01:55:12 +00:00
Joseph Carter
e4e80437df Escape is still unconditional, but rather than being unconditionally menu
(or now unconditionally nothing since I killed the menu), it works as the
console.  In the future, when the new menu is implemented, it will fall
back to console if there's a problem with the menu (like there isn't one.)
2001-03-03 12:30:48 +00:00
Joseph Carter
d28e15d171 Software netgraph fixed. Probably not the same as it was before, someone
else is welcome to change it to their liking, optimize it, remove the box,
whatever..
2001-03-03 12:16:24 +00:00
Joseph Carter
9c39a00a54 Fixed the netgraph 2001-03-03 11:05:20 +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
baa5ce01a1 more independence cleanups and nq is closer to running 2001-03-03 08:59:55 +00:00