Commit graph

402 commits

Author SHA1 Message Date
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