Commit graph

189 commits

Author SHA1 Message Date
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
Bill Currie
d4d2afe26f import gl_mesh.c from newtree 2000-08-26 21:30:05 +00:00
Bill Currie
103918c7a4 port over gl_draw.c from newtree 2000-08-26 21:23:07 +00:00
Bill Currie
c1e78e5021 don't need this 2000-08-26 19:17:37 +00:00
Bill Currie
85dc32f2b6 nuq.conf is now read and +set foo on the command line is supported 2000-08-26 06:13:07 +00:00
Bill Currie
1ddf60ea24 finally, nuq-glx works. Still needs lots of work, but getting there :) 2000-08-26 05:48:38 +00:00
Bill Currie
438a2bbcd2 getting closer to nuq-glx. just some linking issues 2000-08-25 07:18:23 +00:00
Bill Currie
e2efff9dde nuq-glx almost builds. just some last problems with gl_part.c and gl_view.c 2000-08-25 06:42:29 +00:00
Bill Currie
d6d6aff0aa remove all references to qw (nuq is not quakeworld :) 2000-08-25 01:34:11 +00:00
Bill Currie
ed64e1a0a2 makes more sense to have this in tools 2000-08-25 01:30:09 +00:00
Jeff Teunissen
cfb568ef0f Added preliminary indent profile, for automatically applying (again,
preliminary) QF code style to source.
2000-08-23 20:28:00 +00:00
Bill Currie
41fc6fb942 nuq-svga and nuq-x11 now run again. 2000-08-23 06:03:57 +00:00
Bill Currie
6f396a55ea nuq-x11 now compiles and links 2000-08-23 05:56:33 +00:00
Bill Currie
7b52e8b908 nuq-svga now links 2000-08-23 05:53:17 +00:00
Bill Currie
9f8660c30e header revamp almost done. it now tries (but fails) to link 2000-08-23 04:45:16 +00:00
Bill Currie
7147e89b21 more header work. getting there, but still no compile 2000-08-22 06:28:42 +00:00
Bill Currie
7f5868530f more header fixups. still doesn't compile 2000-08-21 05:39:54 +00:00
Bill Currie
2718705414 prelim header changes. doesn't build yet 2000-08-21 03:52:28 +00:00
Bill Currie
0a132a2933 gotta put it somewhere safe :) 2000-08-21 01:04:24 +00:00
Bill Currie
b39fa5ac8a New cvar system. -svga and -x11 still compile, link and run!! :) 2000-08-21 00:54:21 +00:00
Bill Currie
a6415d5601 enable -Werror and clean up the resulting mess 2000-08-20 06:23:17 +00:00
Bill Currie
5745025a85 still more uquake->nuq 2000-08-20 05:55:02 +00:00
Bill Currie
16d7581fc6 source/Makefile.am:
rename bins from uquake-* to nuq-*
configure.in:
	rename uquake.conf to quakeforge.conf (undecided about this one)
2000-08-20 05:38:30 +00:00
Bill Currie
1c362eca61 copyright header stuff 2000-08-20 05:25:28 +00:00
Bill Currie
737d401095 remove duplicate config.h inclusions 2000-08-20 04:58:49 +00:00
Bill Currie
3c09f92653 shiver me timbers, uquake-x11 works!!!!!!
include/.gitignore:
	ignore stamp-h
include/stamp-h:
	shouldn't be in cvs
source/Makefile.am:
	comment out the `if ASM_ARCH' and corresponding endif as there seems
	to be either a bug or a misunderstanding in automake snd_mixa.o is
	now built
2000-08-20 04:18:37 +00:00
Bill Currie
111c1b0d4c un-dosify 2000-08-20 01:33:10 +00:00
Bill Currie
4047bd947f include config.h
convert #if USE_INTEL_ASM to #ifdef USE_INTEL_ASM
add cl_math.S to math_ASM

unfortunatly, snd_mixa.o isn't being built. Haven't figured that one out yet
2000-08-20 00:38:32 +00:00
Bill Currie
a4856e8b01 rename dosasm.s to dosasm.S for eventual djgpp support 2000-08-19 23:39:50 +00:00
Bill Currie
0d49ca5edb even if this was a pool, we don't want any wee in it :) 2000-08-19 23:27:11 +00:00
Bill Currie
935dd92fd4 tell cvs to ignore config.h and win32/version.h (under include)
add alsa support (swiped from newtree:)

+= doesn't seem to work well in automake (or at least not my version). Change
the common_SOURCES += ... to combined_SOURCES = $(common_SOURCES) ... and
change the /following/ instances common_SOURCES to combined_SOURCES.
2000-08-19 23:15:48 +00:00
Jeff Teunissen
6f948a56db Add some .gitignore files 2000-08-19 22:50:02 +00:00
Jeff Teunissen
9d334e8b22 Initial revision 2000-08-19 22:24:16 +00:00