Commit graph

182 commits

Author SHA1 Message Date
Bill Currie
73d0b16350 Oh, so 44k1 DID sound like crap after all. However, I think that even the
tinny 44k1 sounded better than bassy 11025, but bassy 44k1 is even better :).
It's amazing what a difference interpolation schemes can make. Going from
uninterpolated (stretched samples) to linear interpolation improved things
dramaticly. I would still like to use cubic splines, but unless I'm mistaken,
that's O(N**2), not good for semi realtime (it sometimes takes long enough to
load a sample as it is).

Also, samples are now loaded as 16 bit unless loadas8bit is set.
2000-10-06 15:46:42 +00:00
Bill Currie
faa8926a70 add support for abyss. I had to guess at episode names and aopdm6 didn't have
a name specified in the map :(
2000-10-06 04:41:08 +00:00
Bill Currie
f588ab2151 gl context should be destoryed before X window 2000-10-06 02:48:25 +00:00
Bill Currie
4c9542817c remove the version printout and some ws cleanup 2000-10-05 02:39:48 +00:00
Dan Olson
3a1fb980f2 sane sdl includes, same commit as in newtree 2000-10-04 23:53:41 +00:00
Bill Currie
20854c0f2f Apply fps patch from Timothy C. McGrath that brings sw show_fps from newtree to
nuq.
2000-10-02 18:24:39 +00:00
Bill Currie
0808c65d17 copy CalcBlend from newtree 2000-10-02 17:26:39 +00:00
Bill Currie
f386c3f79c bring over Deek's palette shift removal from newtree. I think I got everything. 2000-10-02 16:13:12 +00:00
Bill Currie
582d2a1cba crosshair 2 is back in software! 2000-09-30 04:13:34 +00:00
Bill Currie
abbb0851f5 more sw compile fixes 2000-09-30 02:26:46 +00:00
Bill Currie
4bc80fbe67 more bogus glquake.h refs 2000-09-30 00:01:59 +00:00
Bill Currie
92d10c2bac hehe, thou shalt not include glquake in non-gl code :) 2000-09-29 20:02:17 +00:00
Bill Currie
baa3489074 %s/HAS_ZLIB/HAVE_ZLIB/g 2000-09-28 19:05:42 +00:00
Jeff Teunissen
899598f79a Status bat works perfectly, no glitches in software or GL that I have
found. Bang on it!
2000-09-28 18:25:24 +00:00
Eric Windisch
e94cc3030a This allows compilation with configure --disable-vidmode, normally considered a good thing (especially for my laptop where the vidmode doesn't work). 2000-09-27 23:30:36 +00:00
Bill Currie
f846917a38 some minor cleanups and a probably fix for gl alias models with more than 4
skin groups (blah, arbitryary limits)
2000-09-27 16:54:38 +00:00
Bill Currie
d339f14e64 error message audit 2000-09-27 16:22:28 +00:00
Bill Currie
ad7756a531 hopefully fix alias models with mutliple skins and/or skin groups 2000-09-27 16:20:00 +00:00
Bill Currie
464215e882 fix loading alias models with multiple skins and/or skin groups in software
mode.
2000-09-27 16:03:12 +00:00
Bill Currie
111791e0f6 cvar usage audit. value -> int_val where appropriate. tested with x11 glx and
svga.
2000-09-27 06:07:10 +00:00
Jeff Teunissen
2c1968e79e QW-style HUD support for NUQ. It defaults to off. Set cl_sbar 0 to turn
it on, set cl_hudswap to move it to the left side. I'll make the options
menu options for them work tomorrow.
2000-09-27 01:17:48 +00:00
Jeff Teunissen
495cf79c09 Backport joystick support from newtree. 2000-09-26 19:58:40 +00:00
Bill Currie
ad7c97b4fc once again works with latest alsa cvs 2000-09-26 18:50:00 +00:00
Bill Currie
1d91e86b4b found I had missed a few places to set int_val during the port to newtree 2000-09-26 03:16:16 +00:00
Bill Currie
8ed4ef45cb port David Jeffery's linux joystick port patch. it fires up ok, but I can't tell
how well it works as I don't seem to have js support compiled into my kernel :/
2000-09-26 03:02:18 +00:00
Bill Currie
459f7f3087 apply WildCode's portability helping patch 2000-09-26 01:59:16 +00:00
Jeff Teunissen
ad9168db1d "gamma"/v_gamma cvar gone. It wasn't useful in GL, and the brightness and
contrast cvars more than make up for its loss. Both are available from the
options menu now, and what's more, the contrast cvar works properly in GL,
unlike newtree where it seems to have a weird cutoff problem.
2000-09-24 14:15:06 +00:00
Bill Currie
50b5c7776e use more than one scrap. haven't needed this yet, but it doesn't hurt 2000-09-24 04:05:09 +00:00
Bill Currie
20ff12319a in_x11.c:
turn off autorepeat on startup
vid_x11.c:
	remove autorepeat controll. wrong place for it.
2000-09-24 03:08:28 +00:00
Bill Currie
a18c68fdad port over the alias skin group fixes from newtree 2000-09-24 02:37:44 +00:00
Bill Currie
cc8d0329d6 try to fix gl_flashblend 1 2000-09-23 02:13:47 +00:00
Bill Currie
10c6a3a42f quakeio.c now compiles with newer glibc versions (fpos_t changed)
vid_glx.c has some unsigned changes ported over from newtree
the rest have had fclose and fopen converted to Q*
2000-09-22 17:07:42 +00:00
Bill Currie
44e9299f29 missed this fopen->Qopen conversion 2000-09-22 15:32:58 +00:00
Forest Hale
fb028dcd6f optimized R_MarkLights (no longer checks sky/water, less recursion) 2000-09-22 04:58:49 +00:00
Bill Currie
7dc163eb61 sprintf -> snprintf 2000-09-21 16:23:51 +00:00
Bill Currie
ec896dce6f add desti's nodga patch with modifications to control the grabbing of kb and
mouse input
2000-09-21 16:23:27 +00:00
Jeff Teunissen
0e3df0b239 mmap should set PROT_READ|PROT_WRITE, not just PROT_WRITE. Takes care of a
problem with FreeBSD. Also, check for MAP_FAILED instead of
(unsigned char *)-1
2000-09-21 06:28:15 +00:00
Bill Currie
29635fb5d5 zlib support now works 2000-09-20 01:29:59 +00:00
Bill Currie
a8e188eb5c zlib now linked in. I'll test tonight at home 2000-09-19 23:01:46 +00:00
Bill Currie
9752037248 add the z flag to the appropriate Qopen/Qdopen calls 2000-09-19 22:42:52 +00:00
Bill Currie
279d332373 first steps to getting zlib support in 2000-09-19 22:32:45 +00:00
Bill Currie
dd3b346d4f add -game foo handling 2000-09-19 16:58:17 +00:00
Bill Currie
e0679ee1bf accept sound format paramtetsr and snd_alsa_0_6.c currently doesn't support
stereo for non-interleaved devices until I figure out how to get it to work.
Kind of hard when I don't have such a device :(
2000-09-19 04:53:53 +00:00
Bill Currie
d68561ccad clean up shm->samples setting 2000-09-18 18:50:09 +00:00
Bill Currie
1900df8da6 force color 255 to black and fix x11 handling when the display can't be had 2000-09-18 15:18:51 +00:00
Bill Currie
258cceffee ALSA 0.6 support added. old snd_alsa.c renamed to snd_alsa_0_5.c 2000-09-18 02:49:59 +00:00
Bill Currie
7605d9d17e hehe, player skins were totally borked for the last 3 weeks :/. They're now
fixed :)
2000-09-16 19:28:13 +00:00
Jeff Teunissen
18aa60183d *** empty log message *** 2000-09-16 09:45:52 +00:00
Bill Currie
d2708c4bc1 at last, fullbrights work fully :) 2000-09-16 09:22:42 +00:00
Bill Currie
5cf177294d forgot about multitexture for fullbrights 2000-09-16 08:50:12 +00:00
Bill Currie
7f785632c0 brush model fullbrights are now implemented and seem to be working. They can
be toggled using gl_fb_bmodels (default on).
2000-09-15 04:46:22 +00:00
Bill Currie
4b67ed54c4 preparations for giving bmodels fullbrights. Fullbright detection has been
moved from gl_model_alias.c to fl_model_fullbright.c and Mod_LoadMMNearest
has been renamed to Mod_ProcessTexture.
2000-09-14 06:42:07 +00:00
Bill Currie
60afa90414 getting closer to a linking nuq-ded 2000-09-12 20:12:29 +00:00
Bill Currie
ffada45133 the beginnings of support for nuq-ded have been added. Also, the begginings
of support for controlling which targets are built
2000-09-12 18:29:02 +00:00
Bill Currie
11a8d450c7 merge in bug fixes from HEAD into model_merge in preparation for merging the
other way.
2000-09-11 23:43:57 +00:00
Bill Currie
13e5ef92d3 sw no longer segs!:) I'm not 100% satisfied with how I attacked frame loading,
but I'll look into that later. I was getting tired of not having a running
program on this branch. Basicly, frames loading needs a little more study.
2000-09-11 23:17:55 +00:00
Bill Currie
2322b564b9 now builds with --disable-asmop. NOTE: d_copy.S is still used anyway (too lazy
to figure out how to do it in C)
2000-09-11 23:13:06 +00:00
Bill Currie
81400a6374 add .vimrc 2000-09-11 15:31:46 +00:00
Bill Currie
73162d8783 the model merge hack is almost complete. gl works but sw sefaults due to
the alias model verts, tris and frames not being loaded correctly.
2000-09-11 05:28:04 +00:00
Bill Currie
5bdd5c0ec4 default gl_lightmode to 0 which is more reasonable for normal quake 2000-09-10 01:51:11 +00:00
Bill Currie
4b393f7310 port over a sound init fix from oldtree that prevents a crash if sound doesn't
init properly
2000-09-07 17:34:46 +00:00
Bill Currie
ff69e3f2f3 brush model code has now been merged. common stuff in model_brush.c, gl and sw
specific stuff in gl_model_brush.c and sw_model_brush.c respectively.
2000-09-05 19:58:08 +00:00
Bill Currie
69706f997e sprite model code merge done. model_sprite.c is the common code while
gl_model_sprite.c and sw_model_sprite are just the gl/sw specific code
(Mod_LoadSpriteFrame).
2000-09-05 17:59:11 +00:00
Bill Currie
1ab1dd2683 bah, forgot to save this one :/ 2000-09-01 17:32:42 +00:00
Bill Currie
50bd641616 ok, the chopped up model files compile and sw seems to work just fine. Don't
know about gl yet (probably won't until either monday or tuesday; hence the
branch)
2000-09-01 17:07:28 +00:00
Bill Currie
c7d8fb3773 preliminary work on really cleaning up *model.c. atm, just split out the model
type specific code into the appropriate files (which will later be merged as
much as possible) and remove all model type specific code from model.c.
gl_model.c is no more as it ended up being an exact copy of model.c minus a
header include and a prototype, neither of which were needed.
2000-09-01 04:43:56 +00:00
Bill Currie
16101a8d0b add the maplist command 2000-09-01 04:35:05 +00:00
Zephaniah E. Hull
16614d8e71 -3dfx now compiles and works correctly.
Fixed a segfault case in starting.
2000-08-31 20:23:20 +00:00
Bill Currie
f698534b79 gl_part.c:
do the GL_BLEND thing for R_UpdateFires. Fires just don't look so
	good without it :/
model.c:
	correct some "spelling" mistakes.
2000-08-31 05:10:50 +00:00
Brian Koropoff
1ff9c694dd A fix to the argument parser. 2000-08-31 01:21:00 +00:00
Bill Currie
e1965a27b9 cvar.h cvar.c:
add int_val field to cvar_t. this should be used instead of value for
	boolean / integral values (no conversions done yet).
in_*.c:
	Add IN_HandlePause
vid_*.c:
	Add VID_HandlePause
context_x11.h vid_glx.c vid_x11.c context_x11.c:
	move some common code out of vid_*.c into context_x11.c. Also, disable
	the screen saver while nuq is running. NOTE: while vid_glx.c compiles,
	it has not been tested yes as glx crashes this machine :(
2000-08-30 22:45:44 +00:00
Bill Currie
775d9ebe54 wrong not sign :/ 2000-08-30 15:58:18 +00:00
Bill Currie
514fb7069e rename net_com.c to checksum.c and create checksum.h.
Also, preliminary steps to merging model.c and gl_model.c as much as possible
before splitting them into functional chunks.
2000-08-30 06:56:25 +00:00
Brian Koropoff
c1ac5ca92a This update adds a proper instruction and subroutine stack and a better parser. 2000-08-30 06:07:02 +00:00
Bill Currie
60c112bc68 configure.in:
print config info for sound type
source/quakefs.c:
	fix fs_userpath handling for other game types and add support for
	abyss
source/qargs.c:
	add -abyss checking
include/qdefs.h:
	add abyss support

Rudimentary support for the abyss mission pack has been added. Currently this
involves just the addition of -abyss to the supported command line options
(acts just like -rogue and -hipnotic) and adding abyss to the list of game
directories. Any other support that's needed (as with other rogue and hipnotic
modifications) has not been added as it is not known what's needed.
2000-08-29 20:30:28 +00:00
Bill Currie
89f7306091 turns out GL_WaterSurface wasn't binding the texture wasn't binding the
surface taxter. very ugly
2000-08-29 05:22:58 +00:00
Bill Currie
23b70fee0f fixes for no optimisation 2000-08-29 04:33:15 +00:00
Bill Currie
8ccc616134 various make dist related cleanups 2000-08-29 00:10:19 +00:00
Bill Currie
8cb963858f source/vid_svgalib.c source/in_svgalib.c:
"accidently" port over newtree's svga stuff (I copied the wrong file
	then cleaned up the resulting mess:)
Makefile.am include/Makefile.am doc/Makefile.am source/Makefile.am:
	fix things up so doc no longer causes make to barf and makd dist works
source/dirent.c source/fnmatch.c source/in_svgalib.c source/vid_3dfxsvga.c
source/vid_mgl.c source/vid_wgl.c:
	needed for make dist. No, nuq-3dfx does not get created (I don't have
	the libs or card)
2000-08-28 22:38:46 +00:00
Brian Koropoff
58ef964ae2 GIB has completed its de-evolution into a cheap ripoff of bash, thus determining the meaning of its own acronym: GIB Isn't Bash 2000-08-28 20:49:01 +00:00
Bill Currie
490409a57b Well, that's sgl going. It seems to have some issuesi. Gun and sbar were white,
and it crashed my box on exit, but that's most likey the X server (i810, glx
does the same).
2000-08-28 20:21:28 +00:00
Bill Currie
aa61894cd6 Makefile.am:
don't moan about ChangeLog
configure.in:
	enable sld
vid.h:
	prototype VID_SetCaption
vid_sdl.c:
	snarf from newtree
2000-08-28 20:08:34 +00:00
Bill Currie
a6b179571f com.c:
fix endian detection
quakefs.c:
	don't create the gamedir if userpath is .
2000-08-28 16:14:42 +00:00
Bill Currie
39920968d8 quakeNN.{tga,pcx} -> nuqNNN.{tga,pcx}
another external mention of quake goes away and also gives us 1000 screenshots
instead of 100
2000-08-28 02:53:06 +00:00
Bill Currie
76e84b6995 support rogue and hypnotic 2000-08-28 02:29:43 +00:00
Bill Currie
53ddca7a8e an even better fix (thanks, LordHavoc) 2000-08-28 02:03:55 +00:00
Forest Hale
64b7080691 Changed model light clamping. 2000-08-28 01:47:41 +00:00
Bill Currie
2b76b57a0b fix this bug:) for (i...) { for (i...) }
dumb, dumb, dumb
2000-08-28 01:46:37 +00:00
Bill Currie
63f498fdeb fix a typo 2000-08-28 01:41:17 +00:00
Forest Hale
d1cecd1018 fb model fixups, optimizations, spaced indents fixed, minor cleanup 2000-08-28 01:38:16 +00:00
Bill Currie
bf1a322439 it helps if dlights aren't black :/ 2000-08-28 01:08:07 +00:00
Brian Koropoff
a4a7abb902 Adds GIB, an experimental scripting language for QF, and a few compile fixes. 2000-08-28 00:45:40 +00:00
Bill Currie
86a0a6aa3e bring over gl_screen (sort of). world is now much brighter, but dlights and
weapon models still aren't working properly
2000-08-27 22:13:48 +00:00
Bill Currie
ab1ac381ea add outb for when optimisations are turned off 2000-08-27 22:03:46 +00:00
Bill Currie
738cd437b5 remove GLQUAKE and IDGODS #ifdefs 2000-08-27 16:53:07 +00:00
Bill Currie
8659864267 slight optimisation (thanks, LordHavoc) 2000-08-27 11:05:08 +00:00
Bill Currie
737925f295 sprintf -> snprintf
bash and sed rule! :)
2000-08-27 10:30:17 +00:00
Bill Currie
8302413276 that's most of newtree's gl stuff ported over. Three bugs: wound up with
newtree's slow skys, some models are not getting lit, and dlights don't seem
to be working :(
2000-08-27 10:03:31 +00:00
Bill Currie
8538ec49d1 bring over gl_rlight from newtree
sys_unix.c:
	remove #ifdef GLQUAKE
2000-08-27 07:46:54 +00:00
Bill Currie
10a7fbb00a port over the interesting bits of gl_model.c from newtree 2000-08-27 06:55:07 +00:00