Ragnvald Maartmann-Moe IV
84461e1f1f
More merging.
2001-04-15 04:45:07 +00:00
Bill Currie
6a696881b3
these are now in libs/video/targets
2001-04-15 04:40:09 +00:00
Bill Currie
9d8c1d33c0
these are generated, so aren't needed in cvs
2001-04-15 04:36:27 +00:00
Ragnvald Maartmann-Moe IV
66fafd3e0e
First stage of video and input system merge. The city has collapsed, wreckage sifting ensues...
2001-04-15 04:18:22 +00:00
Bill Currie
bd0fab4ce1
vid_wgl in qw now uses vid_common_gl. probably doesn't work
...
compile fix for merged glquake.h in vid_wg.c in nq
2001-04-15 03:17:03 +00:00
Timothy C. McGrath
9f583076f8
Made necessary changes to includes to get files to compile, got
...
directions from despair :)
Misty-chan
2001-04-15 00:39:29 +00:00
Bill Currie
5859b3dd1f
merge glquake.h. Rather messily done, but it works and all clashes were
...
sorted out on the nq side assuming that qw did it right (which it does:)
2001-04-14 21:22:08 +00:00
Bill Currie
c0507f5610
update for the lastest alsa pcm mmap api. not as bad as at first appearance
2001-04-14 02:30:30 +00:00
Bill Currie
8fef64c064
V_CheckGamma WILL get called before vid_gamma gets set in gl, so protect
...
against that circumstance.
2001-04-14 02:27:19 +00:00
Bill Currie
fa99cb304b
forgot to add it to GLX_LIBS
2001-04-14 02:06:02 +00:00
Bill Currie
c46f1046f0
add -lXext to the glx test link lines
2001-04-14 01:52:10 +00:00
Bill Currie
475a0b0d4a
must not call snd_pcm_mmap_forward with a count of 0
...
this fixes the alsa assert at slower rates
2001-04-13 08:08:41 +00:00
Jeff Teunissen
bffe67977c
Gamma cleanups. Brightness and contrast are gone from software, since they
...
won't work with proper gamma control anyway.
2001-04-13 08:02:11 +00:00
Bill Currie
9a2df9a2d5
use hash tables in Skin_Find
2001-04-13 06:56:45 +00:00
Ragnvald Maartmann-Moe IV
9ff89960f2
Fix hw gamma in -sgl.
2001-04-13 06:53:35 +00:00
Chris Ison
1b40eb715a
fixed m_filter CVAR type, started on gamma for 3dfx
2001-04-13 04:25:06 +00:00
Bill Currie
deac792513
damn, not only did that not fix the problem, I broke stuff
2001-04-13 03:33:56 +00:00
Bill Currie
ee7d43f6ae
fix the "Couldn't load skin skins/dvc-c.pcx" skins problem
2001-04-13 01:45:37 +00:00
Bill Currie
5278f9fd73
put the gamma code into vid.c where (IMO) it should have been.
...
give vid_fbdev VID_SetGamma
mame vid_common_gl and vid_common_sw of their gamma code (vid_common_sw is
now empty:/)
rewrite VID_InitGamma to do the right thing with cvars with callbacks
gl clients have [temporarily?] lost the CVAR_ROM on vid_gamma
2001-04-12 23:44:56 +00:00
Bill Currie
f37b007da2
nuke the memset in Hunk_HighAllocName
2001-04-12 23:39:23 +00:00
Bill Currie
6b3b94bafc
sound crashing bug fixes
...
snd_dma.c, {nq,qw}/source/cl_parse.c:
change the type of snd_worldmodel from * to ** and init snd_worldmodel
with the ADDRESS of cl.worldmodel so its changes get seen by snd_dma
snd_mixa.S:
picize
2001-04-12 06:53:07 +00:00
Ragnvald Maartmann-Moe IV
3a395dd87f
Fix black screens in -sdl, and lack of gamma correction in -sgl.
2001-04-12 06:26:14 +00:00
Timothy C. McGrath
f35a629c61
Since the lights are usable now, I'm changing my config :)
...
Misty-chan
2001-04-12 04:08:49 +00:00
Ragnvald Maartmann-Moe IV
f2435b8a64
Round, rather than truncate.
2001-04-12 03:48:26 +00:00
Bill Currie
a3215e4dd0
at long last, nq-wgl builds. probably as broken as hell, though
2001-04-11 21:55:27 +00:00
Bill Currie
6a6d75b824
gah, more libqfsys. also fix up nq-wgl build info
2001-04-11 21:24:50 +00:00
Bill Currie
f7d9c1e8fc
joy_win.c now builds, but very likely does not work AT ALL. also fix qw's
...
in_win.c for the new input api
2001-04-11 21:06:37 +00:00
Bill Currie
734461092f
fix redef of APIENTRY
2001-04-11 21:02:56 +00:00
Bill Currie
b025bb32e1
first steps
2001-04-11 19:56:01 +00:00
Bill Currie
99fd4ab464
libs/video/targets/Makefile.am:
...
out-of-tree compile fixes
nq/source/Makefile.am:
missed the -lqfsys
2001-04-11 16:47:08 +00:00
Bill Currie
ebb7b6310a
view.h:
...
it seems somebody forgot to commit this. just compied direct from qw
libs/video/targets/.gitignore:
better ignore rules
nq/source/Makefile.am:
libqfsys.a is dead :)
the rest:
gamma compile fixes
2001-04-11 16:19:08 +00:00
Ragnvald Maartmann-Moe IV
f789b61c56
Merged joystick code. Great deal of cleanup in input, reduced bizarre overuse of protocol.h...
...
Maimed joy_win.c, very likely to get odd behavior there, even if it compiles.
2001-04-11 07:57:08 +00:00
Jeff Teunissen
5cd24de097
Hardware gamma support in QW. Currently, only -x11 and -glx will
...
build. Look at their vid files, as well as vid_common_{gl,sw}.c to find
out what will need to be added to the rest of the video targets.
2001-04-11 07:16:34 +00:00
Jeff Teunissen
43fd681809
add types to a couple prototypes
2001-04-11 06:05:39 +00:00
Joseph Carter
e1d9546c08
Moved CodingStyle to doc
2001-04-11 05:30:17 +00:00
Bill Currie
47d89d73c2
nq-wgl tries to build, but ld segs :(
2001-04-11 05:23:12 +00:00
Bill Currie
4ae2ad2949
qw-client-wgl now builds (nq-wgl next)
2001-04-11 05:10:42 +00:00
Bill Currie
12c14bd71f
split up console like sys was
2001-04-11 05:10:04 +00:00
Bill Currie
fa936b1713
back out rhamph's premature commit
2001-04-11 04:17:55 +00:00
Bill Currie
09271f061a
somehow missed this earlier
2001-04-11 03:55:48 +00:00
Bill Currie
fa3851b11f
ignore the results of building mingw in here
2001-04-11 03:39:32 +00:00
Adam Olsen
26747ed79a
Ooops, back out premature commit
2001-04-11 03:28:29 +00:00
Adam Olsen
c45a4d2550
fix harmless cut&paste error
2001-04-11 03:22:52 +00:00
Bill Currie
f36fa31ba2
build snd_mixa.S at all times. it does the right thing when no intel asm is
...
wanted.
2001-04-11 03:16:01 +00:00
Bill Currie
9cd83e178f
various fixes for out-of-srcdir building
...
configure.in:
foo/Makefile MUST come before foo/bar/Makefile or foo/bar will NOT be
created.
libs/*...*/Mkaefile.am: add INCLUDES so $(top_scrdir)/include gets searched
{qw,nq}/source/Makefile.am: fix fbset compiling (and cleaning for nq)
2001-04-11 03:09:24 +00:00
Adam Olsen
0f98bc01be
Forgot to edit the comments :)
2001-04-11 02:42:53 +00:00
Adam Olsen
320bd35f1e
Move common variables in snd_dma.c and snd_null.c into snd_common.c
2001-04-11 02:41:12 +00:00
Adam Olsen
2b4d8ecc97
Remove some extra files linked in with snd_null.c
2001-04-11 01:17:08 +00:00
Joseph Carter
75aa40276f
A few more. Also removed a couple inaccurate comments.
2001-04-11 00:10:19 +00:00
Joseph Carter
2bc55b7828
Cvar cleanups.. NULL is now used in place of 0 for callbacks, this should
...
make Cvar_Get's a lot easier to read.
2001-04-10 23:39:30 +00:00
