Joseph Carter
b9797600ff
A few unnecessary ifdef's killed
2000-03-06 17:53:17 +00:00
Anton E. Gavrilov
46de54d92d
No one objected, so I changed case '0' ... case '7' in common.c to case '0': case '1': case
...
2' and so on. Now it compiles with MSVC.
2000-03-06 16:04:35 +00:00
Joseph Carter
5bfd333ae6
DEATH TO cl.items!
2000-03-06 14:28:53 +00:00
Anton E. Gavrilov
e8e7a41627
Fixed some typos
2000-03-06 14:16:18 +00:00
Joseph Carter
085f2712e9
code cleanups, no functionability changed herein.
2000-03-06 13:58:35 +00:00
Zephaniah E. Hull
39e01df55e
Makefile overhaul!
...
If I broke something, yell at me, /AFTER/ I've had some sleep..
2000-03-06 13:26:42 +00:00
Joseph Carter
43e95bac41
Buttons 4 and 5 may now be bound in -x11 and -glx targets. They generate
...
the K_MWHEELUP and K_MWHEELDOWN events.
2000-03-06 10:55:14 +00:00
Joseph Carter
56fd8d964a
new cvar: gl_conalpha, defaults to 0.6, guess what it does?
...
Speaking of conalpha, it works again, even in Mesa 3.1(!)
Don't build half of qw-client twice! I thought I fixed that already?
UQuake-style quit dialogs in qw-client, beginnings of a menu.[ch] merge
2000-03-05 15:48:23 +00:00
Joseph Carter
3f6a8ade82
Turns out Endy and I made the same mistake! heh He fixed it.
2000-03-05 13:02:06 +00:00
Joseph Carter
d541b20f5e
Now you can change mods in GL safely! Endy sent me a fix for it just
...
about 5 seconds after I figured out how to fix it, so I can't take full
credit for this. =>
2000-03-05 12:55:16 +00:00
Bill Currie
05cd97a097
merge qw_common/screen.h and uquake/screen.h into common/screen.h
2000-03-05 11:45:00 +00:00
Bill Currie
0efddfca3b
configure.in:
...
make DGA off by default
merge qw_client/screen.c and uquake/screen.c into common/screen.c
2000-03-05 11:28:25 +00:00
Bill Currie
b2b6b999ae
disable DGA until the code can be reworked correctly. uquake-x11 no longer segs
...
X!
2000-03-05 08:41:26 +00:00
Zephaniah E. Hull
bdac743c66
Fixed a cvar related segfault..
2000-03-05 00:56:25 +00:00
Dan Olson
d5e09cf5ef
Added support to bind capslock,thanks to Tonik. I think I got all the targets.
2000-03-04 22:41:19 +00:00
Zephaniah E. Hull
41c969c2ac
LoadPCX has been rewritten and now functions!!
2000-03-04 20:32:38 +00:00
Joseph Carter
27825ed5fe
another try at it..
2000-03-04 17:11:52 +00:00
Joseph Carter
8678d1bb58
forgot these
2000-03-04 16:57:34 +00:00
Joseph Carter
75001e947c
I think this works, but maybe not.. skins will be very broken if I didn't
...
but I'll undo this mess if that happens.
2000-03-04 16:43:53 +00:00
Joseph Carter
76c3e731c1
gl_conspin (note NOT r_conspin as my original commit of this useless
...
feature said) can now be set to something other than 0 or 1. It now
controls the speed at which the console rotates. Set it to 0 and it
won't rotate at all. 1 is as fast as it was before, .5 is half as
fast, 100 is insane, etc.
2000-03-04 10:49:34 +00:00
Joseph Carter
6dc6e13b3c
Renamed gl_warp_sin.h to .-c
2000-03-04 10:22:27 +00:00
Bill Currie
fdfa130c9b
change strncat to strcat. I keep forgetting that the n limits the number of
...
chars catted, not the length of the destination string.
2000-03-04 06:47:48 +00:00
Eric Windisch
8b55f440df
A few fixes to my previous patches. Including the small compile-breaker that I accidently threw in by putting an important global variable in a rarely used define (generations).
2000-03-04 02:39:12 +00:00
Eric Windisch
45ccae6ba7
Made fixes to quakefs.c, unzip.c, and unzip.h; compiles for me, and should for you too. Unzip.c was surprisingly broken; quakefs.c was mildy broken but now fixed (GENERATIONS code). Also an "interface" change, no longer searches for .pk3 files but rather .qz (quake pack) as per Knghtbrd's suggestion.
2000-03-04 01:55:01 +00:00
Bill Currie
3e6df0a25e
Fixed a segfault when running "./uquake -rogue". Forgot that com_cmdline will
...
temporarily have an extra char.
2000-03-04 00:50:46 +00:00
Dan Olson
0f15bbd803
Renamed "help" command to "menu_help".
...
Renamed "cvarhelp" to "help"
Improved the new "help" command.
2000-03-03 19:49:28 +00:00
Dan Olson
b5c3300cf3
Added 'cvarhelp' cmd to retrieve cvar descriptions.
2000-03-02 22:56:25 +00:00
Joseph Carter
8b18f9d56b
A little cleanup...
...
S_Init() is now where it belongs--outside of VID_Init(). I think I did
manage to update every target. If I missed one, kill the sound.h include
and remove S_Init() from VID_Init().
New Cvar: r_sky, defaults to 0, turn it on if you want to use skyboxes.
Cvar r_skyname can actually be used now I _think_, need another skybox
to test it. Quake2000's instructions were used in the skybox stuff but,
as all know by now, our tree is so different from anyone else's that I had
to redo a number of things. But thanks all the same--cut the time spent
debugging it in half. I also want to thank whoever did the night skybox
on the MegaTF page I used to test. Looks great on start map!
New GL-specific Cvar: r_conspin, defaults to 0. Turn it on. You can turn
it off too. Shamelessly ripped from QER.
2000-03-02 19:57:24 +00:00
Joseph Carter
54501eaed7
SKYBOXES!
...
Relevant cvar to change the name of the skybox is r_skyname which defaults
to "sky". If you don't have the files you'll get an ugly red background
in place of the sky. I'll fix that shortly.
Sorry software people, this is just the Q2 code I'm turning on which doesn
not work for software. The code is pretty simple though and most of it's
written already in gl_warp.c---just move that to r_sky and use the pcx's
instead of the tga's..
2000-03-02 13:56:01 +00:00
Bill Currie
36adeb3bf9
add \ handling withing "" strings with necessary fix to the keybinding menu.
...
NOTE: this will break ALL current config scripts that have \ in strings.
2000-03-02 11:38:43 +00:00
Joseph Carter
1393594ee6
Merc's method of doing \ escapes was psychotic and didn't work anyway, so
...
I'm removing it.
2000-03-02 10:50:29 +00:00
Zephaniah E. Hull
cf0201eeea
cvar system fixes..
...
Knghtbrd owes me for this one..
2000-03-01 11:29:21 +00:00
Dan Olson
fd349f60f1
Fixes segfault in uquake-x11
2000-03-01 02:30:02 +00:00
Bill Currie
29f088f349
make gl compile/link with the new cvar system
2000-02-29 06:45:26 +00:00
Eric Windisch
b53e2c9edd
Restructured the fog code and took volfog out of experimental; r_volfog 1 may or may not work, without GL accel I cannot test it. Apparently, It may at very least have problems with voodoo1.
2000-02-29 05:51:29 +00:00
Dan Olson
54409e23fa
This should fix up the last of the show stoppers from the cvar merge.
...
Fixes -glx and -3dfx.
2000-02-28 19:13:16 +00:00
Loring Holden
9a954ee7c9
Now compiles:
...
* Removed cvs merge remnants
* Removed redundant IN_*() functions
2000-02-28 07:52:02 +00:00
Dan Olson
6305810ddb
Some fixes for Cvars. Windows, GGI, and Sun should now all compile.
2000-02-28 01:52:08 +00:00
Dan Olson
8dbf889466
Fixes the cvar problems in qw-server.
2000-02-27 22:25:20 +00:00
Marcus Sundberg
0a1e72eb5e
Fix warnings.
2000-02-27 22:18:44 +00:00
Marcus Sundberg
23a99ab5d3
Make it compile again.
2000-02-27 22:18:23 +00:00
Marcus Sundberg
a27aca541b
Fix warnings.
2000-02-27 22:10:13 +00:00
Zephaniah E. Hull
754ab06b44
Fixing the new cvar mess...
2000-02-27 18:51:50 +00:00
Dan Olson
106dada0b2
Non functional cvar code. Compiles, but won't run.
2000-02-27 07:13:32 +00:00
Joseph Carter
83a09156f1
r_clearcolor currently doesn't work for GL. Broke it while fixing it. It
...
doesn't matter if you don't use noclip in uquake for map debugging. On
the upside, I fly should work in qw-server now. MegaTF fans rejoice!
2000-02-27 03:34:54 +00:00
Zephaniah E. Hull
7a66abafb0
Err, never mind on buttons 4 and 5..
2000-02-27 03:32:19 +00:00
Zephaniah E. Hull
20077b7b4f
Added support for escaping things with \, may require some config
...
changes..
Cleaned up the ifdefs in gl_rpart.c
Added support for mouse buttons 4 and 5 in in_x11..
2000-02-27 03:31:16 +00:00
Bill Currie
adcb14a22d
merge qw_server/sys.h into common/sys.h
2000-02-26 09:04:09 +00:00
Daniel McGregor
9e46831000
add the HAVE_MALLOC_H ifdef so OpenBSD compiles cleanly
2000-02-26 04:06:59 +00:00
Bill Currie
b3ff01224c
merge qw_server/model.c into common/model.c
2000-02-25 10:21:48 +00:00
Bill Currie
78cc81749d
There was a discrepancy in the definitions of MAX_MOD_KNOWN.
...
gl_model.c had it as 512, but qw_server/model.c and common/model.c had it as
256. That wasn't the real problem, what it was was hipnotic (obviously) has
more than 256 models in "Research Facility", and so uquake-svga bobmed
2000-02-25 09:17:59 +00:00
Dan Olson
e1af4d0107
SDL Now compiles and runs
2000-02-25 00:35:41 +00:00
Dan Olson
d8c9b7eb58
Small change to keep an unused function from being compiled in.
...
Credit given in AUTHORS, but it didn't take
2000-02-24 14:46:21 +00:00
Bill Currie
1b6df2ad29
eliminate a lot of debug output
2000-02-22 07:31:52 +00:00
Joseph Carter
d3ca33ade5
the missing uquake bubbles are back
2000-02-22 06:22:31 +00:00
Dan Olson
899180733a
Moving some files around for Jason Nelson (Win32 target)
2000-02-22 04:59:08 +00:00
Joseph Carter
9e973574e4
bspfile.h is now really common
2000-02-21 22:16:39 +00:00
Bill Currie
19206928b4
merge qw_client/model.c and uquake/model.c into common/model.c
...
common/gl_model.c uquake/Makefile.in:
allow checksums in uquake
2000-02-21 21:13:45 +00:00
Loring Holden
8668430a36
quakefs.c - added #include "config.h" so unistd.h would be included properly
...
vid_sunx.c - do not define x_disp and x_win as static, removed unneeded
variables, took on IN_* functions
2000-02-21 18:06:10 +00:00
Bill Currie
15e4001bf2
merge qw_client/gl_cl_parse.c and uquake/gl_cl_parse.c into common/gl_cl_parse.c
2000-02-21 12:47:23 +00:00
Bill Currie
f56e2a12c2
more merges
...
qw_client/gl_model.c + uquake/gl_model.c = common/gl_model.c
qw_client/gl_rlight.c + uquake/gl_rlight.c = common/gl_rlight.c
common/gl_rmisc.c:
call R_InitBubble for both uq and qw
2000-02-21 12:36:38 +00:00
Bill Currie
21f934a4a4
move gl_ngraph.c from qw_client to common in anticipation of it being
...
backported to uquake. Might as well pre-merge it :)
2000-02-21 11:22:10 +00:00
Bill Currie
61bce24653
more mergine
...
qw_client/gl_screen.c + uquake/gl_screen.c = common/gl_screen.c
2000-02-21 11:16:13 +00:00
Bill Currie
007b9a47ee
merge qw_client/resource.h and uquake/resource.h into common/resource.h
2000-02-21 10:38:51 +00:00
Bill Currie
120597da8e
Heh, netgraph is not yet ported to uquake :)
2000-02-21 10:34:16 +00:00
Bill Currie
0196064c51
merge qw_client/r_misc.c and uquake/r_misc.c int common/r_misc.c
...
merge qw_client/r_sprite.c and uquake/r_sprite.c int common/r_sprite.c
2000-02-21 10:28:22 +00:00
Bill Currie
981acbc014
merge qw_client/r_part.c and uquake/r_part.c into common/r_part.c
...
merge qw_client/gl_rpart.c and uquake/gl_rpart.c into common/gl_rpart.c
r_part.c tested for uquake and seems ok, but gl_rpart.c untested
2000-02-21 08:12:35 +00:00
Dan Olson
5f3c8c1738
Keeps -glx targets from re-meshing models every time they start up.
2000-02-21 04:22:00 +00:00
Dan Olson
8ac1385c9f
Jason Nelson's patch for fixing Win32 targets
2000-02-20 21:19:50 +00:00
Zephaniah E. Hull
d356761b93
Fix for the QW protocol problem by Dabb..
...
Some profiling changes as well..
Code now compiles with profiling support, will disable later..
2000-02-20 20:46:13 +00:00
Dan Olson
f6b334821b
Small fix for duplicated Registering of _windowed_mouse
2000-02-20 20:45:18 +00:00
Bill Currie
692f99de11
Fix the gentle crash on game load once in a game. (#ifdef UQUQKE doesn't help
...
much, does it?:)
2000-02-20 08:39:23 +00:00
Bill Currie
78a1e3e6bc
can't use Con_Printf at this stage
2000-02-20 06:18:33 +00:00
Bill Currie
592b054f82
common/gl_vidglx.c:
...
some tweeks in an attempt to improve shutdown. NOT the final say
qw_server/sv_ccmds.c:
comment correction
common/quakefs.c uquake/host_cmd.c:
knghtbrd's gamedir patch, plus some Hunk_Alloc -> Z_Malloc changes.
2000-02-20 04:20:00 +00:00
Joseph Carter
d6143f645f
a few glx video cleanups
2000-02-19 20:54:58 +00:00
Dan Olson
0cd791223c
Fixed a conwidth bug involving min(a,b). Whoever did this needs to be injured.
2000-02-19 20:43:34 +00:00
Marcus Sundberg
636b73cc11
Synced some code between UQ/QW.
2000-02-19 15:43:42 +00:00
Marcus Sundberg
fe555bd14e
Fixed broken #endif
2000-02-19 15:42:13 +00:00
Marcus Sundberg
be77f29ec8
Merged IN_Commands with IN_Frame.
2000-02-19 14:52:17 +00:00
Marcus Sundberg
9baa100ca8
Made code work again.
2000-02-19 14:30:51 +00:00
Marcus Sundberg
10cc5228c5
Remove redundant shared stuff from Makefiles.
2000-02-19 13:53:08 +00:00
Bill Currie
aa605d7d51
fix a nastyness in shutdown code
2000-02-19 09:53:47 +00:00
Zephaniah E. Hull
1e9f882fee
Whoops, minor compile fixes..
2000-02-19 08:44:02 +00:00
Zephaniah E. Hull
0fae0e01d3
Reverting away from modules in the main branch..
...
-3dfx, -x11, and -glx all work, at least for qw-client, no promices on uquake.
I can't test any other targets at the moment, so....
2000-02-19 08:24:15 +00:00
Loring Holden
1b7369d462
Makefile.in - let autoconf tell us how to do shared library stuff
...
cvar.c - added $include <stdlib.h>
in_x11.c - removed #include "menu.h" (unavailable in some cases & unneeded)
vid_sunx.c - now loads x11 plugin
world.c - only call SV_Error if compiling uquake or qw-server
2000-02-17 16:18:55 +00:00
Dan Olson
7d387042f7
New CVAR flag system. Appears to work perfectly
2000-02-16 21:30:20 +00:00
Bill Currie
f74c84e695
added a comment from Zoid describing how things like CVAR_ROM works
2000-02-16 04:36:33 +00:00
Bill Currie
6656fb6af6
add the #defines Zoid posted to irc
2000-02-15 23:17:23 +00:00
Jeff Teunissen
1bf5d6c30c
Makefile.in: Removed -lvga from in_x11.so build
...
rest: misc. fixes
2000-02-15 19:25:09 +00:00
Dan Olson
b03c0a094e
More menu stuff and input plugin loading for -glx targets
2000-02-15 18:45:26 +00:00
Dan Olson
c878ab64f4
Prep of menus for video modularization.
2000-02-15 14:25:03 +00:00
Bill Currie
b099c73cc4
add Cvar_Init, which adds the "set" command to create dynamic cvars
2000-02-15 11:42:12 +00:00
Bill Currie
b099908cc7
fix a potential buffer overflow
2000-02-14 20:28:22 +00:00
Bill Currie
9ed247178f
common/plugin.c:
...
add path searching. currently unix style only (ie ':') and defaults to
".:${LIBDIR}/quakeforge".
*/Makefile.in:
fix up the clean targets a little, so they actually work
2000-02-14 11:30:37 +00:00
Joseph Carter
7670da27cf
Now just pass the filename (not path) when loading the plugin. Currently
...
assumes path of ./ but taniwha was going to add a cvar which can be used
if va("./%s", filename) doesn't exist..
2000-02-14 09:02:16 +00:00
Jeff Teunissen
17a4f34644
Whitespace changes to the opening comment
2000-02-14 08:50:30 +00:00
Bill Currie
173c556c0f
put TILE_SIZE back in (still needed by r_sky.c)
2000-02-14 06:15:09 +00:00
Bill Currie
a2e5a8be6d
some mods on the way to a better plugin system
2000-02-14 04:46:57 +00:00
Joseph Carter
fdd6112d74
svgalib input works again.
2000-02-14 03:27:10 +00:00
Eric Windisch
6bd0f67f8c
Deleted unused/obsolete code related to my last commit.
2000-02-14 03:23:04 +00:00