qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-29 15:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
1165 commits 2 branches 3 tags 3.5 MiB
Commit graph

657 commits

Author SHA1 Message Date
Marcus Sundberg
64683cdc75 Honor _windowed_mouse in addition to LibGGI's native Ctrl-Alt-m method. 
Requires current LibGII.
 2000-03-19 19:30:39 +00:00
Marcus Sundberg
c1fb651c0d Moved nullcursor handling here. 
Fixed keyboard handling - XLookupString()??? how did that get here? We
should use XLookupKeysym().
Fixed _windowed_mouse handling - don't flood the X-server with silly
requests each time the pointer moves. Should hopefully make mouse movement
a bit smoother.
 2000-03-19 18:54:25 +00:00
Marcus Sundberg
d0e8fa0aae Moved nullcursor handling to in_x11.c. 2000-03-19 18:48:46 +00:00
Loring Holden
e8db66c274 pcx.c - string.h needed on some platforms 
vid_sunx.c, vid_sunxil.c - add context_x11.h, remove x_disp declaration
 2000-03-19 17:01:35 +00:00
Marcus Sundberg
674ddcffe5 The big whitespace cleanup. ;-) 
Removed trailing whitespace from code lines.
 2000-03-19 15:59:51 +00:00
Marcus Sundberg
c7830d7118 Removed lame debug code which didn't even check return codes. 2000-03-19 15:20:09 +00:00
Anton E. Gavrilov
70f43f6e71 It's not needed, really. 2000-03-19 13:19:46 +00:00
Anton E. Gavrilov
d457edbccd Changed SV_Frame(float) to SV_Frame(double). No more problems on Win32. 2000-03-19 13:05:12 +00:00
Bill Currie
73db1a359e move net_udp.c from qw_common to common in praparation for the network merge. 
net_udp.c still exists in uquake for the moment so this commit won't affect
others.
 2000-03-19 09:23:51 +00:00
Joseph Carter
769b0bc53c new cvar: cl_verstring, set it to "" if you want to get rid of that. Here 
you go ambush..
 2000-03-18 08:16:47 +00:00
Jeff Teunissen
3db83b18d7 Misc. fixes. 2000-03-18 03:40:22 +00:00
Anton E. Gavrilov
7da71c8673 v_contentblend works in both QW and uquake now; also, it is a float (not toggle) now. 2000-03-18 03:35:10 +00:00
Anton E. Gavrilov
20c4669f0f Added 'toggle' command (just like in Q3 :P) 2000-03-18 02:47:51 +00:00
Anton E. Gavrilov
b96b3cc0fe Changed key names to Q3 style :) 2000-03-18 02:15:21 +00:00
Anton E. Gavrilov
e967e68588 Reorganized keynums a bit. No more 'SCRLCK is unbound, hit F4 to set'. 2000-03-18 02:13:14 +00:00
Anton E. Gavrilov
a335742365 Added KP_* support for Win32 2000-03-18 02:11:10 +00:00
Bill Currie
0d33daa4a0 undid knghtbrd's recent changes as they broke [atleast] uquake. 2000-03-16 03:02:44 +00:00
Joseph Carter
bf764072a0 I thought this was already checked in. If it fixes something with view 
stuff cool.  If it breaks stuff....  Um, well...
 2000-03-16 02:26:12 +00:00
Bill Currie
a7d766abc9 more fixings for "make install" 2000-03-15 01:09:48 +00:00
Bill Currie
c3d782a688 put in reference counting for the x_disp pointer and make openneing and closing 
of the display centralised. This will eventually lead to a much improved X init
and shutdown code.

Unfortunatly, X still crashes for me after running uquake-glx (haven't tested
for qw-client-glx, but I imagine it's no different), but I've found it's after
running uquake-glx the /second/ time, so I suspect it's a utah-glx(mga)/mesa
bug. It could also be an X server bug. I'll see if I can upgrade my X and then
report to the utah-glx team.
 2000-03-14 10:25:46 +00:00
Bill Currie
73030d89a2 fix for RedHat 5.2, reported by djsmoke 2000-03-14 05:11:50 +00:00
Anton E. Gavrilov
1dfc12ebf5 Added cl_constyle cvar. 2000-03-13 01:35:17 +00:00
Anton E. Gavrilov
3f48c050be Fixed an infinite loop in video options menu. Added VID_Gamma_f(). 2000-03-13 01:26:20 +00:00
Bill Currie
5238b2634f move net_udp.h from uquake to common in preparation for merging net_udp.c 2000-03-13 00:58:37 +00:00
Bill Currie
d9d5c7b758 move net_chan.c and net_udp6.c from qw_common to common 2000-03-13 00:51:17 +00:00
Anton E. Gavrilov
722dfab94d Draw_BeginDisc() is working now. 2000-03-12 15:52:37 +00:00
Bill Currie
7226e6201b merge in many of deeks modifications (especially formatting). The rest, I'm too 
tired to look at now.
 2000-03-12 12:20:11 +00:00
Bill Currie
2991fd7c17 found a missing ) 2000-03-12 12:15:29 +00:00
Bill Currie
260cab9c10 some more merge tweeks. hopefully didn't break anything 2000-03-12 10:41:50 +00:00
Jeff Teunissen
e1e663300c Added macro: bound(min, val, max) is shorthand for min(maxval, max(val, minval)). 2000-03-12 08:33:15 +00:00
Bill Currie
ba97294a41 tidy up a messy part of the merge 2000-03-12 08:13:35 +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
Anton E. Gavrilov
c58cab5f55 The window title is "QuakeWorld" now, instead of "WinQuake" 2000-03-11 10:13:06 +00:00
Anton E. Gavrilov
51d9494677 The one who removed #ifndef GLQUAKE from quakeasm.h gotta be shot. 2000-03-11 10:05:27 +00:00
Anton E. Gavrilov
1b35b7ab83 Win32 compiles now (opendir yet to be done...) 2000-03-11 00:46:46 +00:00
Anton E. Gavrilov
596b294d04 Win32 compiles and runs now. 2000-03-10 23:33:31 +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
Jeff Teunissen
c3a2272a76 Added a missing check for -DHAS_DGA to the #includes for DGA. 2000-03-10 18:40:37 +00:00
Joseph Carter
f0cf5f7776 Console no longer "grows" in GL. New GL cvar scr_consize as a side-effect 
used in debugging, defaults to .5 for half the screen.
 2000-03-10 17:39:54 +00:00
Anton E. Gavrilov
304490f4ed Killed "QuakeWorld: disconnected" in uquake. Added "cl.paused = false" line. 2000-03-09 22:03:56 +00:00
Anton E. Gavrilov
dbbba0a7d1 cl_warncmd fix; cl.paused "fix" --- needed for demo pause 2000-03-09 21:50:55 +00:00
Anton E. Gavrilov
a86d020cc8 Typos, again! 2000-03-09 21:39:56 +00:00
Joseph Carter
932d705285 Fix the results of my last commit... 2000-03-09 15:31:15 +00:00
Joseph Carter
cc8e1219bd Supposedly models should be shaded with colored light now. They don't 
seem like they are to me but supposedly they are shaded.
 2000-03-09 15:13:39 +00:00
Anton E. Gavrilov
a060d2818c Increased console buffer size from 16384 to 65536 2000-03-09 14:02:14 +00:00
Joseph Carter
70b443f25f No colored lights in software - sorry, 256 colors isn't enough. It does 
look sane now however.  Other projects which wish to keep the ability
to render in software better check out the changes - you won't find them
in a tutorial.  ;>
 2000-03-09 12:28:44 +00:00
Joseph Carter
9ffc3e44df Colored static lights for GL! 
If you try to load a 30-version'd BSP (ie, one with colored lighting) you
are gonna find that software renderering looks like shit.  I know what
the problem is.
 2000-03-09 12:05:47 +00:00
Bill Currie
adb6237799 added files to support opendir and fnmatch in Windows. It is up to Tonic to get 
them working :)
 2000-03-09 03:43:37 +00:00
Anton E. Gavrilov
ea57431268 One more fix :) 2000-03-09 02:19:15 +00:00
Anton E. Gavrilov
00eac8e731 Added unalias command; Changed Cmd_ExecuteString()'s order to command-cvar-alias. 2000-03-09 01:22: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
Anton E. Gavrilov
fe5bc787b2 The final (i hope) update to keys.c. Now the keys work just like in Q3 :) 2000-03-09 00:10:57 +00:00
Joseph Carter
271fbb4c8a Colored dlights. We already had them if you had gl_flashblend 1, but they 
looked kinda silly IMO.  Turn off the stupid bubbles, we have real colored
dlight now!

I may put up some of the "outtake" screenshots of the broken lightmap code
as I was writing the support.  Some of them look cool.  =>
 2000-03-09 00:04:29 +00:00
Anton E. Gavrilov
5707c81f3a Yet another fix to keys.c (not the last one :) 2000-03-08 23:39:16 +00:00
Anton E. Gavrilov
931e8f2f47 A temporary fix to console keys' behavior. Backspace, leftarrow and rightarrow work now. 2000-03-08 23:13:53 +00:00
Anton E. Gavrilov
67a854bcbd Sound cvars are always created, even when there is no sound. Now, QF won't crash with -nosound. 2000-03-08 21:47:15 +00:00
Anton E. Gavrilov
bd2524f060 A fix to Con_DrawInput for new console editing style. 2000-03-08 21:35:17 +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
Zephaniah E. Hull
8ce43b2ec1 Header file cleanup, so we can build more stuff which is completely common! 
*.pak support!
 2000-03-08 01:12:26 +00:00
Marcus Sundberg
4e76d7e176 Made the Makefiles work. 2000-03-07 23:13:00 +00:00
Dan Olson
caabae74d3 Added 'cvarlist' command. 2000-03-07 22:28:25 +00:00
Bill Currie
6859b85f30 drawing the disk doesn't work :) fixes segfault in -svga 2000-03-07 07:27:27 +00:00
Eric Windisch
24e1dd5e07 Made volumetric fog use the cvar r_volfog for the density. 2000-03-06 20:57:58 +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
Eric Windisch
7c84bd2f4f Fixed Rules.mk.in, it was causing a break in the compile in the linking of quakefs.c. The gl* files are fixes for stuff inside of #ifdef QUAKE2. Quakefs.c has very minor if any changes. Gl_notes has a few updates for new features. 2000-03-06 19:58:03 +00:00
Anton E. Gavrilov
b5e0a0b45a changed _ftime in Win32 to timeGetTime() 2000-03-06 18:32:18 +00:00
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
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