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
Eric Windisch
17eb4d012c
Some changes to quakefs.c for the pakzip (formerly pak3) support.
...
Found and deleted unused, obsolete functions in r_surf.c
2000-02-14 03:08:14 +00:00
Joseph Carter
6d8a39b2dd
Pass just the filename to the plugin loader, no path. taniwha will do
...
some black voodoo (is that a plug for 3dfx?) with the plugin code shortly
to make it work..
2000-02-14 00:46:43 +00:00
Joseph Carter
f11f71d8a7
we now define LIBDIR when we build targets
2000-02-14 00:35:13 +00:00
Joseph Carter
bb5623aa9e
input.h is gone - was empty anyway. vid_x11.c now is responsible for init
...
of the input routines it can use. All vid targets should do this for the
input method they should use. While this is essentially hardcoding, it's
kinda necessary for now. Once we have everything working and tested we
can work on an interdependency scheme so X input methods only work with X
output methods, etc...
2000-02-13 11:31:00 +00:00
Joseph Carter
1d7260195f
Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause
...
less confusion that way (even if I have to type an extra letter..)
2000-02-13 09:06:11 +00:00
Bill Currie
9a2b4c0e5a
fix sound init
2000-02-13 05:45:38 +00:00
Bill Currie
502d171cbf
turns out uquake can handle (build time anyway) qw's pmove*.c as is, so make
...
them common
2000-02-13 04:32:18 +00:00
Zephaniah E. Hull
3b1494b153
Fixed some little errors with the plugin code..
2000-02-12 11:42:56 +00:00
Bill Currie
b0fba33d43
uquake /almost/ links now (is that link being sort of pregnant?)
2000-02-12 10:02:22 +00:00
Bill Currie
84e7f8fb05
correct return type of S_IN_Init
2000-02-12 08:23:40 +00:00
Zephaniah E. Hull
dd7d064733
in_x11.so, and actually check in the plugin code..
...
vid_x works, aside from a few, err, qwirks, in the input focus handling..
2000-02-12 08:08:31 +00:00
Zephaniah E. Hull
0e8ba8d814
Sledge hammer applied..
...
The input stuff is now somewhat modular, I'll get everything working
soon enough, right now things are hardwired to svgalib, but its ok..
2000-02-12 05:34:22 +00:00
Bill Currie
0affdbf681
fixes for uquake
...
(ie #ifdef SERVERONLY -> #if defined(SERVERONLY) || defined(UQUAKE))
2000-02-12 04:18:42 +00:00
Jeff Teunissen
a2f8d0f212
Fixed "vvoid" and "oid" in server.h
2000-02-11 06:01:35 +00:00
Bill Currie
149c6c6523
getting closer to haveing a compiling uq
2000-02-11 05:47:57 +00:00
Bill Currie
e713452ba5
qw-server now compiles and links
2000-02-11 04:55:11 +00:00
Bill Currie
ce9580f237
sufflin' shufflin' shuflin'.. raaw-source
...
qw-client now links, but qw-server won't compile (yet)
2000-02-11 04:21:10 +00:00
Bill Currie
de1e542ead
merge qw_server/qwsvdef.h qw_server/server.h uquake/server.h into
...
common/server.h
world.c some compile time fixups
2000-02-11 01:42:15 +00:00
Bill Currie
3585aab0eb
merges:
...
qw_server/world.[ch] and uquake/world.[ch] into common/world.[ch]
uquake/chasecam.c into common/cl_cam.c
move physics type defines from server.h to phys.h
2000-02-10 23:38:19 +00:00
Joseph Carter
c249d90a69
Slight reformat, nothing big
2000-02-10 17:25:27 +00:00
Joseph Carter
252621a4cd
*** empty log message ***
2000-02-10 16:29:11 +00:00
Loring Holden
796976d7b8
AIX needs stdlib.h so malloc is defined
2000-02-10 16:24:10 +00:00
Bill Currie
314cca66b8
common/common.h:
...
add #include <cvar.h>
move qw_client/cl_cam.c to common/cl_cam.c
2000-02-10 13:56:47 +00:00
Bill Currie
fabe501768
the merge continues. qw_common/common.c and uquake/common.c have /finally/ been
...
merged with the command line args merged into common/qargs.c. Args rebuilding
in qargs.c should now be totally safe with no limits.
2000-02-10 13:49:39 +00:00
Bill Currie
c4797f95fe
added some more missing cvars
2000-02-10 11:19:51 +00:00
Joseph Carter
2425b04e3b
Host_ShutdownServer -> SV_Shutdown
2000-02-10 09:43:27 +00:00
Joseph Carter
df559eaf9f
Under a rare case in UQ (that you are playing with the QW HUD in a co-op
...
game), the color bar that was supposed to be the backdrop for your frag
counts would be drawn as if the statusbar was centered (which is never
the case if you're using the HUD), fixed.
I have more sbar.c fixes to do but I need a working UQ to be able to test
them out first. We're _almost_ there... We all owe Deek and taniwha big
for the progress made tonight I think---great job guys. But save SOME of
the merge for the rest of us willya? ;>
2000-02-10 09:36:00 +00:00
Bill Currie
f52457b0c7
moved many cvars in from the old host.c
2000-02-10 09:16:56 +00:00
Jeff Teunissen
e0987665d8
Possible fix to the recently-uncovered UQuake segfault.
2000-02-10 09:07:26 +00:00
Bill Currie
866f2514d0
common/host.c:
...
put Host_GetConsoleCommands back
uquake/server.h:
proto for SV_Frame
uquake/sv_main.c
add SV_ClientPrintf SV_BroadcastPrintf SV_DropClient SV_Frame* from
old host.c
2000-02-10 09:03:30 +00:00
Jeff Teunissen
74e0de143a
host.c completions...might be able to link now. :)
2000-02-10 08:45:53 +00:00
Joseph Carter
44ec4f61d5
A couple cl_ents functions removed from cl_main for uquake, we're close to
...
being able to link uquake again! Reformatted the top of cl_ents
2000-02-10 06:22:29 +00:00
Loring Holden
aa720bf076
Small changes to compile (not link) under Solaris, AIX, & Irix
2000-02-10 06:18:57 +00:00
Bill Currie
ccbb656250
more uquake link fixups
2000-02-10 06:03:16 +00:00
Bill Currie
28088048b3
uquake now compiles, but doesn't link yet
2000-02-10 05:58:27 +00:00
Bill Currie
1cd0078fca
qw now links
2000-02-10 05:45:53 +00:00
Bill Currie
3e1912f471
Host_* merging
2000-02-10 05:41:46 +00:00
Bill Currie
eef00e39f3
stopped some cvar and cmd clashes
2000-02-09 09:55:58 +00:00
Bill Currie
16e636cc01
make independent of zlib (ie use HAS_ZLIB)
2000-02-09 09:12:55 +00:00
Bill Currie
88bc2bf209
common/gl_refrag.c common/gl_rmain.c:
...
fix to compile with cl_visedicts from qw in uq
common/quakeio.c:
fix bogus string copying
2000-02-09 06:27:30 +00:00
Bill Currie
1308793cce
moved qw_common{bothdefs.h,pmove.h,pmove_simple.h} to common
...
merged qw_common/quakedef.h and uquake/quakedef.h into common/quakedef.h (sort
of, bits of bothdefs.h too)
common/cl_ents.c common/client.h uquake/screen.c uquake/sv_user.c:
various fixups to cope with the merge.
UQ is still busted
2000-02-09 01:44:59 +00:00
Bill Currie
21416b0b94
qw_common/pmove.h:
...
add #include "net.h"
uquake/Makefile.in:
put cl_ents.c back it. might as well make a commitment :)
merge qw_common/protocol.h and uquake/protocol.h into common/protocol.h
2000-02-08 22:25:15 +00:00
Pontus Lidman
0b3798abff
Fixing consequences of merge + new macro for IPV6
2000-02-08 21:23:46 +00:00
Bill Currie
7d5b301d80
common/quakeio.c:
...
support gzipped files
common/quakefs.c:
qw_client/cl_parse.c:
qw_server/sv_ccmds.c:
uquake/host_cmd.c:
uquake/menu.c:
use "z" in mode flags when reading files
uquake/Makefile.in:
take cl_ents.c out again (too much work atm to get it to compile)
2000-02-08 20:59:36 +00:00
Bill Currie
1983cf894b
move cl_ents.c from qw_clent to common
...
uquake/Makefile.in:
add cl_ents.c (doesn't work yet)
qw_client/gl_vidlinux_x11.c:
not used, waste of bandwidth
2000-02-08 07:44:02 +00:00
Bill Currie
a078544d38
Replaced every single fscking FILE and gzFile (except in quakeio.*) with QFile
...
and fixed up as many f* and gz* calls as gcc found (and, where sensible, grep)
Unfortuanatly, demos are broken again.
2000-02-08 07:23:09 +00:00
Bill Currie
e67f3dc07a
uquake now builds
2000-02-08 06:14:10 +00:00
Bill Currie
83fc2c0373
forgot to add these in the last checkin. They implement the QFile stuff.
2000-02-08 05:08:34 +00:00
Bill Currie
edbb589045
merge qw_client/cl_main.c and uquake/cl_main.c into common/cl_main.c
...
For the rest, convert all refs to FILE and gzFile to QFile, and similar for
file functions (eg fprintf, fgets, fread, etc)
2000-02-08 05:06:58 +00:00
Joseph Carter
bc28568890
there are still uquake issues...
2000-02-07 23:13:16 +00:00
Joseph Carter
7633189c91
cl_tent.c is merged - uquake still has some issues but they're smaller now
2000-02-07 22:54:33 +00:00
Bill Currie
56c8badd2d
merge qw_client/r_edge.c and uquake/r_edge.c into common/r_edge.c
2000-02-07 04:31:25 +00:00
Bill Currie
ea4390157a
merge qw_client/r_efrag.c and uquake/r_efrag.c into common/r_efrag.c
2000-02-07 04:18:27 +00:00
Joseph Carter
bcc96386cd
A few mods for uquake...
2000-02-07 04:18:18 +00:00
Joseph Carter
e023ae7ffe
qw-client and server work again, sound_lib builds, uquake doesn't
2000-02-07 03:49:50 +00:00
Bill Currie
9a17811cd3
removed reference to cl_state.h
2000-02-07 03:21:08 +00:00
Bill Currie
aceca3eb86
this shouldn't be in cvs
2000-02-07 01:53:45 +00:00
Joseph Carter
3c55b43e25
Committing my merges of client.h and net.h.. Got rid of snd_dma.c changes
...
made before, it breaks a few things but it needs to be committed so they
can be fixed..
2000-02-07 01:32:12 +00:00
Bill Currie
004003ccb0
merge qw_common/common.h and uquake/common.h into common/common.h
2000-02-07 00:43:02 +00:00
Bill Currie
4b77a46ca6
merged qw_client/cl_input.c and uquake/cl_input.c into common/cl_input.c
2000-02-07 00:12:21 +00:00
Loring Holden
9ff456626f
snd_null.c - snd is another variable defined in snd_dma.c that has to be
...
defined here as well
vid_sunx.c - missing client.h include
2000-02-05 19:42:21 +00:00
Marcus Sundberg
840ff1c72f
Added support for numpad keys and some other ones missing.
2000-02-05 17:49:03 +00:00
Marcus Sundberg
662e6491eb
Make sure we don't use a negative index into sb_faces.
2000-02-05 16:01:15 +00:00
Marcus Sundberg
475353c278
typedef socklen_t here if it doesn't exist.
2000-02-05 15:59:39 +00:00
Marcus Sundberg
69cbd2e370
Now compiles.
2000-02-05 15:21:19 +00:00
Marcus Sundberg
461c66051c
Include <model.h>
2000-02-05 15:08:13 +00:00
Marcus Sundberg
0d77a4577e
Include <math.h>
2000-02-05 15:05:44 +00:00
Joseph Carter
dc627d6b28
uquake has the beginning of netchan support, netchan.message works fine
...
now, the rest I don't know how much of it I can do without breaking the
protocol's compatibility.
client_state_t has moved back to client.h in qw_common and uquake. Seems
like that's a step backward, but the way it was being used while common
was far worse! This required massive reworking of headers and such.
Speaking of using cl (the global client_state_t) badly, the sound code did
exactly that. Mercury should be shot for not fixing that when he did the
sound_lib.a stuff. The fix illustrates what we need to start doing to the
code to make modularization possible. I'll be sending a message to the
list about this shortly..
2000-02-04 13:40:04 +00:00
Bill Currie
233984564e
configure.in:
...
remove a debug echo
snd_alsa.c:
#include "console.h"
2000-02-04 09:52:43 +00:00
Joseph Carter
7e04ceced5
The pretty green/yellow/blue pixels that hang around after things like
...
biosuits, pents, and quads wear off are now gone. Sort of. They are
caused by places where two texture edges meet and there are little gaps
at the seams where nothing gets drawn. This is also why noclip screws w/
the screen if you walk outside of the map in the GL targets. We now draw
a backdrop whose color is set by r_clearcolor, ala software renderer.
2000-02-04 04:01:23 +00:00
Joseph Carter
23b33b7173
4 scrap textures oughtta be enough for anybody.
2000-02-04 01:58:27 +00:00
Bill Currie
0a46c1d979
configure.in:
...
make zlib enabled by default
common/nozip.h:
swap the size and count params to f{read,write} to prevent demo code
breaking
common/quakefs.c:
if zlib is unavailable, there is no point in supporting the .gz
extension
2000-02-03 21:44:46 +00:00
Joseph Carter
218d2fcb9b
random QW changes which should help with sbar stuff later on
2000-02-03 21:16:57 +00:00
Eric Windisch
9e47e221b6
Changed the name of the pak3 code to pakzip. Also a few assorted, trivial code cleanups.
...
-- Eric Windisch
2000-02-03 21:13:23 +00:00
Joseph Carter
c0dc03a8ff
Other minor changes for uquake, nothing visible
2000-02-03 20:27:25 +00:00
Joseph Carter
9c399a04e5
ixed he irst etter issing roblem
2000-02-03 12:46:08 +00:00
Jeff Teunissen
9a9384f6a9
Cmd_InitFilesystem(): add -game support to the common cmd.c, #ifdef
...
QUAKEWORLD the Cmd_AddGameDirectory("%s/qw", ... ) call.
2000-02-03 11:29:22 +00:00
Jeff Teunissen
18fc5af9e9
Replaced Knghtbrd's command fix for UQ, added more for completeness.
2000-02-03 11:14:57 +00:00
Joseph Carter
cdee91b71f
talk sound now happens in UQ again
2000-02-03 10:56:46 +00:00
Joseph Carter
e9e147fe84
Most of the commands in uquake/host_cmd.c are simply passed to the server
...
when you type them. This includes say, god, etc... They never got there
however because Mercury forgot to add the uquake stuff to it. We _REALLY_
need to get cls.netchan backported to uquake!
2000-02-03 10:51:06 +00:00
Joseph Carter
51676c32e7
You can tell who has what hardware and libs because they tend to forget to
...
update the files for the stuff they don't use/have...
2000-02-03 10:32:56 +00:00
Joseph Carter
afe3589124
Fix for 3dfx target using lsh's macros
2000-02-03 09:55:11 +00:00
Loring Holden
8349f3e59f
Various changes to get build to work when zlib isn't available...
...
Various changes to get rid of warnings under AIX, Irix, Linux & Solaris...
2000-02-03 08:46:52 +00:00
Bill Currie
75bb541f81
more f*->gz*. forgot to save this one earlier.
2000-02-03 03:09:52 +00:00
Bill Currie
fe681d4427
some more f* -> gz*. need to get home to test this properly.
2000-02-03 02:59:11 +00:00
Bill Currie
73c6ffdde3
a few more f* -> gz* conversions. I don't have GL at work :)
2000-02-03 02:52:05 +00:00
Bill Currie
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +00:00
Bill Currie
e9a2a3fab5
Add gzip support, add -Werror to gcc CFLAGS, clean up misc warnings.
...
NOTE: demos are broken for gzipped demo files (possibly normal ones too, not
yet tested).
2000-02-03 00:34:12 +00:00
Jeff Teunissen
02dab8f828
Re-added Hipnotic/Rogue support to filesystem code. Cleaned up
...
COM_LoadGameDirectory().
2000-02-02 06:49:43 +00:00
Joseph Carter
7bc3e61e27
This isn't funny.. Typo fixed.
2000-02-02 05:33:23 +00:00
Joseph Carter
b210bffd3e
Note to self: ...test before you commit, test before you commit...
2000-02-02 05:10:56 +00:00
Joseph Carter
0393b88e5f
breaks are evil outside switch's, the for loop has an exit condition...
2000-02-02 05:07:29 +00:00
Eric Windisch
b1af7c3e37
Fixed bug that caused:
...
Error: Not enough RAM allocated. Try starting using "-mem 16" or higher
Quakefs.c
2000-02-02 05:01:07 +00:00
Eric Windisch
668fcd2143
Minor changes to quakefs.c; if generations and experimental are defined all files ending in .pak3 are loaded.
2000-02-01 05:13:30 +00:00
Bill Currie
19e937518c
can find "wadfile".gz as well as just "wadfile". NOTE: .gz files don't acutally
...
work yet.
2000-01-30 22:46:30 +00:00
Nelson Rush
8346bd1997
aa tty support, adds text mode qf keyboard/video support.
...
currently i have no idea if this even works because i cannot test it, if anyone is willing to make a target for it i can start debugging.
2000-01-30 07:32:33 +00:00
Joseph Carter
4f9ce178c1
Merc missed a few things, cleaned the makefiles up a little more
2000-01-30 00:36:41 +00:00
Loring Holden
3c8f2939af
Makefile.in - Explicitly list patterns instead of using echo, conditionally
...
run ranlib
d_part.c, snd_sun.c, vid_sunx.c - missing includes
2000-01-29 23:22:00 +00:00
Zephaniah E. Hull
925344be77
uquake now works! All targets I can test!
...
I also merged console.[ch] while I was at it..
2000-01-29 18:46:26 +00:00
Bill Currie
b87a49e6ba
fixed the netchan stuff for uquake
2000-01-29 02:53:28 +00:00
Bill Currie
6f213c8342
common/quakefs.c:
...
make pak3 support dependent on /both/ _EXPERIMENTAL_ and GENERATIONS
qw_client/Makefile.in:
move gl files into cleint/gl so thay can have their own build rules
conditionally added -lasound to LIBS if building for ALSA
2000-01-29 02:31:47 +00:00
Bill Currie
ee26684664
fix to work with Mercury's header changes
2000-01-28 11:13:13 +00:00
Joseph Carter
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
Zephaniah E. Hull
63978c73c6
uquake compile updates..
2000-01-28 01:03:09 +00:00
Bill Currie
b733915e6a
these should not be here (yet)
2000-01-27 22:56:15 +00:00
Bill Currie
8298748791
more work on the merge
2000-01-27 19:27:33 +00:00
Zephaniah E. Hull
fdec8fa33a
Quick fixup for compiling without the gl headers..
2000-01-27 19:10:22 +00:00
Jeff Teunissen
bbec99182c
Added Makefile to .gitignore
2000-01-27 19:08:46 +00:00
Zephaniah E. Hull
f18b3bcf02
HUGE changes..
...
Basicly, sound_lib.a is built, and is compiled into the clients..
Note, uquake is SERIOUSLY FSCKED..
2000-01-27 17:06:02 +00:00