Ragnvald Maartmann-Moe IV
6e3ea5cabb
whitespace
2001-05-19 16:22:35 +00:00
Ragnvald Maartmann-Moe IV
9f124853e5
whitespace
2001-05-19 02:09:08 +00:00
Bill Currie
0910c850bf
make R_LineGraph non-static
2001-05-19 01:59:04 +00:00
Bill Currie
ec5daaa764
finally merge render.h. nq will NOT currently compile. I'll fix that when I
...
get back onto my computer at home
2001-05-19 00:23:21 +00:00
Adam Olsen
9cc30959e4
Sound now uses runtime plugins. Much thanks to Deek for doing all the
...
thinking :)
set fs_pluginpath to point to the right dir, and set snd_plugin to pick a sound
plugin.
Current issues:
- alsa 0.5 won't build properly, dunno why
- segfault on exit. I think I know the cause of this, and how to fix it
- alsa 0.9, gus, sgi, sun, and win32 havn't been tested
2001-05-19 00:05:35 +00:00
Bill Currie
f0c6dfcb1a
now identical
2001-05-18 21:05:38 +00:00
Ragnvald Maartmann-Moe IV
9949108f45
draw.c now identical in qw and nq.
2001-05-18 20:52:15 +00:00
Ragnvald Maartmann-Moe IV
51cb61aea2
keys.c is now identical in nq and qw, as well as less of a whitespace mess.
2001-05-18 20:38:22 +00:00
Bill Currie
89360e5627
no need for bothdefs.h
2001-05-18 20:23:53 +00:00
Bill Currie
69ab5c981c
99% merge of d_*.[cS]. just d_polyse to look at
2001-05-18 20:19:20 +00:00
Bill Currie
664c640e42
total merge of the particle system (except r_part.c isn't in qw yet)
2001-05-18 19:58:49 +00:00
Ragnvald Maartmann-Moe IV
1dbfea351a
console.c mergable. Little bit of cleanup of client.h
2001-05-18 18:33:37 +00:00
Bill Currie
a735b92bab
kill the allowskybox varible. it wasn't ever checked anyway
2001-05-18 18:04:55 +00:00
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
d62ac62ff5
allow commands other than set to be executed from ~/.quakeforgerc
2001-05-17 21:32:59 +00:00
Bill Currie
011b16144e
check for the availability of usleep
2001-05-17 18:29:22 +00:00
Bill Currie
d820a6ecee
fix up the libs dependencies so the targets get relinked if any of the QF
...
libs get updated (vital for static builds)
2001-05-17 16:52:47 +00:00
Adam Olsen
65cf395fd6
make it release the CPU when framerate is too high
...
I thought I commited this already...
2001-05-17 10:10:40 +00:00
Bill Currie
a344c9fbd2
lib link order fixing so stat libs work
2001-05-17 08:29:04 +00:00
Bill Currie
44f4c688a5
whitespace
2001-05-17 07:52:37 +00:00
Bill Currie
35a52bb634
diff noise reductions + fix what looks to be a bug with surf flushing
2001-05-16 17:20:42 +00:00
Bill Currie
8f4394de4f
various merge cleanups including moving the contents of R_Textures_Init into
...
Mod_Init
2001-05-16 17:08:56 +00:00
Bill Currie
dda567a961
clean up a comment
2001-05-16 15:54:56 +00:00
Bill Currie
72cc67e863
kill r_fullbright and r_draworder
...
`merge' skin handling
2001-05-16 06:01:34 +00:00
Bill Currie
266e6b3474
put TE_BLOOD and TE_LIGHTNINGBLOOD into nq and clean up some other diffs.
...
down to just old_origin vs ent->msg_origins
2001-05-16 03:55: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
e7c2ed82db
whitespace...
2001-05-15 21:13:07 +00:00
Bill Currie
e07f91155b
some diff cleanups: use cl.viewentity instead of cl.playernum + 1 and some
...
white space
2001-05-15 19:38:01 +00:00
Ragnvald Maartmann-Moe IV
c278652d9a
diff noise reduction
2001-05-15 19:22:39 +00:00
Ragnvald Maartmann-Moe IV
e88cdda35a
whitespace.
2001-05-15 19:19:38 +00:00
Ragnvald Maartmann-Moe IV
5d52236da1
Whitespace and comment cleanup.
2001-05-15 17:38:43 +00:00
Ragnvald Maartmann-Moe IV
dd81f9bf30
Change light setting from 256 and 200 to 255, for fullbright models.
2001-05-15 17:38:02 +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
350920399e
that wasn't quite the right thing to do
2001-05-15 05:38:06 +00:00
Bill Currie
ba0d0c755c
do key_dest right
2001-05-15 05:27:14 +00:00
Bill Currie
7b4e395dcb
massive merging madness mounds
2001-05-15 04:50:53 +00:00
Bill Currie
eb65d61322
more merge madness
2001-05-15 03:27:55 +00:00
Ragnvald Maartmann-Moe IV
cf7487b692
Dead cvar removal, diff noise cleanup. The usual.
2001-05-15 02:19:36 +00:00
Bill Currie
312cb5bf53
clean up the diffs again after enabling R_Mirror in nq
2001-05-14 20:57:50 +00:00
Bill Currie
1b74d305a8
diff noise reduction
2001-05-14 20:35:32 +00:00
Ragnvald Maartmann-Moe IV
0c16f56c23
diff noise reduction.
2001-05-14 19:46:16 +00:00
Ragnvald Maartmann-Moe IV
2c80bff085
Removed useless comments.
2001-05-14 06:57:38 +00:00
Bill Currie
9064530d1d
diff noise reduction
2001-05-14 06:48:59 +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
0a915d3ecc
compile fix for win32
2001-05-14 05:43:35 +00:00
Bill Currie
879a133c19
forward port the x11 repeat fix
2001-05-14 05:37:47 +00:00
Bill Currie
83e0754e41
fix missing "" around cvar default
2001-05-14 05:21:27 +00:00
Ragnvald Maartmann-Moe IV
28d3937399
Some more whitespace, and fixes for disappearing cvars.
2001-05-14 05:16:59 +00:00
Ragnvald Maartmann-Moe IV
91200a862d
Whitespace.
2001-05-14 03:08:24 +00:00
Ragnvald Maartmann-Moe IV
56f76e8192
More cleanups.
2001-05-14 01:22:58 +00:00
Ragnvald Maartmann-Moe IV
924cdf917d
Fix a new bug with dlights, more cleanups.
2001-05-13 23:15:34 +00:00
Ragnvald Maartmann-Moe IV
048a80ce23
Merges and cleanups...
2001-05-13 22:57:27 +00:00
Ragnvald Maartmann-Moe IV
87894c0d39
Whitespace.
2001-05-13 17:01:17 +00:00
Ragnvald Maartmann-Moe IV
4b758624a9
Whitespace and comment cleanups.
2001-05-13 04:17:05 +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
fc456ac040
more header cleanups
2001-05-11 23:56:01 +00:00
Bill Currie
559aa4485b
split out the qw client specific skin code from skin.c
2001-05-11 22:47:15 +00:00
Bill Currie
f62ecbe90d
mild comment cleanup
2001-05-11 21:44:27 +00:00
Bill Currie
74f734df67
clean up *_skin.c's header dependencies
2001-05-11 21:23:43 +00:00
Ragnvald Maartmann-Moe IV
86b2363244
emptiness shuffled.
2001-05-11 20:50:16 +00:00
Ragnvald Maartmann-Moe IV
a2b5fe36bb
Whitespace.
2001-05-11 19:53:23 +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
Bill Currie
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
Bill Currie
b775a6f308
remove some diff noise to ease merging
2001-05-11 06:11:17 +00:00
Bill Currie
44317f299e
merge gl_mesh.c into libQFmodels
2001-05-11 05:59:17 +00:00
Ragnvald Maartmann-Moe IV
28c809d27e
Alliteration Annoys Always
2001-05-11 01:01:27 +00:00
Bill Currie
d03e28a034
correct the link order of the libs
2001-05-10 16:29:11 +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
37a93b3e91
Merge draw.h.
2001-05-09 22:40:51 +00:00
Bill Currie
271803a568
commdef.h is dead
...
good riddance
2001-05-09 20:34:39 +00:00
Bill Currie
9b666fb26e
correct an error message
2001-05-09 20:31:21 +00:00
Bill Currie
83af1368e1
remove pcx.c's dependence on cl_parse.h
2001-05-09 18:48:55 +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
7fa4b01208
More header merges.
2001-05-09 18:28:08 +00:00
Bill Currie
439eb60cb2
fix some missed refs to teamplay.h as a result of its move
2001-05-09 18:04:45 +00:00
Ragnvald Maartmann-Moe IV
7567098bc0
More header merges.
2001-05-09 17:57:57 +00:00
Bill Currie
f818392e26
cruft removal
2001-05-09 06:02:23 +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
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
Ragnvald Maartmann-Moe IV
4ad2644fa3
Tweaks to particle effects.
2001-05-02 18:01:14 +00:00
Zephaniah E. Hull
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
Zephaniah E. Hull
86a99a7cd2
Fixed how we detect 3dfx cards, AND how we set the default gl_max_size.
2001-05-02 09:27:00 +00:00
Bill Currie
1fbb62d518
hook in the plugin system
2001-04-25 00:20:23 +00:00
Ragnvald Maartmann-Moe IV
93290fcb07
Easter's over. (aww...)
2001-04-20 19:45:42 +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
Adam Olsen
fa4ee64984
And cshift patch here too..
2001-04-20 13:33:56 +00:00
Adam Olsen
c2044ccdbf
Fix the "Corrupted demo" error when you play a timedemo while one is already running.
2001-04-20 13:09:22 +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
9babdbdf79
correct the wording of the server init failure message
2001-04-18 04:42:09 +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
Adam Olsen
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
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
Adam Olsen
311cbdbe59
Fix so building statically (--disable-shared) works.
2001-04-16 17:45:35 +00:00
Bill Currie
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
Bill Currie
f9c9e4fba7
everything except *-3dfx (unknown status) now builds
2001-04-16 03:55:44 +00:00
Bill Currie
0b5b3b03a4
move GL_CheckBrightness into vid_common_gl.c
2001-04-15 21:19:05 +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
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
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
2c282b17c4
Die, dammit!
2001-04-15 05:04:16 +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
Timothy C. McGrath
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
Bill Currie
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
Jeff Teunissen
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
Bill Currie
9a2df9a2d5
use hash tables in Skin_Find
2001-04-13 06:56:45 +00:00
Ragnvald Maartmann-Moe IV
9ff89960f2
Fix hw gamma in -sgl.
2001-04-13 06:53:35 +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
deac792513
damn, not only did that not fix the problem, I broke stuff
2001-04-13 03:33:56 +00:00
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
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
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