Bill Currie
600bcfb108
forgot to remove these
2001-05-24 19:28:07 +00:00
Bill Currie
73e6e1684f
FINALLY, the nq and qw renderers are merged. the view and particle subsystems
...
are not yet merged due to their dependence on the client, but that will come
soon.
2001-05-24 19:22:35 +00:00
Bill Currie
55ee68cf38
whew
2001-05-24 19:19:32 +00:00
Bill Currie
d44901a8d6
oopsie
2001-05-24 19:18:51 +00:00
Bill Currie
05f9470b7c
oops, got a little too agressive with the V_CheckGamma cleanup
2001-05-24 18:50:02 +00:00
Bill Currie
f21ad90ba4
total nukage of brighten, brightness and contrast.
2001-05-24 16:30:25 +00:00
Bill Currie
a3518d44ed
Nuke V_CheckGamma, moving its sole contribution to VID_UpdateGamma in vid.c
2001-05-24 15:48:39 +00:00
Bill Currie
d87d374fcf
white space
2001-05-24 04:50:12 +00:00
Chris Ison
3cc3392a8a
fixed paused being displayed by default in gl
2001-05-23 10:20:27 +00:00
Bill Currie
1a25bc9349
gl_screen.c and screen.c are now client clean (and merged :)
2001-05-23 06:33:23 +00:00
Bill Currie
ec7335029d
gl_draw.c is now client clean.
2001-05-23 04:05:10 +00:00
Bill Currie
f49608b881
copy it to nq and clean out the commented out code
2001-05-23 03:33:39 +00:00
Bill Currie
a8e1da5d99
make dist and compile fixes for mingw cross building
2001-05-22 19:13:23 +00:00
Bill Currie
c500fd7479
make dist fixups
2001-05-22 17:09:03 +00:00
Joseph Carter
2b4c31b7ae
Noise reduction in draw vs gl_draw
2001-05-22 09:24:56 +00:00
Bill Currie
4a80639556
sw and gl rmisc are now client clean. the graphing functions ahve been pulled
...
out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and
{gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something
is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
Bill Currie
0a4b53c817
gl_rsurf is now client clean
2001-05-21 23:09:46 +00:00
Bill Currie
da8715f27d
sw_ralias.c and gl_rmain.c are now client clean. this involved a bit of a
...
revamp of skins. keep an eye out for broken skins (especially in nq)
2001-05-21 22:25:35 +00:00
Ragnvald Maartmann-Moe IV
ddceaf78b3
Merge most of cshift calcs from sw and gl to r_view.c
2001-05-21 19:53:57 +00:00
Ragnvald Maartmann-Moe IV
46b5ce2d09
Remove client.h from gl_sky_clip. Changed an error message to not use cl_name.
2001-05-21 15:59:02 +00:00
Ragnvald Maartmann-Moe IV
853dfceac6
Minor cleanups, not client.h or host.h clean yet, though.
2001-05-21 04:41:57 +00:00
Ragnvald Maartmann-Moe IV
4d09685df7
Remove client.h from sw_rsurf.c. Prepare gl_rsurf.c for same.
2001-05-21 03:39:41 +00:00
Ragnvald Maartmann-Moe IV
a9c9a46c37
client.h gone from gl_rlight.c and sw_rlight.c.
...
cl_lightstyle -> r_lightstyle
2001-05-21 03:08:07 +00:00
Bill Currie
ece576ed4b
reduce gl_rmain's dependency on cl*.h
2001-05-21 00:22:35 +00:00
Ragnvald Maartmann-Moe IV
1aef81e9ef
Minor makefile cleanups.
2001-05-20 23:30:16 +00:00
Ragnvald Maartmann-Moe IV
62eefb49af
Remove gl_cull cvar. Was enabled regardless of the setting of the cvar, in any case.
2001-05-20 22:02:44 +00:00
Ragnvald Maartmann-Moe IV
d9b509b885
nonintel stuff makes more sense in nonintel.c
2001-05-20 21:47:18 +00:00
Ragnvald Maartmann-Moe IV
ee8bdb0742
sw_rvars.c was just a little bit silly for a simple variable declaration.
2001-05-20 21:44:05 +00:00
Bill Currie
337430a113
sw_rmain.c is now client and chase clean.
2001-05-20 20:38:51 +00:00
Ragnvald Maartmann-Moe IV
3f816c0aa3
whitespace.
2001-05-20 18:07:39 +00:00
Ragnvald Maartmann-Moe IV
a07d05e054
whitenoise--
2001-05-20 16:29:41 +00:00
Bill Currie
44943e78de
better fix for the dlights problem (will prevent similar problems in the
...
future)
2001-05-20 06:23:46 +00:00
Bill Currie
88302bd5f0
fix the broken dlights. turns out realtime is not the right thing (cl.time is)
2001-05-20 06:13:20 +00:00
Bill Currie
d360b01827
move dlight stuff out of cl_* into r_main.c. nq dlights seem to be broken,
...
but that seems to have been from before this work
2001-05-20 05:42:52 +00:00
Ragnvald Maartmann-Moe IV
f7330f078e
Change meaning of gl_lightmap_components a bit. Setting 4 changed to reduce texture memory waste by a bit. Really only an optimization for nvidia drivers anyways. This also should fix a quality issue in 16bpp with it set to 4.
2001-05-20 04:36:20 +00:00
Bill Currie
cf2e098434
header order
2001-05-20 04:26:22 +00:00
Bill Currie
a41af75e56
cl.worldmodel is only remfereced once in the renderer (and that will be
...
going away shortly)
2001-05-20 04:25:36 +00:00
Bill Currie
daca64ed04
more cl*.h dependency cleanups realtime and cl.time are no longer reffed
2001-05-20 03:54:55 +00:00
Ragnvald Maartmann-Moe IV
844ed4a41e
tiny header cleanup.
2001-05-20 03:38:58 +00:00
Bill Currie
d1c2b0ec52
r_efrag.c no longer relies on cl*.h
2001-05-20 02:39:56 +00:00
Bill Currie
e0512e4af3
r_efrag.c is almost client.h free
2001-05-20 01:58:59 +00:00
Bill Currie
aa09f5ce7a
hopefully fix Despair's torches
2001-05-20 01:05:05 +00:00
Bill Currie
f834f99de7
diffsnr++
2001-05-20 00:34:40 +00:00
Bill Currie
916b52f24c
more diff S/N ratio improvements
2001-05-19 23:38:56 +00:00
Ragnvald Maartmann-Moe IV
2edaee8f5d
Whitespace.
2001-05-19 23:31:20 +00:00
Bill Currie
0d573c6fcf
rename Chase_Init to Chase_Init_Cvars and shift the call.
...
Call SCR_UpdateScreen at the end of Host_Init so you're not stuck with a
black screen during initial loading
2001-05-19 22:26:06 +00:00
Bill Currie
9698c19921
fix beams, grens, nails, etc
2001-05-19 21:09:48 +00:00
Ragnvald Maartmann-Moe IV
e9857d8213
Merges, and cl_writecfg now works in nq.
2001-05-19 20:57:29 +00:00
Ragnvald Maartmann-Moe IV
d55f9e4a4d
diff noise. blech.
2001-05-19 17:32:04 +00:00
Ragnvald Maartmann-Moe IV
0c7cc403b8
diff noise reduction.
2001-05-19 17:02:56 +00:00
Bill Currie
7f0d8ed7e0
correct the scale init and enable the qsg inits in cl_tent
2001-05-19 05:53:50 +00:00
Ragnvald Maartmann-Moe IV
9f124853e5
whitespace
2001-05-19 02:09:08 +00:00
Bill Currie
fef41a4e70
cl_main.c cl_parse.c:
...
entity_t baseline fixes
gl_ngraph.c:
make r_LineGraph non-static
2001-05-19 01:58:31 +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
378adbf8f6
diff noise reduction
2001-05-18 23:57:38 +00:00
Bill Currie
a771ef7b83
missed setting the viewent QSG stuff
2001-05-18 22:47:48 +00:00
Bill Currie
c7527ed664
merge in the QSG stuff (bringing gl_rmain closer)
2001-05-18 22:33:35 +00:00
Bill Currie
18e6b43168
diff noise reduction in render.h and its fallout
2001-05-18 22:07:10 +00:00
Bill Currie
1ea84a32bf
unused file
2001-05-18 21:23:25 +00:00
Bill Currie
5316476f9a
whitespace
2001-05-18 21:21:59 +00:00
Ragnvald Maartmann-Moe IV
6bb969b40c
diff noise reduction
2001-05-18 21:07:08 +00:00
Bill Currie
1c87b2ef94
more merging
2001-05-18 21:06:45 +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
788218d9d7
turned out just a copy was needed
2001-05-18 20:22:59 +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
Bill Currie
6ee0692e58
complete the merge of sw_rpart.c. this involved adding old_origin to entity_t
...
and setting it up correctly
2001-05-18 19:21:51 +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
eb95bcae84
move the gib language out of nq and into its own dir (hehe, libQFgib:)
2001-05-17 21:45:56 +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
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
Bill Currie
a344c9fbd2
lib link order fixing so stat libs work
2001-05-17 08:29:04 +00:00
Bill Currie
4a690f8723
fix nq's startup code re commandline vs config file (also make sure comands
...
aren't double executed)
2001-05-17 07:53:22 +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
0efc398423
diff noise cleanup
2001-05-16 06:04:38 +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
e2944a82c9
forgot to remove the debug info
2001-05-16 03:37:53 +00:00
Bill Currie
3461e3d106
get the gunshot effect back
2001-05-16 03:24:08 +00:00
Bill Currie
793a5ff084
run the correct particle effect for TE_GUNSHOT
2001-05-15 22:03:23 +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
8826182522
misc non-functional cleanups
2001-05-15 20:03:56 +00:00
Ragnvald Maartmann-Moe IV
63a4cc271f
whitespace
2001-05-15 19:25:33 +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
4206b93721
diff noise reduction
2001-05-15 19:00:53 +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
9c9e22f253
fix segfault when using -abyss etc
2001-05-15 06:35:47 +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
86d76ed39a
enable the mirror code. no idea how well it works
2001-05-14 20:49:18 +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
Bill Currie
59d033f3d4
fix the black alias models
2001-05-14 06:54:14 +00:00
Bill Currie
9064530d1d
diff noise reduction
2001-05-14 06:48:59 +00:00
Bill Currie
a2ac0b5c0e
forgot this
2001-05-14 06:48:11 +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
879a133c19
forward port the x11 repeat fix
2001-05-14 05:37:47 +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
Bill Currie
871db9606b
missed the init of gl_sky_divide
2001-05-13 04:20:09 +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
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
105d1ee7d9
well, that didn't last long, did it?
...
merge r_cvar.h
2001-05-11 19:33:17 +00:00
Ragnvald Maartmann-Moe IV
f8c15a1ed3
*poke*
2001-05-11 19:30:26 +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
8ce3fa5e8f
`merge' gl_refrag.c and sw_refrag.c into r_efrag.c like what was done in qw
2001-05-11 06:09:01 +00:00
Bill Currie
44317f299e
merge gl_mesh.c into libQFmodels
2001-05-11 05:59:17 +00:00
Bill Currie
d9874835ec
forgot to make sure Mod_Init_Cvars got called
2001-05-11 02:03:02 +00:00
Ragnvald Maartmann-Moe IV
28c809d27e
Alliteration Annoys Always
2001-05-11 01:01:27 +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
d03e28a034
correct the link order of the libs
2001-05-10 16:29:11 +00:00
Bill Currie
77eed96c91
don't need these any more
2001-05-10 15:30:23 +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
33e3f1209d
fix a bug that should have been fixed eons ago (and was in qw)
2001-05-09 22:08:06 +00:00
Bill Currie
a5b2b78013
missed a removal of fnmatch.c
2001-05-09 22:07:35 +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
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
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
601556701c
Whitespace, comment cleanups.
2001-05-09 17:12:49 +00:00
Bill Currie
226189cff7
whitespace
2001-05-09 06:57:35 +00:00
Bill Currie
e5c145c760
correct the mis-parsing of TE_GUNSHOT
2001-05-09 06:57:23 +00:00
Bill Currie
e96ab564af
fix the init issues that stopped nq working after Despair's heroic efforts
2001-05-09 06:15:14 +00:00
Bill Currie
f818392e26
cruft removal
2001-05-09 06:02:23 +00:00
Ragnvald Maartmann-Moe IV
ce3218bce5
Whitespace, comment out bloodpuffs, which aren't used in nq. Instead we get colored dot explosions. Whoopie.
2001-05-09 06:00:19 +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
22a1a0d5d3
remove R_CullBox as it is now in mathlib.[ch]
2001-05-08 20:52:12 +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
Bill Currie
1fbb62d518
hook in the plugin system
2001-04-25 00:20:23 +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
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
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
Ragnvald Maartmann-Moe IV
75df0b6440
Makefile cleanups.
2001-04-18 07:05:37 +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
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
Bill Currie
c59951b046
fix sw nq
2001-04-16 20:38:51 +00:00
Adam Olsen
311cbdbe59
Fix so building statically (--disable-shared) works.
2001-04-16 17:45:35 +00:00
Zephaniah E. Hull
61f369be94
Minor compile fixes.
2001-04-16 07:04:54 +00:00
Bill Currie
f9c9e4fba7
everything except *-3dfx (unknown status) now builds
2001-04-16 03:55:44 +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
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
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
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
734461092f
fix redef of APIENTRY
2001-04-11 21:02:56 +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
Bill Currie
334b528a40
forgot some bits
2001-04-10 20:11:50 +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
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
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
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
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
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
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
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
9438b77fdf
Removed old configure stuff, it's merged now
2001-02-20 22:58:46 +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
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
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
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
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