Commit graph

414 commits

Author SHA1 Message Date
Dabb
54fecba24b Reverse my goofup - I need coffee!-) 2000-06-04 09:40:06 +00:00
Dabb
2508ef4264 Added extern to gammatable. Table is "stored" in r_view.c 2000-06-04 09:30:49 +00:00
Dabb
59f1871a16 Someone forgot to define some ints...fixed. 2000-06-04 09:18:48 +00:00
Joseph Carter
77d084e425 missed this before 2000-06-04 01:12:07 +00:00
Joseph Carter
accc15a82e non-skybox skies were overbrighting, fixed 2000-06-03 22:47:05 +00:00
Joseph Carter
19afb34084 This adds multitexture for win32 back into the game. 2000-06-03 22:32:53 +00:00
Joseph Carter
8d08bc4d86 This is a NON-TRIVIAL update which took LordHavoc and I about 3 days to
make work properly:

Win32 thing..  If you don't free textures explicitly, you can cause a
problem with nVidia drivers.

Colored lighting is now RGB instead of RGBA.  The alpha is kinda pointless
on a lightmap and the effect's not all that great.  Plus people stuck with
16 bit OpenGL (any other 3dfx people out there?) will be quite pleased
with the improvement in image quality.  This does include LordHavoc's
dynamic light optimization code which takes most of the pain out of having
gl_flashblend off.

All glColor*'s are now half of what they used to be, except where they
aren't.  If that doesn't make sense, don't worry.  If you see one that's
only half what you'd expect, don't worry---it probably is meant to be like
that..  (More below)

glDisable (GL_BLEND) is now a thing of the GL_PAST.  As is GL_REPLACE.
Instead, we _always_ use GL_MODULATE and leave GL_BLEND turned on.  This
seems at first like it might be a performance hit, but I swear it's much
more expensive to change blending modes and texture functions 20-30 times
every screen frame!

Win32 issue..  Even though we check for multitexture, we currently don't
use it.  Reason is that I am planning to replace SGIS_multitexture with
the preferred ARB_multitexture extension which is supported in most GL 1.1
implementations and is a requirement for GL 1.2 anyway.  I also wanted to
get rid of some duplicated code.  Since Linux doesn't support multitexture
yet, I just commented out the code keeping me from compiling to get it to
work.  Win32 should work without it until it's fixed, which shouldn't be
long since the differences between SGIS and ARB multitextures as far as
Quake is concerned is minimal AT BEST.

LordHavoc and I have been working tirelessly (well not quite, we both did
manage to sleep sometime during this ordeal) to fix the lighting in the GL
renderers!  It looks DAMNED CLOSE to software's lighting now, including
the ability to overbright a color.  You've gotta see this to know what I'm
talking about.  That's why the glColor*'s are halved in most places.  The
gamma table code and the general way it works is LordHavoc's design, but
over the course of re-implementing it in QF we did come up with a few more
small optimizations.


A lot of people have noticed that QF's fps count has gone to shit lately.
No promises that this undid whatever the problem was.  That means there
could be a huge optimization lurking somewhere in the shadows, waiting for
us to fix it for a massive FPS boost.  Even if there's not, the code in
this commit DOUBLED MY FPS COUNT.  Granted I was getting pathetic FPS as
it was (around 30, which is pathetic even for a Voodoo3 in Linux) but
still---60 is a big improvement over 30!

Please be sure to "test" this code thuroughly.
2000-06-03 19:56:09 +00:00
Joseph Carter
76d586a081 a little debugging code for the intermission weirdness 2000-06-03 18:56:52 +00:00
Joseph Carter
d3a9357080 Remember to ./bootstrap with this update - doesn't seem to happen for you
when you compile..

model.c has been stuffed wholesale into gl_model.c..  It's also no longer
common source.  Now it's a server and software thing.  This is needed so
GL model/map code can do things that software loading can't and server
loading shouldn't.
2000-06-03 12:15:49 +00:00
Loring Holden
63dccb8968 in_x11.c - always define in_dgamouse, so it can be false when there is no DGA
quakefs.c - include strings.h for strcasecmp() under AIX
2000-06-01 03:37:48 +00:00
Marcus Sundberg
77c92b8334 Added MME sound support. 2000-05-31 22:51:11 +00:00
Marcus Sundberg
4565fd57c7 Fix compilation without DGA. 2000-05-31 22:50:40 +00:00
Marcus Sundberg
ab2e606eb6 Need <string.h> here. 2000-05-31 22:49:53 +00:00
Marcus Sundberg
5555a5339f 64-bit fix 2000-05-31 22:49:17 +00:00
Joseph Carter
73bdee6f6f erf, not ready for that yet, that's why it was commented 2000-05-31 18:29:34 +00:00
Joseph Carter
0f9bcaf22f -gamma for Linux! No you can't control it from the menu, it has to be
done on the cmdline at the moment.  Menu support later if possible.
2000-05-31 17:46:59 +00:00
Dan Olson
de18dc1c84 Added maplist command. The function was in, but it was never registered. 2000-05-31 14:16:08 +00:00
Joseph Carter
38daae8b5a Seems to fix the DGA issue. Mouse cursor doesn't get hidden if we're in
DGA because the way we hide it doesn't mesh with Mesa+Glide.  There's a
way to do it properly, but it's more trouble than it's worth for now.
2000-05-29 13:42:33 +00:00
Joseph Carter
efb2d99e22 some oldtree cruft for rogue/hipnotic removed (we'll support them in a
very different way than did Id Software did later on, it'll be a major
improvement, that's for sure..)

fs_basegame Cvar created, defaults to whatever you selected in config.h,
most likely id1.
2000-05-29 12:45:05 +00:00
Joseph Carter
91e380d3b3 New cvars (oldtree console effects)
gl_conalpha - 0.6, 1 to disable alpha
	gl_conspin - 0, anything else causes it to spin at that speed
	gl_constretch - 0, 1 to stretch console instead of sliding it
2000-05-29 10:16:04 +00:00
Joseph Carter
c3649a242a I feel stupid now, typo fixed 2000-05-28 11:09:59 +00:00
Jeff Teunissen
b3a542bb15 Fix typo in configure.in, add cd_audio.c to EXTRA_* for DOS. 2000-05-28 01:44:31 +00:00
Joseph Carter
ef1c6be3df New Cvar function: Cvar_SetFlags. Yes, it's there for completeness.
Some minor changes to DGA code I couldn't be bothered to back out before
I committed.  They don't hurt anything, but they don't really improve
matters much either.  The mouse cursor still doesn't get warped off the
screen, but it's no longer bright blue - now it's black and white like
normal.  I'm rewriting the damned DGA code from scratch to Get It Right
this time.
2000-05-27 16:40:36 +00:00
Jeff Teunissen
2d0932e00e Configuration stuff. include/win32/version.h is now Autoconfiscated (but
still has to be in CVS, because Win32 people generally won't be able to
rebuild it).

configure.in: Cleanups to the DGA, VidMode, and sound detection code.
Makefile.am: Cleanups to sound code, to allow 'make dist' to work.
2000-05-27 04:19:24 +00:00
Dan Olson
8973cc4dd3 borked GPL header. 2000-05-26 17:19:16 +00:00
Joseph Carter
81fd7c2277 DGA seems to work... Something done recently by someone (loring or bill)
caused Voodoo3 users to get a black mouse cursor that kept getting warped
to the center of the screen..  It was rather ugly and hard to play.  So
I added DGA.  That made the mouse cursor blue and stay where it was.  So
I moved the XGrabPointer to after the XWarpPointer, problem seems to be
fixed.  I hope this works for someone other than me.  =p
2000-05-26 12:32:45 +00:00
Joseph Carter
beb6472cd5 Sorry about that, unused vars commented out 2000-05-26 04:19:46 +00:00
Loring Holden
5b094c2aa1 Reapply changes - this time tested w/ svga under Linux 2000-05-26 03:55:27 +00:00
Joseph Carter
c9d579b1b5 if (0) is evil. If you're going to comment it out, comment it out or use
something like #if 0!
2000-05-26 03:40:22 +00:00
Bill Currie
0bd4043ca4 revert lsh's checkins. They broke newtree for everybody but him. 2000-05-25 09:48:21 +00:00
Loring Holden
8005c0d25e I got this tree to build under Solaris, AIX, IRIX, & Linux.
In order to do so I:
* included strings.h and string.h in many files so various functions would be
defined
* Fixed model_t collision problem in cl_main.c (Solaris)
* com.c - corrected WORDS_BIGENDIAN spelling
* gl_draw.c - Use HAVE_GL_COLOR_INDEX8_EXT to avoid referencing
GL_COLOR_INDEX8_EXT when it isn't available
* net_udp.c - use socklen_t to appease AIX
2000-05-25 06:14:56 +00:00
Bill Currie
0ad3e80422 move the non configure defines to after ifdef USE_INTEL_ASM for non as/ non intel systems 2000-05-25 06:14:47 +00:00
Bill Currie
43b5a87fbd some fixes to make quakeforge build on solaris. not quite done yet as the
server doesn't get linked with the network libs yet.

.gitignore: add quakeforge-*.tar.gz (I'm tired of seeing that with ? :)
include/Makefile.am: forgot to add the new x11 related headers
source/makefile.am: move snd_dma.c from cient sources to snd lib and add
	snd_null.c
source/cl_sys_unix.c: replace FNDELAY with O_NONBLOCK
2000-05-25 05:01:20 +00:00
Joseph Carter
08ae0f5305 New cvar: gl_colorlights, default 1 for GL_RBGA lightmaps, set to 0 for
GL_LUMINANCE lightmaps.  This is a CVAR_ROM.
2000-05-25 04:16:41 +00:00
Brian Koropoff
ab1aadfe64 Segfault fixed. Yes, I know I'm stupid ;P 2000-05-25 03:57:25 +00:00
Dan Olson
af98ae5fa5 Rename all Server_List_* to SL_* as well as some code cleanup. Does not fix
segfault
2000-05-25 01:38:52 +00:00
Joseph Carter
82c68a482b Explosions are temporarily PURPLE, deal with it.
Made dlight colors RGB as opposed to RGBA, the alpha doesn't make a whole
lot of sense.
2000-05-24 23:55:43 +00:00
Jeff Teunissen
eb38ab097c configure.in: clean up final configuration report.
cl_main.c, cl_slist.c: Make server listing expand ~
2000-05-24 22:36:59 +00:00
Jeff Teunissen
dc42c03c5b The proper solution to fs_sharepath and fs_userpath. 2000-05-24 20:03:49 +00:00
Thad Ward
b5e36c7149 commit changes for dabb, since he's having trouble with sourceforge:
win32 requires a call to setmode(), since it doesn't seem to do the mode change in fdopen properly.
also removed some "z" modes, since someone forgot to when removing the Qfile stuffs
2000-05-24 19:19:08 +00:00
Anton E. Gavrilov
4acb725dec Remove all remaining references to cachedir. 2000-05-24 10:44:29 +00:00
Joseph Carter
43e49ccd73 Skyboxes are now rendered always behind everything else. 2000-05-24 09:42:28 +00:00
Bill Currie
1cee02c55c avoid mutually exclusive options causing long Makefile.in lines:
simplify the logic
2000-05-24 07:29:16 +00:00
Bill Currie
b1da890046 alsa sound support is alive and kicking 2000-05-24 06:52:19 +00:00
Joseph Carter
28d0df55d3 fs_userpath is now . like it SHOULD be. Why? Because despite the unix
way of doing things, every single person who has tried newtree reports it
as "broken" because it can't find their pak files.

Least surprise.
2000-05-24 05:47:58 +00:00
Bill Currie
c8182eb2fd fixe the "failed to load sky 1" message 2000-05-24 05:12:54 +00:00
Bill Currie
1d4f3155b8 fix a core dump on premature exit 2000-05-24 04:45:35 +00:00
Jeff Teunissen
a45cefb3e0 Cvar fixups... 2000-05-24 02:07:53 +00:00
Bill Currie
e98edd5f5f revert back to using f* for file io. I hope this fixes the catapult, but I wouldn't be suprised if it doesn't. 2000-05-23 22:43:36 +00:00
Bill Currie
b26d6672ae fix what the previous checkin broke:) thanks for the suggestion, Deek. 2000-05-23 21:37:55 +00:00
Bill Currie
92009aae22 bah, turns out COM_CreatePath was designed that way. my bad :/ 2000-05-23 21:29:47 +00:00
Jeff Teunissen
fd11d81788 GL fixes, partial Q{open,close,read,write,getc} -> f* 2000-05-23 17:05:34 +00:00
Jeff Teunissen
db453a4b15 Cvar fixes. 2000-05-23 17:01:12 +00:00
Jeff Teunissen
347289ec56 Menu fixes: use Cvar_SetValue() for menu options. 2000-05-23 16:59:25 +00:00
Jeff Teunissen
7bbb9963cc s/HAS_/HAVE_/g 2000-05-23 16:57:12 +00:00
Bill Currie
fd35f176ba re-enable autoexec.cfg running on gamedir (defaults to off. need to put set cl_autexec either in quakeforge.conf or on the command line) 2000-05-23 11:29:15 +00:00
Bill Currie
d7f0ffef60 forgot to rename some SendKeyEvents functions 2000-05-23 09:52:17 +00:00
Bill Currie
d14e18e42f remove the aliasing of _windowed_mouse as in_grab isn't used as a name in this tree 2000-05-23 09:15:51 +00:00
Bill Currie
d30edea236 CVAR_ROM now works
provide Cvar_SetROM to get past it. if this proves unnecessary, nuke it :)
provide setrom command: sets the CVAR_ROM flag on a cvar
2000-05-23 08:33:30 +00:00
Bill Currie
290c2f9c0f +set_vidfullscreen is 95% working for -x11 and -glx. only remaining known problem is mouse grabbing. 2000-05-23 07:33:03 +00:00
Jeff Teunissen
7df8031c9c menu.c: change "help" to "menu_help" to get rid of error on startup.
Add cvs2cl to repository.
2000-05-23 07:29:02 +00:00
Bill Currie
3951d1fe4c bring across the VID and IN modules for svga, x11 and glx from OT. 2000-05-23 06:36:33 +00:00
Bill Currie
8ff75f94dc fix some problems with directories being created in the wrong places or not at all (caused by fs_userpath not being used when it should) 2000-05-23 01:44:20 +00:00
Bill Currie
91a47e083c remove redundant gamedir stuff 2000-05-22 23:43:52 +00:00
Joseph Carter
cb04fd6496 fix the +gamedir problem and fix my QFile removal 2000-05-22 21:32:14 +00:00
Joseph Carter
3d59dfed98 Before I can fix the (MANY!) problems with newtree, I have to fix the
little problem of mixed QFile and FILE.  Since we're not using ZLib in
this tree, QFile makes no real sense.  That didn't fix the real problem
I am having though.
2000-05-22 21:16:22 +00:00
Anton E. Gavrilov
f29bc45b50 Here it is. No more lockups :) Please don't kill me 2000-05-22 13:29:20 +00:00
Bill Currie
2d640a28ff forgot to bring these fixes over from OT 2000-05-22 12:43:20 +00:00
Jeff Teunissen
eecba96fe3 Change version number back to 0.1.99pre2 for public test cycle, fix bug in
-ggi
2000-05-22 12:10:10 +00:00
Anton E. Gavrilov
a73a779486 Console editing stuff 2000-05-22 09:24:07 +00:00
Bill Currie
3b1fad05a4 fix a compile error 2000-05-22 08:32:51 +00:00
Anton E. Gavrilov
c3cc61bb94 Added K_CAPSLOCK and KP_* keys support for windows targets 2000-05-22 07:59:30 +00:00
Joseph Carter
33a60edde1 oops 2000-05-22 07:49:33 +00:00
Joseph Carter
e9463e2db9 pretty much finishes source/* 2000-05-22 07:46:47 +00:00
Jeff Teunissen
adcb479d77 Makefile updates for win32 targets 2000-05-22 07:32:00 +00:00
Anton E. Gavrilov
778b77c394 CL_ClearStates now generates key up event for each key that is down.
CVAR_FIXME cleanup.
2000-05-22 07:20:00 +00:00
Joseph Carter
fa7a4882ac *sigh* 2000-05-22 07:10:16 +00:00
Thad Ward
1cb980a02e removed a silly #else case on an ifdef 2000-05-22 07:07:01 +00:00
Anton E. Gavrilov
c6abe56fd1 Client jump prediction fix;
CVAR_FIXME cleanup.
2000-05-22 07:03:41 +00:00
Joseph Carter
87f6b96eb6 GPL thingy 2000-05-22 06:58:14 +00:00
Joseph Carter
7b1b82a16b C done 2000-05-22 06:46:35 +00:00
Jeff Teunissen
aeca63df3c win32 fixes. 2000-05-22 06:37:26 +00:00
Thad Ward
baa3a9e1d6 removed gl_test.c from the client vc project... 2000-05-22 06:36:33 +00:00
Jeff Teunissen
89cdc06e0e Updated checklist, configure.in (0.2.0), cvar.c 2000-05-22 05:51:05 +00:00
Bill Currie
ea1386f190 fixes for __attribute__((format)) (I'll commit that /after/ release) and freelook 2000-05-22 05:47:14 +00:00
Anton E. Gavrilov
aec65c68a2 Execution of autoexec.cfg on gamedir change is temporarily disabled 2000-05-22 05:00:44 +00:00
Anton E. Gavrilov
a454cf411f Add prediction for current player's effects 2000-05-22 04:54:06 +00:00
Anton E. Gavrilov
4167d8913c Replace "WinQuake" window header with PROGRAM (---> "QuakeForge") 2000-05-22 04:43:32 +00:00
Anton E. Gavrilov
f8604f0735 sys_sleep is 8 by default now;
CVAR_FIXME cleanup
2000-05-22 04:19:49 +00:00
Jeff Teunissen
9ffa5f9e1d Make gas shut up about indirect jumps without * 2000-05-22 03:41:14 +00:00
Jeff Teunissen
ad03ff24de gl_vidlinux: DIE DIE DIE!
cvar.c: use va() for Cvar_SetValue
r_view.c: cvar cleanups
sirf8.S: whitespace
2000-05-22 03:27:00 +00:00
Anton E. Gavrilov
a955b34f46 freelook cvar support 2000-05-22 03:15:30 +00:00
Anton E. Gavrilov
2b42f07798 quakefs.h now defines fs_userpath and fs_sharepath 2000-05-22 01:37:19 +00:00
Anton E. Gavrilov
bc37d46f5b Add #include "draw.h";
CVAR_FIXME cleanup.
2000-05-22 01:05:57 +00:00
Anton E. Gavrilov
a7c238d27c Project files update due to common.c split 2000-05-22 00:52:13 +00:00
Anton E. Gavrilov
f070fecc94 Include string.h/strings.h to avoid memcpy() warning 2000-05-21 23:07:22 +00:00
Jeff Teunissen
d5f18435ec Misc. fixes. bound() is now defined, make dist works properly it seems,
missed a basepath/userpath, and fixed up the menu.
2000-05-21 23:01:36 +00:00
Bill Currie
cc5e8e2b59 build.[ch] -> buildnum.[ch] related fixes 2000-05-21 22:39:28 +00:00
Anton E. Gavrilov
0f656e5f44 build.c is buildnum.c now 2000-05-21 22:13:01 +00:00
Anton E. Gavrilov
e9551b80d8 build.c must die. build_number counts from 22.12.99 now 2000-05-21 22:07:02 +00:00