Commit graph

213 commits

Author SHA1 Message Date
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
Dan Olson
c878ab64f4 Prep of menus for video modularization. 2000-02-15 14:25:03 +00:00
Dan Olson
35fb941db1 Correction of spelling errors. Mostly for CVS practice. 2000-02-14 23:06:13 +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
f11f71d8a7 we now define LIBDIR when we build targets 2000-02-14 00:35:13 +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
Zephaniah E. Hull
3b1494b153 Fixed some little errors with the plugin code.. 2000-02-12 11:42:56 +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
e3d564905d put REQUIRED worlda.s back in. it will not cause probelms for non-x86 archs as
generates an empty .o file if id386 is 0 or undefined
2000-02-11 11:07:04 +00:00
Loring Holden
0442e797e4 Remove redundant worlda.s that caused problems on non-x86 systems 2000-02-11 06:50:15 +00:00