1
0
Fork 0
forked from fte/fteqw
Commit graph

732 commits

Author SHA1 Message Date
Spoike
2d5cd2ca11 kill a warning with MINIMAL
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3575 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 09:30:16 +00:00
Spoike
ce07219448 Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
Spoike
6f1369ce9e GL_AMD_debug_output. Because we can. Just pipe it to stdout/debug pane.
Also should have fixed the GL error at startup on pre-gl3 drivers.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3568 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-28 21:55:10 +00:00
Spoike
c07cef9555 Fixed waterwarp with non-npot cards. Split doom wad support from doom map support.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3566 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-25 15:12:12 +00:00
Spoike
48457fdfec Less compile errors please.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3560 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-18 12:53:43 +00:00
Spoike
b3543a3b19 Less compile errors please.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3559 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-18 12:52:24 +00:00
Spoike
244c08ad04 Attempted to add support for divVerent's varlen protocol extension info. This is more silencing warnings than anything else.
Also tweeked video code to remove 6 dead sw-only functions.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3556 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-18 08:42:59 +00:00
Spoike
7a75de8dee missed one
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3554 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-14 09:10:12 +00:00
Spoike
3a5149f1dd Trying to break bigfoot's code. Well, if he won't maintain it...
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3553 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-13 21:08:37 +00:00
Spoike
ca2564fe4f I can't test this. I can't even compile it.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3552 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-13 21:07:52 +00:00
Spoike
83ec5e427f Things should compile again now.
Reverted clipping change, its not stable enough.
Optimised player prediction/tracing.
Framerates are a little more competitive now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3549 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-13 09:49:38 +00:00
Spoike
e7ec40d0c8 Trying to fix some leaks.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3547 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-12 22:46:37 +00:00
Spoike
ad3da01975 Should fix some pvs issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3546 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 16:23:04 +00:00
Spoike
16c45dca6e If glx gave us a stencil buffer, tell the rest of the code so they can use it properly.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3543 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 12:12:45 +00:00
Spoike
0b1e3020d3 Trying to kill a few warnings.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3542 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 10:53:13 +00:00
Spoike
1e1084bed7 Changes merged from trunk. Also additional extensive changes. Q3 portals work.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3541 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-07-11 02:22:39 +00:00
Spoike
e6f90bea14 Tweeks to the d3d renderer. Supports various shader features now. Other changes/fixes/breakages also.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3531 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-05-01 22:47:47 +00:00
Spoike
e07f5976b5 Fix EF_ADDITIVE
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3527 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-04-09 10:49:04 +00:00
Spoike
7f82215a40 Fix sprite ordering.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3526 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-04-09 10:48:22 +00:00
Spoike
e220534bc1 Flashblends use the backend.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3523 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-03-26 02:17:55 +00:00
Spoike
3b460e37b7 Reworked polyblends to use the backend. They no longer get stuck quite so much either. Added cl_download_mapsrc cvar (and plugin field) to specify an http location to download maps from (useful for demos, etc). A few other changes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3522 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-03-25 22:56:11 +00:00
Spoike
c0680334c7 What could possibly go wrong?...
Multiple consoles can now be printed/cleared via extra con commands.
Fixed the tab-completion alignment, by adding support for \t characters.
Changing the download mechanisms. Don't try downloading an ftp:// file. It'll probably crash you for now.
Trying to fix load time issues on q3bsps with a lot of curves.
Fixed sprites.
Added warning prints/spam where the new backend is bypassed, thus marking things that still need to be fixed.
QTV proxy fixed to not sit on qw servers unless someone is actually watching. Will ping for status requests still.
QTV proxy now supports ipv6.
QTV proxy now attempts to use the fte browser plugin.
Reworked the browser plugin code, now uses threads instead of ugly hacks. This should make cooperation with other such plugins work. Fixes unresponsiveness of opera, and gives an API that can be used from any other bit of software you want, tbh (read: internet explorer/activex plugins).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3516 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-03-14 14:35:56 +00:00
Spoike
589ef03c05 FTE, now with added C support - no longer treating enums as regular ints.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3509 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-02-06 01:25:04 +00:00
TimeServ
6c425bc3df fix bloom fast sample, limit sample to gl_max_size, use tableless algorithm for diamond size
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3503 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-01-18 20:09:55 +00:00
TimeServ
04d181973a fix glerror for systems without gl_ext_shared_texture_palette
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3502 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-01-18 02:10:55 +00:00
Lance
bfc4c15d48 Fixed a menu crash, tweaked some menus, added bloom options, and a method of decreasing the time vid_restart takes in each menu by not trying to apply menu options which don't differ from the current cvar value.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3500 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-01-17 06:42:30 +00:00
Spoike
1f34680832 Random hacks, ODE works in csqc.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3464 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-17 00:15:44 +00:00
Mark Olsen
3b367ce992 Fixed GL_BeginRendering() here, though that is likely not the only problem.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3459 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-15 10:01:31 +00:00
Spoike
9eabcdcd56 Lots of misc changes in an attempt to reduce ODE jitter, and make it work a little better.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3456 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-15 03:20:17 +00:00
Mark Olsen
7b195eb522 Builds now. Whether it works or not is an entirely different matter.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3450 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-13 18:45:16 +00:00
Mark Olsen
760a084f7a That Matrix4_TransformN3 isn't needed, so disabled it. Also renamed that 'vector' argument to '_vector', just in case it gets used again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3449 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-13 18:43:59 +00:00
Spoike
e6d1ae1a8f more cleanups: csqc now shares collision code with ssqc. Still lacks physics.
gl_rsurf.c has been split into gl specific and generic code - the d3d renderer can now draw the world.
ifdef removed the old server-side mvd playback which had been disabled all this time anyway.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3426 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-07 13:29:15 +00:00
Spoike
4c37c34c13 Fixed some stuff. Cygwin stuff compiles now, so maybe linux will too. I've not tested it though cos cygwin uses software gl rendering, and I'm impatient. Also boosted NUM_SPAWN_PARMS a little, so saved games will break.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3408 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-05 03:07:52 +00:00
Spoike
8ecfac1423 Killed a warning.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3405 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-05 01:07:37 +00:00
Spoike
7188917d6c Whoops, that fixed d3d, but broke GL. Anyway, here's a fix that works for both.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3404 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-05 01:07:08 +00:00
Spoike
f6b3416ce7 Fixed up some stuff so it actually compiles now. Also corrected pixel offsets on d3d chars so fonts are like in GL. Removed the unneeded gl_ppl file.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3403 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-04 23:20:50 +00:00
Spoike
66b78c0b11 Work In Progress branch.
In this version: replacement GL backend. Replacement D3D backend sharing code with GL. Lots of code reorganisation.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3401 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-11-04 21:16:50 +00:00
Spoike
1fb8ab1487 Trying to fix a bug with a map bigfoot gave me. Blame him! Not me!
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3377 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-10-06 00:15:55 +00:00
Mark Olsen
7b9bfe0ae9 Spike for president, less GLSL compile errors! Oh, and happy birthday yesterday, BTW ;)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3374 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-09-16 19:33:50 +00:00
Spoike
ee599e97a6 removed unused var.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3359 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-08-29 17:54:05 +00:00
Lance
4ff8acffb9 Hack to get MinGL to compile again
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3350 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-08-29 15:01:00 +00:00
Spoike
f5e3d5e499 Fix glitching with q3 skies.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3345 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-08-12 08:12:36 +00:00
Spoike
4461e90337 Fix prydon's sprite cursor.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3341 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-08-08 11:09:35 +00:00
Spoike
9357d554f4 mneh
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3335 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-25 13:49:33 +00:00
Spoike
10accd2908 Cleaned up GL a minor amount more.
Sounds can now be recorded while capturing to tga sequences (as raw sound). Fixed frame limits a little.
Passed the unicode key values around to a few more key input functions.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3332 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-25 11:05:06 +00:00
Spoike
4b6f269963 gl_doubleeyes. evil hacks courtesy of id.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3326 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-21 00:43:10 +00:00
Spoike
ff1246589a fixing mingl
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3325 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-20 07:45:05 +00:00
Lance
233ffe7ccd Fixed fisheye, should compile now
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3324 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-20 02:50:00 +00:00
Spoike
f419538b37 Added skygroup command. Also polygon offset cvars. Even though its evil - I'm not sure how long it'll stay.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3321 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-19 20:43:07 +00:00
Spoike
12cccf0e39 ffov implemented in GL.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3320 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-19 18:13:03 +00:00
Spoike
efb1d412a5 if its a vwep player model, pretend to be the real player model for the purposes of skinning.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3319 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-19 17:00:22 +00:00
Spoike
58af42990d Fixed up some EXT_CSQC expectations.
Tweeked interpolation.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3313 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 20:46:42 +00:00
Spoike
086ccd96ae Reduce warnings. Try and peek in the windows font directory.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3305 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 20:15:16 +00:00
Spoike
fdf09ce18b mipmapped non-square textures no longer look terrible.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3298 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 11:06:28 +00:00
Lance
1bb9df702c OpenGL SDL targets will build again
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3294 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 04:07:57 +00:00
TimeServ
40bc6b577c attempt fix other platforms
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3293 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 03:47:21 +00:00
TimeServ
9c9c655d6c attempt fix morphos
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3292 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-18 03:44:10 +00:00
Spoike
4671892cce Removed some unused variables.
Added support for 32bit player skins (with pants/shirt overlays).
Updated spectating name tags to not lag, and be centered. Also visible by default.
Smoothed out viewweapons slightly in certain cases (when they're not animating at 10fps).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3290 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-17 22:28:16 +00:00
TimeServ
4b2c4ed77a remove more unused sw variables
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3289 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-17 22:15:37 +00:00
TimeServ
a94a33212c destroy software rendering and break everything (and that won't be all!)
also note that merged builds on non-windows no longer make much sense

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3283 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-16 22:06:59 +00:00
Spoike
57c9515b39 Updated QVM apiFixed up some of the slowness in the sky/water warping code.
Enabled freetype in gl builds. It'll try to link dynamically. Headers are included for windows users. unix users will need the freetype2-dev package for their system, sorry. you could probably get away with editing the makefile to include the headers if that's a problem.
Fixed occasional missing skies.
Updated q1qvm api stuff version (to 13).
Cleaned up the ban code. There are no longer two separate mechanisms to ban people.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3279 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-14 23:42:54 +00:00
Spoike
33bdcfb367 Link dynamically to freetype.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3278 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-14 15:59:49 +00:00
Mark Olsen
5aad58610a Always grab the mouse in fullscreen mode. Use Key_MouseShouldBeFree() instead of peeking the mouseusedforgui global.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3266 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-12 18:57:40 +00:00
Spoike
d96cdc237c Indeed I suck.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3265 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-12 18:03:39 +00:00
Spoike
9728dde4ac Trying to fix grey stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3264 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-12 17:00:52 +00:00
Spoike
27fddffedb Does that fix mac gamma? (can't test this stuff)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3263 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-12 15:26:47 +00:00
Spoike
942af209a7 Apparently it didn't compile.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3262 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-12 15:01:18 +00:00
Spoike
b5ac90d523 More stuff broken.
Added control over texture coords on particles. Switched them to batch based on common render state. Less state changes there now.
Inverted sorting, to aid depth culling.
fullbrights use vbos too now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3261 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-11 20:56:09 +00:00
Spoike
3b9f4c9fbb Made so lines don't jitter around if its drawing wireframe because of no surfaces.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3258 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-11 18:25:03 +00:00
Spoike
921bfbb1d3 Fixed some warnings.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3257 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-11 18:23:57 +00:00
Spoike
386aac4da7 Stub out bindbuffer if its not present. The generation code will work around it. The renderer will ignore it.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3256 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-11 18:23:07 +00:00
Spoike
6147a2dcd3 That should fix bigfoot's shift.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3245 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-07 21:32:54 +00:00
Mark Olsen
632cba0618 No, Spike, you're not programming C++. Besides, b was already declared once.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3240 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-06 13:33:12 +00:00
Spoike
e1ab049608 Attempting to fix recent breakages.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3239 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-06 07:45:46 +00:00
Spoike
18b617f4a1 vweps.
added builtin float(float modidx, float framenum) getframeduration = #277; to both csqc and ssqc.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3236 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-06 01:20:20 +00:00
Spoike
a80214290d Oh noes! Everything is broken!
Rewrote much of the console code. Should be no obvious differences.
Nearly all conchar parsing goes via a single function. Still some left in the dedicated server code.
Added the ability to parse utf-8 text, disabled by default.
Added the ability to input unicode chars using whatever keymap the user has set up in windows (not enabled by default).
Reworked vbo stuff to be a little more versatile.
Added toggle console command.
Added freetype2 support (not compiled by default).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3234 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-07-05 18:45:53 +00:00
Spoike
06b20185b5 cmd efpslist now shows incoming/outgoing packet rates per client, too (expressed in bytes per second - same as rates).
Semi-colon can now be bound properly in the menus.
Fixed a bug with one of my more recent commits.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3229 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-23 21:49:44 +00:00
Spoike
2d8dba797a Gcc is more fussy than msvc
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3227 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-22 06:07:33 +00:00
Spoike
f2cce499f6 Multiple minor cleanups. Chunks of dead code removed.
Added com_parseutf8.
Z_EXT_VWEAP is supposedly supported serverside, but not clientside. It is not advertised, and not used, yet.
Fixed csqc mouse issues in linux, supposedly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3226 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-06-21 17:45:33 +00:00
Spoike
6b21ccabee ATI suck almost as much as I do
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3205 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-05-25 14:05:35 +00:00
Spoike
0afe8f9dc5 Didn't test all targets.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3196 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-05-24 10:28:26 +00:00
Spoike
9cd988a836 Added csqc->ssqc requests.
Fixed up cl_indepphysics. Sending is fully independent, bar sync points.
Fixed so #if 0 works in qc code.
Fixed up error conditions in qclib when features are not supported.
The webpage generator will now refcount properly.
Fixed error conditions when using glsl shaders.
If MULTITHREAD is defined, r_loadlit will not light inside a separate thread.
We now generate VBOs for bsp objects. Shaders/rtlights don't use them yet.
Fixed up MVD/multiview playback a bit. It now looks like it works! (cl_hightrack will no longer track the same person in all views).
Fixed error conditions when attempting to download versioned csprogs.
Reduced the number of places that a q3-style marked up string is expanded. I think there are a couple places left still though. Approximated ezquake colour codes.
Memory mapped read file access in win32, where we can. Not sure about this. Lets see how things pan out.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3195 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-05-24 10:11:17 +00:00
Spoike
48e757c860 cosmetic changes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3194 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-05-21 09:36:18 +00:00
Lance
84117bd7e3 MinGL & Merged targets added to SDL. Dedicated server, OpenGL & Software rendered SDL clients now build in Linux
and run but untested. r3162 was to resolve the SDL MinGL's build error: undefined reference to `NET_Sleep'


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3163 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-07 03:48:32 +00:00
Lance
f2688e7866 My attempt to get SDL binaries under Linux to compile
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3159 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-06 14:19:29 +00:00
Spoike
a838650a40 try that
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3155 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-06 01:01:31 +00:00
Spoike
2adb420a6d Reworked the console/loading screen a little. The console is no longer directly shown at startup. MSVC2005 project files update for npqtv.
Added vid_wndalpha to make the window transparent (only supported in GL-win32).
Multiple issues with SW rendering, which I'll fix eventually. It does at least run, even if it looks ugly.
Plugins are now able to read the console input. Bigfoot, feel free to tweek.
Fixed up a few mismatched prototypes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3153 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-06 00:34:32 +00:00
Spoike
0eb7e83965 Stuff should compile a little better with GCC now.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3150 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-02 22:25:54 +00:00
Spoike
4974c57c2c Big fat-off commit.
A few changes. Half-Life support is finally getting committed.
Some unnecessary filesystem code changes.
And there's code for nsapi - meaning we can embed FTE in a browser (firefox and opera on windows work).
A couple of CSQC changes, trying to move towards a final EXT_CSQC_1.
Revised ruleset format finally implemented.
Doesn't compile with msvc6 due to issues with libjpeg not being a clean library.
Presumably its fine in vs2005.
Your mileage may vary.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3148 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-04-01 22:03:56 +00:00
Spoike
b763b5594d My monthly commit. I wonder what I broke.
Contains some stuff to get twig working a little better.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3132 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-03-03 01:52:30 +00:00
Spoike
af1ccb9333 Support for valve-style lmps/qpics on the conback.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3128 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-02-22 13:47:49 +00:00
Spoike
02b182a260 Fix a crash with halflife sprites.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3127 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-02-22 13:46:48 +00:00
Spoike
aac9d42554 Fixed up halflife model support - we now support models with textures stored in an external model.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3126 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-02-22 13:45:35 +00:00
Spoike
672035b1a9 Fixed particles.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3124 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-02-10 21:50:10 +00:00
TimeServ
8b658df029 attempted vs2008 compile fix
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3102 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-01-18 01:47:48 +00:00
Spoike
4b1032c337 Script particles and d3d renderer will now build again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3099 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-01-15 04:58:12 +00:00
Spoike
9fc7a20e9c old fixes including for rgb_gen_topcolor in shaders
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3098 fc73d0e0-1445-4013-8a0c-d673dee63da5
2009-01-15 04:56:44 +00:00
Spoike
6e3f69f504 d3d rendering is diabled (framestate, read later - merged will compile just sw+gl for now).
fte particle scripts are disabled (classic works).
I'll fix these in the new year.
Redid framestate stuff again. Slightly better now, but this is the bulk of the changes here.
Reworked the renderqueue to provide batches of items instead of individual items. This cleans up the particle rendering code significantly, and is a step towards multiple concurrent particle systems. fte's scripted particles are broken as I'm trying to find a way to rework them to batch types together, rather than having to restart each batch after each particle when you have two particles in a trail. I'll fix it some time.
Reworked some alias model code regarding skeletal models. Added some conceptual skeletal bone control builtins available to csqc. Currently it can query the bone names and save off animation states, but can't animate - its just not complete.
Added more info to glsl custom shaders.
Updated surface sorting on halflife maps to properly cope with alphaed entities, rather than just texture-based blends (q2-style).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3095 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-12-23 02:55:20 +00:00
Spoike
0aac90de3b Correctly colour the tops of players again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3087 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-12-06 02:04:29 +00:00
Spoike
1b1f67bbfb Revamped FTE's skeletal animation system to support basebone/baseframe/baseframe2/etc on hierarchical skeletal models (eg: zym/dpm/md5anim).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3079 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-12-02 23:09:02 +00:00
Lance
41a92be8b2 Defined GL_BGRA_EXT so morphos and macosx crosscompilers can do the OpenGL targets again
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3058 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-11-12 12:05:29 +00:00
Spoike
dce284811e Minor update...
Q3 clients can connect to q1 gamecode (sv_listen_q3).
hacked support for SendFlags. It'll work compatibly, just not efficiently.
Unified shared qc builtins.
fteqcc supports int |= float, more params in macros, &~= operator.
Additional recent DP QC extensions.
Particle system abstraction. 'r_particlesystem classic' (vs null or script) will revert to truly classic particles.
Nexuiz might run again.
Network address revamp (sv_port and sv_port_ipv6 can both be used to specify an ipv4 address:port and both corrently accept clients). localhost now properly favours ipv4 (use ::1 for ipv6 localhost).
Download system revamp.
Numerous other changes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3051 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-11-09 22:29:28 +00:00
Spoike
9f5fb267c3 Makes nexuiz's csqc work ever so slightly better (pics with size 0*0 now mean to draw at the natural size, instead of 64*64...).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3039 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-10-05 02:58:22 +00:00
TimeServ
828b3e99ab fix a few casting issues allowing maps such as warpa, etc. to load (probably not done here)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3028 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-08-06 12:11:27 +00:00
Spoike
c29cf3db99 Framerate will be more stable when picking up items/getting shot/etc.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3025 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-07-16 00:19:33 +00:00
TimeServ
0adc1e1054 clear colorshifts on disconnect, don't decrease cshifts on gamma change, fix warning
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3009 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-06-12 23:19:47 +00:00
Spoike
5b1679ad85 Molgrum doesn't like bgr, even though x86 display hardware uses it.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2996 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-06-03 22:16:39 +00:00
TimeServ
5c65851fb7 fix merged build (d3d color references, renderinfo fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2993 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-06-01 22:34:19 +00:00
Spoike
519983dee2 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2992 fc73d0e0-1445-4013-8a0c-d673dee63da5 2008-06-01 22:06:22 +00:00
Spoike
654eabc4c2 Reworked stats for csqc to match LH's suggestion. CSQC can read the 'delta' entities (experimental). Fixed up sv_getrealip, made banning work based on realip too. Added a ban command to easily ban a single client. Renamed some svcs for clarification. Added pvsflags to ssqc for greater control over how ents are sent to csqc. Broke some stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2977 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-25 22:23:43 +00:00
Molgrum
61ee26d0ff Fix an uninitialised value.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2960 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-16 23:28:47 +00:00
TimeServ
a61d819f68 fix hash table inits, fix shader inits
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2959 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-14 18:06:58 +00:00
Molgrum
55071c68e4 Implemented DGA-code similar to Fuhquake, works much better.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2954 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-13 11:16:20 +00:00
TimeServ
ce5cb75832 this commit will most likely break things: main Z_*/BZ_* calls no longer have zone logic, tagged allocs redone and now partially thread safe (still Sys_Error), code using reallocs should no longer assume new memory is zeroed, minor mysql fixes
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2951 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-05-09 14:22:37 +00:00
Molgrum
c1f86620db Backpacks are visible again, now let's throw lots of eggs at Spike.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2934 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-24 19:20:51 +00:00
Spoike
b134fd9e65 Cleaned up the bloom code a little, fixed bloom so view2/splitscreen doesn't cause the main view to get a double dose, by pulling the pixel offsets from outside rather than recalculating them (thus no longer wrongly assuming a full screen). Made the code slightly more readable - no more ugly braces!
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2930 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-21 03:19:46 +00:00
Spoike
9060465c0e Fixed r_shadows 1 on nvidia hardware, and a little paranoia.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2929 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-21 03:13:59 +00:00
Spoike
7b8e20d0ae Fixes the black lines bug.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2927 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-16 15:57:46 +00:00
Spoike
794ac6d3d3 Don't leave the mouse grabbed if the video mode failed.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2926 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-16 03:41:15 +00:00
Mark Olsen
c343bc3b6a printf()s, be gone.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2922 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-14 12:45:08 +00:00
Spoike
406a7645a5 Okay, that ruleset cvar actually works now, correctly locking out modified textures on backpack.mdl
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2911 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-08 23:26:25 +00:00
Spoike
10f49b7705 Support for x11 mwheel conventions instead of traditional support, and hopefully fixed gamma on task switches in the glx renderer.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2908 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-05 00:38:41 +00:00
Molgrum
1e64dfd76d Patch from Spike. Two new ruleset cvars, one that prevents custom eyes models, one that prevents custom skins on packs/eyes (this doesn't work yet, needs fix).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2898 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-02-01 15:21:14 +00:00
Spoike
2801b70dd2 Attempts to fix the quad/pent glows not appearing on bots (normal style). More changes than strictly necessary to clean up combined gl_flashblend and r_dynamic usage.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2877 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-24 01:24:10 +00:00
Spoike
cc14795cba Model clamping finally implemented. Please test :)
Moved the call to PreNewMap to a bit earlier.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2864 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-19 05:59:00 +00:00
TimeServ
d46a2ca5d5 remove GL_Smoothfont_Callback in reinit
set gl_smoothfont as CVAR_RENDERERCALLBACK

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2862 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-16 04:57:44 +00:00
Spoike
4dcbbf5054 Fixed bugs regarding reading the pcx file format for player skins.
Fixed a bug in the colour-mapping code regarding player skins with sizes smaller than the player's model's skin, and optimised the uploaded image size when small skins are used.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2860 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-16 03:19:14 +00:00
Molgrum
01483e5e89 Patch by Spike, don't let gl_texturemode2d affect the console font.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2859 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-16 00:27:28 +00:00
TimeServ
9f09a30019 r_fastskycolour accepts rgb format
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2857 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-13 05:05:30 +00:00
Spoike
aeef86dc62 New cvar, vid_preservegamma. Set it to 0 to obliterate your old gamma settings when you leave FTE. This mimics the use of quake3 to reset your gamma settings should FTE crash on you. The default is to restore gamma settings to how they were when you first loaded FTE, the same as before. You can now use FTE to reset your gamma if FTE crashed and broke it. Only applies to the windows version so far.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2850 fc73d0e0-1445-4013-8a0c-d673dee63da5
2008-01-09 00:37:17 +00:00
Molgrum
3b1ac20640 s/componants/components + missing newline.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2767 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-29 06:06:20 +00:00
Molgrum
30daf3a9e7 r_replacemodels didn't work when gl_load24bit was 1, should be the other way around.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2756 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-23 03:14:25 +00:00
Mark Olsen
45c953d819 Added non-public constants.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2753 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-20 15:54:04 +00:00
Molgrum
a7d75f8889 DGA mouse support compiles now, maybe.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2749 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-17 14:09:43 +00:00
Molgrum
612674fc53 Merged builds again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2741 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-12 13:23:46 +00:00
Molgrum
0b046e2f5e s/possabilities/possibilities, sv_displaypossabilities has changed name.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2727 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-08 12:56:17 +00:00
Molgrum
8482bc2c52 More warnings fixed in D3D.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2724 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-06 15:33:38 +00:00
Molgrum
0f02f12b8b s/compatable/compatible (take notice that sv_compatablehulls will have a changed name too)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2717 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-05 18:08:47 +00:00
Molgrum
379efc8376 s/thier/their
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2716 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-05 17:43:26 +00:00
Spoike
fb99c6f501 I suck
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2713 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-05 14:17:55 +00:00
Spoike
f9277a9e74 Made minimal builds compile again, hopefully.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2712 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-10-05 14:11:17 +00:00
Spoike
e59d02ed52 We now have a really crappy gl renderer for macosx.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2689 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 22:00:19 +00:00
Molgrum
43c48f23e6 Include the alloca-function.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2687 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 15:52:35 +00:00
Mark Olsen
faac72835c SP_#? -> CON_#?
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2686 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 15:28:06 +00:00
Mark Olsen
b97f2c5d69 No more HandlePause crap.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2685 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 15:20:46 +00:00
Mark Olsen
4828fb8947 vid_curpal isn't needed with GL.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2683 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 09:57:48 +00:00
Mark Olsen
93a505f0a8 Now registering the in_xflip cvar.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2682 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 09:55:38 +00:00
Mark Olsen
6a6ae57c84 Added a dummy GL video renderer.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2681 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-23 09:53:41 +00:00
Mark Olsen
7bbd3c539d Fixing some fallout from Spike's commit.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2678 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-22 22:43:05 +00:00
Spoike
0a682a76d6 Resolved conflicts with macosx header files
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2671 fc73d0e0-1445-4013-8a0c-d673dee63da5
2007-09-22 19:28:27 +00:00