Commit graph

223 commits

Author SHA1 Message Date
Anton E. Gavrilov
82f8cf07b9 Updated MSVC project files. Every target compiles and works. 2000-03-19 13:07:44 +00:00
Bill Currie
a7d766abc9 more fixings for "make install" 2000-03-15 01:09:48 +00:00
Bill Currie
2800c2856e make install now works (caused by a flakey install-sh), as does build_rpm.
Also, there was a bug in configure.in that caused glx not to be built at all on
my system.

NOTE: I changed SRC_DIR to srcdir (GNU `standard'), though I'm beginning to
wonder if that was so good.
2000-03-13 11:54:24 +00:00
Bill Currie
2f47ba42f2 merge qw_client/view.c and uquake/view.c into common/view.c 2000-03-12 00:36:50 +00:00
Joseph Carter
e818226c34 This SHOULD allow Mega2K to work whenever it gets released. View offsets
are done (sorry if this steps on your toes with the view.c merge Deek) and
I'm almost positive flymode will now work.  Even though view offset is
done, it won't.

The reason for this is that cl.stats[STAT_FLYMODE] is pretty much going to
ALWAYS be 0 on a standard server.  Since 0 tells us that we're not flying,
this is fine.  cl.stats[STAT_VIEWHEIGHT] is also going to be 0, but it
should be 22 for normal views.  I could always assume this value is an
offset from 22, but that just seems lame to me.  I'll either do it anyway
or we'll have to find a good opportunity in the connect cycle to set the
cl.qfserver qboolean to true.

I'm thinking about using an info key value for this, but we'd be better
served I think by coordinating with QSG to up the protocol version across
all engines.
2000-03-11 21:29:48 +00:00
Joseph Carter
2cfc6ee445 Mostly whitespace cleanups while checking out the SERVERONLY defines in
the file.
2000-03-11 12:34:11 +00:00
Anton E. Gavrilov
620d7482b1 Updated MVSC project files. 2000-03-11 10:17:05 +00:00
Loring Holden
a2284ec9c8 Use ASM_ARCH instead of NO_ASMOPT to figure out if we are on an x86 platform 2000-03-11 05:36:18 +00:00
Anton E. Gavrilov
fd5d30dd06 Updated MSVC project files 2000-03-10 23:25:39 +00:00
Joseph Carter
cc84e6291b I decided I liked having a smaller console so I cleaned up the debugging
code for scr_consize a bit.  I also made it work in software targets.  If
you set scr_consize outside the range of .2 to .9 it now assumes you're
an idiot and ignores your setting, using the appropriate boundary value.

A note about gl_conalpha for GL targets.  It now works up to a consize of
.9 rather than working just upto 2/3 of the screen.  Works just as it did
before.  The only reason it matters is that the boundary for scr_consize
does not apply to the decision of whether or not to use alpha--only to
how big to make the console.

That means if you set scr_consize to .91 or something it won't be bigger
but you'll lose alpha.  Don't even try to report that as a bug---I will
tell you simply Don't Do That(TM).
2000-03-10 23:18:46 +00:00
Bill Currie
c9555d16f1 merge qw_client/d_surf.c and uquake/d_surf.c into common/d_surf.c 2000-03-09 01:05:40 +00:00
Bill Currie
5a5af93a43 merge qw_client/d_edge.c and uquake/d_edge.c into common/d_edge.c
Sorry, Mercury, more #ifdef QUAKEWORLD and UQUAKE :/
2000-03-09 00:58:58 +00:00
Bill Currie
bcd302a948 common/common.c common/common.h qw_client/cl_parse.c qw_server/sv_main.c:
handle escape chars better
common/quakefs.c:
	check the return value of opendir
2000-03-08 04:17:12 +00:00
Marcus Sundberg
4e76d7e176 Made the Makefiles work. 2000-03-07 23:13:00 +00:00
Anton E. Gavrilov
195af30ce9 Updated qw_client.dsp, qw_server.dsp and common/wins/config.h 2000-03-06 20:18:41 +00:00
Anton E. Gavrilov
7db3275c99 Added VC projects for qw_client and qw_server. Client crashes with -safe, server doesn't even compile, but anyway... ;) 2000-03-06 17:59:16 +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
Bill Currie
5e15698777 This is the fix I promised in my previous checkin. I hope it works, I have no
means of testing it at the moment.
2000-03-06 03:26:59 +00:00
Bill Currie
c917237c77 revert knghtbrd's `fix'. It was fine for systems with GL/*.h in either
/usr/include or /usr/local/include, but not when they are in /usr/X11R6/include.

I'll look into fixing this in a way that doesn't break any builds and hopefully
stops  redundant builds.
2000-03-06 03:22:48 +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
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
Zephaniah E. Hull
41c969c2ac LoadPCX has been rewritten and now functions!! 2000-03-04 20:32:38 +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
Bill Currie
54e2cafda8 --enambe-generations now builds (include unzip.c) 2000-03-04 03:06: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
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
Zephaniah E. Hull
cf0201eeea cvar system fixes..
Knghtbrd owes me for this one..
2000-03-01 11:29:21 +00:00
Dan Olson
5d66aa274c A couple small fixes thanks to Dan Nelson 2000-02-29 00:00:51 +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
Dan Olson
899180733a Moving some files around for Jason Nelson (Win32 target) 2000-02-22 04:59:08 +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
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
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
8ac1385c9f Jason Nelson's patch for fixing Win32 targets 2000-02-20 21:19:50 +00:00
Zephaniah E. Hull
2afdb1db5f Little bug fixes here and there, should work again.. 2000-02-20 20:49:36 +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
Marcus Sundberg
636b73cc11 Synced some code between UQ/QW. 2000-02-19 15:43:42 +00:00
Marcus Sundberg
10cc5228c5 Remove redundant shared stuff from Makefiles. 2000-02-19 13:53:08 +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
6b9563b880 Until we use libtool, we need to specify in configure.in how to create and
use shared libraries (-rdynamic and -shared does not work everywhere)

We also have to use this information in */Makefile.in
2000-02-17 16:21:23 +00:00
Dan Olson
7d387042f7 New CVAR flag system. Appears to work perfectly 2000-02-16 21:30:20 +00:00
Joseph Carter
50167d5e71 Console now hauls ass by default ala quake2 and such. Did not change the
scr_conspeed default from 300 to quake2's 3 because I want to be sure of
how I am doing it compared to how it was done later.  Will ask Zoid when
both of us are awake at the same time.
2000-02-16 11:28:27 +00:00
Dan Olson
b03c0a094e More menu stuff and input plugin loading for -glx targets 2000-02-15 18:45:26 +00:00