312cb5bf53
clean up the diffs again after enabling R_Mirror in nq
2001-05-14 20:57:50 +00:00
1b74d305a8
diff noise reduction
2001-05-14 20:35:32 +00:00
0c16f56c23
diff noise reduction.
2001-05-14 19:46:16 +00:00
2c80bff085
Removed useless comments.
2001-05-14 06:57:38 +00:00
9064530d1d
diff noise reduction
2001-05-14 06:48:59 +00:00
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
0a915d3ecc
compile fix for win32
2001-05-14 05:43:35 +00:00
879a133c19
forward port the x11 repeat fix
2001-05-14 05:37:47 +00:00
83e0754e41
fix missing "" around cvar default
2001-05-14 05:21:27 +00:00
28d3937399
Some more whitespace, and fixes for disappearing cvars.
2001-05-14 05:16:59 +00:00
91200a862d
Whitespace.
2001-05-14 03:08:24 +00:00
56f76e8192
More cleanups.
2001-05-14 01:22:58 +00:00
924cdf917d
Fix a new bug with dlights, more cleanups.
2001-05-13 23:15:34 +00:00
048a80ce23
Merges and cleanups...
2001-05-13 22:57:27 +00:00
87894c0d39
Whitespace.
2001-05-13 17:01:17 +00:00
4b758624a9
Whitespace and comment cleanups.
2001-05-13 04:17:05 +00:00
c7ee39acbb
rename the qw c declaration of the client name cvar from name to cl_name
2001-05-13 04:01:06 +00:00
220f8a6e38
Renderer merge continues. gl_rlight, gl_rmisc, gl_rmain, and gl_rsurf the current victims.
2001-05-13 00:28:50 +00:00
fc456ac040
more header cleanups
2001-05-11 23:56:01 +00:00
559aa4485b
split out the qw client specific skin code from skin.c
2001-05-11 22:47:15 +00:00
f62ecbe90d
mild comment cleanup
2001-05-11 21:44:27 +00:00
74f734df67
clean up *_skin.c's header dependencies
2001-05-11 21:23:43 +00:00
86b2363244
emptiness shuffled.
2001-05-11 20:50:16 +00:00
a2b5fe36bb
Whitespace.
2001-05-11 19:53:23 +00:00
105d1ee7d9
well, that didn't last long, did it?
...
merge r_cvar.h
2001-05-11 19:33:17 +00:00
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
6ba3288744
more diff noise reduction. just down to the diferences in the way gl stuff
...
is handled.
2001-05-11 16:23:00 +00:00
b775a6f308
remove some diff noise to ease merging
2001-05-11 06:11:17 +00:00
44317f299e
merge gl_mesh.c into libQFmodels
2001-05-11 05:59:17 +00:00
28c809d27e
Alliteration Annoys Always
2001-05-11 01:01:27 +00:00
ab29863c04
Grok Goofs Grumble.
2001-05-10 17:49:35 +00:00
a5d3e614a0
More Merge Madness.
2001-05-10 17:45:05 +00:00
7aa70de483
*meld*
2001-05-10 17:26:03 +00:00
d03e28a034
correct the link order of the libs
2001-05-10 16:29:11 +00:00
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
5cd8ddb1aa
*shuffle*
2001-05-10 04:16:39 +00:00
f5f3260dec
Taniwha apparently lost interest after doing the hard part, so I'll just merge this...
2001-05-10 03:36:31 +00:00
00f6e26419
clean up some nasty dependencies
2001-05-10 03:16:29 +00:00
5864e85048
Clean up after aforementioned shoggoth.
2001-05-10 02:42:19 +00:00
9529f12f5b
Mister Spock was here.
2001-05-10 02:37:55 +00:00
2fe98e9fa4
More merging. Become one with the shoggoth. Poor hungry shoggoth...
2001-05-10 02:29:38 +00:00
37a93b3e91
Merge draw.h.
2001-05-09 22:40:51 +00:00
3ba56286ac
more missed removals
2001-05-09 22:08:21 +00:00
271803a568
commdef.h is dead
...
good riddance
2001-05-09 20:34:39 +00:00
9b666fb26e
correct an error message
2001-05-09 20:31:21 +00:00
83af1368e1
remove pcx.c's dependence on cl_parse.h
2001-05-09 18:48:55 +00:00
febf62ad9d
Ack, where did all the chairs go!
2001-05-09 18:45:38 +00:00
910e76a900
More header musical chairs chaos. You there! No eating the chairs!
2001-05-09 18:42:37 +00:00
5afd16bea9
More header cleanups.
2001-05-09 18:34:46 +00:00
7fa4b01208
More header merges.
2001-05-09 18:28:08 +00:00
439eb60cb2
fix some missed refs to teamplay.h as a result of its move
2001-05-09 18:04:45 +00:00
7567098bc0
More header merges.
2001-05-09 17:57:57 +00:00
85de55a05c
More header merging.
2001-05-09 17:29:07 +00:00
a454719fc7
Merge adivtab.h while I'm at it.
2001-05-09 17:24:41 +00:00
e0d43f4a7f
Merge anorms.h and anorm_dots.h.
2001-05-09 17:22:27 +00:00
f818392e26
cruft removal
2001-05-09 06:02:23 +00:00
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
80814f5437
remove these since they are no longer needed as they are in libs/util now
2001-05-08 22:29:48 +00:00
b5df1c816a
move fnmatch.c and dirent.c to libQFutil
2001-05-08 20:53:25 +00:00
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
4ad2644fa3
Tweaks to particle effects.
2001-05-02 18:01:14 +00:00
4b3311983b
cl_demo.c: Modified timedemo to give a little more precision with FPS.
...
gl_draw.c: Fixing gl_lightmode 1.
gl_dyn_part.c:
Fixing gl_lightmode 1.
Fixed word wrapping on comments.
Switched to using the new vertex array setup.
gl_rmisc.c: New vertex array setup.
varrays.h: New vertex array setup.
2001-05-02 13:48:04 +00:00
86a99a7cd2
Fixed how we detect 3dfx cards, AND how we set the default gl_max_size.
2001-05-02 09:27:00 +00:00
1fbb62d518
hook in the plugin system
2001-04-25 00:20:23 +00:00
93290fcb07
Easter's over. (aww...)
2001-04-20 19:45:42 +00:00
b5d3508022
Small cleanups.
2001-04-20 19:39:38 +00:00
4be4e5ccf6
clear not-yet allocated entities to 0xdeadbeef
2001-04-20 17:51:57 +00:00
fa4ee64984
And cshift patch here too..
2001-04-20 13:33:56 +00:00
c2044ccdbf
Fix the "Corrupted demo" error when you play a timedemo while one is already running.
2001-04-20 13:09:22 +00:00
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
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
75df0b6440
Makefile cleanups.
2001-04-18 07:05:37 +00:00
9babdbdf79
correct the wording of the server init failure message
2001-04-18 04:42:09 +00:00
527471a7de
*-wgl finally links (who knows if it works?:) and some more conceptual
...
cleanup
2001-04-17 15:55:33 +00:00
f9641bfadc
Make 16 megs the default, since 44khz sounds need it. Win will grab
...
up to 16 megs anyway, and nq already has 16 as the default, so no
changes for them.
2001-04-17 07:47:32 +00:00
dbca31519f
qw-client-wgl and nq-wgl get to (but fail) the link stage
2001-04-17 06:55:50 +00:00
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
311cbdbe59
Fix so building statically (--disable-shared) works.
2001-04-16 17:45:35 +00:00
065649e488
rework VID_InitBuffers to use callback to init the draw buffers.
...
Unfortunatly, this means that VID_InitBuffers needs to be called twice during
startup (once in VID_Init, and once in D_Init).
2001-04-16 09:12:21 +00:00
f9c9e4fba7
everything except *-3dfx (unknown status) now builds
2001-04-16 03:55:44 +00:00
0b5b3b03a4
move GL_CheckBrightness into vid_common_gl.c
2001-04-15 21:19:05 +00:00
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
36cbe70826
vid libs build but probably don't work yet (I KNOW x11 doesn't) lots of
...
build failures in the main source still
2001-04-15 08:04:15 +00:00
a0ab26ff6b
merge screen.h
2001-04-15 07:47:49 +00:00
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
20e0961ed2
*whack* Die Mole Die!!!
2001-04-15 06:18:06 +00:00
778f0c129c
Finish move of vid.c to libs, kill a few stragglers.
2001-04-15 05:36:56 +00:00
dbf0e3130e
Quash more cvs add/remove oddities.
2001-04-15 05:18:23 +00:00
2c282b17c4
Die, dammit!
2001-04-15 05:04:16 +00:00
84461e1f1f
More merging.
2001-04-15 04:45:07 +00:00
6a696881b3
these are now in libs/video/targets
2001-04-15 04:40:09 +00:00
66fafd3e0e
First stage of video and input system merge. The city has collapsed, wreckage sifting ensues...
2001-04-15 04:18:22 +00:00
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
9f583076f8
Made necessary changes to includes to get files to compile, got
...
directions from despair :)
Misty-chan
2001-04-15 00:39:29 +00:00
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
8fef64c064
V_CheckGamma WILL get called before vid_gamma gets set in gl, so protect
...
against that circumstance.
2001-04-14 02:27:19 +00:00
bffe67977c
Gamma cleanups. Brightness and contrast are gone from software, since they
...
won't work with proper gamma control anyway.
2001-04-13 08:02:11 +00:00
9a2df9a2d5
use hash tables in Skin_Find
2001-04-13 06:56:45 +00:00
9ff89960f2
Fix hw gamma in -sgl.
2001-04-13 06:53:35 +00:00
1b40eb715a
fixed m_filter CVAR type, started on gamma for 3dfx
2001-04-13 04:25:06 +00:00
deac792513
damn, not only did that not fix the problem, I broke stuff
2001-04-13 03:33:56 +00:00
ee7d43f6ae
fix the "Couldn't load skin skins/dvc-c.pcx" skins problem
2001-04-13 01:45:37 +00:00
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
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
3a395dd87f
Fix black screens in -sdl, and lack of gamma correction in -sgl.
2001-04-12 06:26:14 +00:00
f2435b8a64
Round, rather than truncate.
2001-04-12 03:48:26 +00:00
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
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
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
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
4ae2ad2949
qw-client-wgl now builds (nq-wgl next)
2001-04-11 05:10:42 +00:00
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
75aa40276f
A few more. Also removed a couple inaccurate comments.
2001-04-11 00:10:19 +00:00
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
7f5d4cd7e9
clients now build (sdl, sgl, wgl), but don't link yet
2001-04-10 22:09:41 +00:00
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
082c5ccae4
get qw-server to link in mingw
2001-04-10 21:43:57 +00:00
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
334b528a40
forgot some bits
2001-04-10 20:11:50 +00:00
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
dcd924c355
Removed old files
2001-04-10 09:44:36 +00:00
69022c7ffb
Move sound targets into a library. Still doesn't pick one at runtime though.
2001-04-10 09:40:09 +00:00
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
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
2829f8b493
include config.h and string[s].h
2001-04-10 02:16:50 +00:00
d7eb585502
Merge cd. Doesn't dlopen different cd drivers or anything exciting... Yet.
2001-04-09 21:15:09 +00:00
0c00970ae1
Tweak particle effects extensively. Grenades and blood far cheaper, and better looking.
2001-04-08 21:41:53 +00:00
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
7553f2b0a4
Tweaking the trails a bit more.
2001-04-08 04:56:24 +00:00
4873457160
Fixed how all particle trails are rendered, still needs a /lot/ of tweaking.
2001-04-08 04:07:19 +00:00
b897f96e51
Restore old grenade smoke trail, make order of texture generator mentions consistent.
2001-04-06 19:23:00 +00:00
a40130f7d7
Oops, non-smoke ring particles should work again.
2001-04-06 19:05:57 +00:00
a16b2c0070
Borrowed LH's VectorVectors.
...
Changed smoke trails a good bit.
2001-04-06 18:37:23 +00:00
1f25ab9ec2
New generated texture for spark particles.
2001-04-06 04:27:39 +00:00
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
9ea0605558
reverting this for Mercury
2001-04-06 02:12:19 +00:00
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
ef66808016
this was accidently deleted
2001-04-04 21:24:28 +00:00
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
4dc5da173b
Rest of commit...
2001-04-04 05:40:29 +00:00
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
2ece48c535
alpha code for master server queries
2001-04-03 05:48:24 +00:00
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
afaf10a2c8
fix the lost particles problem
2001-04-03 05:08:23 +00:00
9bb7aee3fe
this should fix misty-chan's problems :)
2001-04-03 04:11:29 +00:00
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
f5c168b8a5
sw currently can't cope with 0 particles
2001-04-02 23:38:56 +00:00
0e68cf838d
Added slist update and slist # (shows details)
2001-04-02 10:24:23 +00:00
999b8c94ac
Start of console based server list
2001-04-01 22:09:12 +00:00
fc99d7bd4d
oooooooops, forgot to call Game_Init in the server
2001-04-01 01:42:40 +00:00
Bill Currie
Ragnvald Maartmann-Moe IV
Zephaniah E. Hull
Adam Olsen
Chris Ison
Timothy C. McGrath
Jeff Teunissen
Joseph Carter