Commit Graph

414 Commits

Author SHA1 Message Date
Spoike fbf5069a38 Fixed http server on linux.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5176 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-12-02 22:30:08 +00:00
Spoike 7314c78135 bump android ndk version
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5173 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-11-24 23:02:46 +00:00
Spoike 4896954c8a apply lmgamma to rbsp vertex lighting
opus should now be statically linked or something
made the denormalised floats warning look less scary.
fix the console-making-hud-pics invisible issue

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5172 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-11-24 18:40:17 +00:00
Spoike 52f0f117ab fix Q3BSP-without-Q2BSP bug.
reworked deferred rendering to support specular. mrt can be reconfigured by TCs if desired.
reworked q3bsp deluxemap code (so it no longer bugs out).
fixed a few warnings.
updated fteqcc to try to cope with xonotic. still not working (xonotic fails from bound checks).
reworked shader conditionals to support elif. added some directives from QF(aka: warsow)

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5158 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-10-31 22:52:58 +00:00
Spoike b8d0718b5c Attempt to work around a gcc bug with -dumpmachine by using -print-multiarch with a second workaround. gcc sucks.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5157 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-10-25 09:43:01 +00:00
Spoike 7dc01f7362 android port updated. egl now handled by native code, which means we now have proper control over everything and can default to gles2. requires android 2.0+. vulkan-on-android renderer added, but not tested.
added .ktx image support as an alternative to .dds, primarily for etc2 compression (which should work on all gles3 devices, or gl4.3), only known representations will work.
rework z-fighting workaround. now only enabled on known vanilla maps.
added splitscreen option to the singleplayer menu.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5154 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-10-13 17:50:28 +00:00
Spoike 0c8ad17f7c Fix various compiler warnings.
Added sv_guidkey cvar, allowing cross-server guid key generation (although it lacks auth).
Support .ico, because we can.
preliminary support for sdl 2.0.6's vulkan stuff. will wait till its actually released before its properly used.
Fix capturedemo.
videomap should typically use premultiplied alpha, apparently.
Updated sound drivers. No more old drivers. Better cvar registration. More drivers optionally support float output.
Added certificate log for dtls connections.
Rewrote font char cache, now supports full unicode char range, not just ucs-2. Attempt to support FreeType 2.5+ rgba fonts.
XMPP now supports carbons, and shows avatars in conversations. Updated xmpp's scram auth to be more strict, including the plus variation (hopefully), to block evil tls proxies.
ffmpeg plugin now uses the decoupled api for decoding too.
Cef plugin updated to support fte-scheme post data properly, as well as request/response headers (like cross-origin).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5148 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-09-20 11:27:13 +00:00
Spoike bc0dd0492c fixed a couple of stupid things.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5141 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-08-14 17:43:13 +00:00
Spoike 0a6cbdf39a Fixed an issue with dependancies getting re-downloaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5139 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-08-12 19:32:09 +00:00
Spoike 776b8f6565 Added .dz playback support.
demo menu now properly lists the contents of archives.
demos played from subdirs/archives can now chain properly.
autodetect nehahra's demos. Add -nehahra argument to register/override cvar defaults (and set the right gamedir+startmap).
fix some q2 download bugs.
lame attempt at proper sRGB support (gl+vk+d3d9+d3d11 renderers).
fix q3bsp wrong-lightmaps bug.
match DP's viewzoom behaviour by not applying it when VF_[A]FOV was explicitly used.
fix d3d9 issue with missing textures screwing up blend modes.
vk: use a staging buffer instead of a staging textures per mip.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5128 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-07-12 08:15:27 +00:00
Spoike b2824ee266 Try to fix android+emscripten builds.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5119 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-06-23 20:36:35 +00:00
Spoike 2bf193001b implement pcma+pcmu codecs for voip for xmpp compat, because they're fairly simple and I can.
remove MAX_MAP_LEAFS limit, although its still checked for sanity (just MUCH higher). You may need 64bit processes on account of the pvs+phs memory required.
integrated my fork of frikdec into fteqccgui. Just associate .dat with fteqccgui and it'll decompile the progs (compiling will then embed the decompiled source into the resulting .dat to avoid repeated decompilation). Be sure to back up first... not tested as a 64bit process.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5114 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-06-21 01:24:25 +00:00
Spoike 445e7f476b a dos port, as a dig at eukara about his xbox port project.
mouse+kb+soundblaster devices should work.
you can compile a dedicated server, but the lack of any networking support makes it a bit pointless.
the software renderer will work, but its crap and gets absolutely dire framerates.
there's no code to init mesa or anything, so its crappy-software rendering only.
I doubt anything useful will ever result from this, but it was still interesting to do. possibly the only useful thing to come from this will be from limiting ram use.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5104 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-19 03:32:02 +00:00
Spoike e5db7c32ba git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5102 fc73d0e0-1445-4013-8a0c-d673dee63da5 2017-05-10 05:05:39 +00:00
Spoike f449b0eb88 Small tweaks to get libav working as well as ffmpeg, for old debian versions. Some other tweaks too
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5098 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:57:34 +00:00
Spoike 85da162f49 Try to fix up some linux / build script stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5095 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-04-29 02:45:21 +00:00
Spoike 46d3fedc14 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5091 fc73d0e0-1445-4013-8a0c-d673dee63da5 2017-04-18 13:47:02 +00:00
Spoike 09ec3bf6ea added explicit 'blend rtsmoke' particles that are intended to lit by rtlights without needing to override shaders.
addtrisoup_simple now supports line lists too.
fix a memory leak in the sound code.
fix chunked http download corruption in certain cases.
reworked the networking associated with entity editing. now carries ids instead of indexes (qc isn't aware of them).
'map blarg.map' will now auto-create a dummy map if it does not already exist. this should make it easier to get started with map editing.
fix some issues with banning yourself - loopback can now mute etc themselves, but not ban themselves.
downloads/updates menu now handles plugin detection. user-installed plugins will result in a prompt allowing the user to enable/disable/delete them. This makes using plugins more explicit.
revamped help menu to remove m_state
fix silly ode copypasta bug, added preliminary bullet code in case anyone is interested.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5090 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-04-18 11:12:17 +00:00
Spoike 81a9c45efa Added the build-everything script from triptohell to the svn. Made more generic, and included a second script to install emscripten+android+nacl dependancies. Updated the makefile and fixed a couple of bugs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5089 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-04-16 09:27:43 +00:00
Spoike aef821b9c6 Makefile tweaks to make building more robust with respect to android sdk changes.\nFix video capture on linux.\nSupport a few more jpegs.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5088 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-04-10 07:52:18 +00:00
Spoike 4fcfe8abb0 droid: new icon from eukara that doesn't have the resized uglyness.
droid: support qw:// scheme
droid: finally added touch.cfg with some crappy programmer art to go with it.
mvd: new name cleanup logic when recording, to avoid some more chars.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5077 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-03-26 01:46:08 +00:00
Spoike 1946cdc694 fix some warnings. d3d8 renderer builds with cygwin's mingw.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5076 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-03-21 17:51:34 +00:00
Spoike f80cafc6fa small fixups for the d3d8 renderer, to give eukara the conflicts that he asked for. disabled by default, because I cba to deal with the dxsdk headers.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5075 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-03-21 17:35:27 +00:00
Spoike 1b88cda2db Fix some silly issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5066 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-02-28 05:04:41 +00:00
Spoike e7c1f9a490 rework config.h stuff a little, fixing up numerous ifdefs etc. added some more for potentially smaller builds.
make the 'identify' command assume that a single decimal number is not an address (allowing it to be handled as a user id).
qcc: support default initialisers in function calls.
tweak filesystem code to try to flush individual files instead of discarding the entire fs hash.
fix 'snap' stuff.
other tweaks...

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5058 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-02-19 00:15:42 +00:00
Spoike f03a578eaa misc fixes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5054 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-02-01 04:42:33 +00:00
Spoike 03d96bff72 first attempt at webvr support. probably totally crap.
fix hitmodel with skeletal models(can also now support lerps, skeletal objects, etc).
more hlmdl fixes for eukara, including hitboxes.
modelviewer can now display bones.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5033 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-12-19 13:31:05 +00:00
Spoike 6e825e42dd merge gl+vk win32 code. include egl support on windows (useful for ANGLE).
fix misc bugs.
rewrote skeletal code to use gpu-friendly skeletal data for all skeletal formats.
add modelframecount builtin, to easily get the number of frames in a model.
integrate hlmdl a little better.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5031 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-12-13 11:50:15 +00:00
Spoike 018aed2c19 fix some linux library issues. should no longer be quite so dependant upon dev packages...
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5022 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-11-02 08:01:21 +00:00
Spoike eefc950400 particles: rework r_effect, such that its possible to project particles forwards
particles: add an emiteffectnum field (and support emiteffect+traileffect psuedo-fields), for reliable emissions that are not framerate dependant (emitted forwards by default...
particles: rewrote 'sky' surface emittance. can now emit from submodels too.
particles: be more verbose about unknown mode keywords, instead of silent.
server: add basic misc_model emulation, for mods that don't implement one.
quake2: better r1q2 compat.
renderer: rework mindist+maxdist, should be more consistent as well as more reliable with orthographic matricies. has actual VF_ enumerations now.
sound: fix CF_FOLLOW to not crash, and work with openal.
client: 'cl_loopbackprotocol nq' now uses appropriate protocol extensions.
fs: try using /usr/share/games/foo by default, if it exists.
server: uncap drate if unspecified, do not fall back on rate.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5021 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-10-22 07:06:51 +00:00
Spoike 57dfaea5fd cl_clock 2; now gives a 12-hour clock.
fix configs not getting execed properly when not run from the automatically detected basedir.
fix some silly bugs.
qcc: remove deprecated %5 support without qccx syntax.
qcc: added -Fembedsrc to embed the sourcecode into the progs in a form that can be read with various standard unzip programs. This works without breaking any engines.
server: fix memory explosion issue with fitz666 clients.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5016 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-09-01 14:31:24 +00:00
Spoike c08a0aa139 fix some of the things that baker didn't like. sorry it took so long.
try to appease msvc6, just because.
update the downloads menu. now even betterer!...
fix proquake server angle snapping precision issue.
also accept _glow textures as an alternative to the more standard _luma.
compat for dp_water shader terms. tcgen stuff is still fscked up.
menu tooltip code can now properly deal with variable width etc stuff.
add missing te_flamejet builtin.
r_dynamic -1 can now cope with q3bsp for a small speedup.
added -watch commandline arg, to make it easier to figure out where cvar changes are coming from.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5015 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-08-25 00:12:14 +00:00
Spoike 74a7dff814 Make sure vk+x11 can deal with window resizes properly. Fix some warnings. Deal with hardware that uses gamma ramps larger than 256 entries on x11.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5011 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-07-28 15:57:22 +00:00
Spoike 151bd6d0b1 vulkan: rewrote render target stuff so bloom, r_projection, fxaa, should now be working.
gl: fix r_projection when using vid_restart.
hdr: fixed iris stuff to work in more renderers.
ircclient: don't disconnect instantly. that's just stupid.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5010 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-07-28 13:18:22 +00:00
Spoike 934a97c53e fix some compile issues (errors and warnings). sdl, ode, vulkan.
fix q2bsp textures.
fix some vulkan validation issues.
MOVE_OTHERONLY is now an official feature (replacing MOVE_ONLYENT which is now removed, same functionality, better behaved behaviour).
network up edited brushes on initial connect. still needs more work for entity editing, but should otherwise be okay for now.
add sys_browserredirect console command for emscripten builds (can be used to trigger window redirections - including download requests)

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5001 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-07-15 12:26:24 +00:00
Spoike 27a59a0cbc LOTS OF CHANGES. was hoping to get revision 5000 perfect, but really that's never going to happen. this has gone on for too long now.
vulkan, wasapi, quake injector features added.
irc, avplug, cef plugins/drivers reworked/updated/added
openal reverb, doppler effects added.
'dir' console command now attempts to view clicked files.
lots of warning fixes, should now only be deprecation warnings for most targets (depending on compiler version anyway...).
SendEntity finally reworked to use flags properly.
effectinfo improved, other smc-targetted fixes.
mapcluster stuff now has support for linux.
.basebone+.baseframe now exist in ssqc.
qcc: -Fqccx supports qccx syntax, including qccx hacks. don't expect these to work in fteqw nor dp though.
qcc: rewrote function call handling to use refs rather than defs. this makes struct passing more efficient and makes the __out keyword usable with fields etc.
qccgui: can cope a little better with non-unicode files. can now represent most quake chars.
qcc: suppressed warnings from *extensions.qc

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5000 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-07-12 00:40:13 +00:00
Spoike 5920bf05fb reworked menusys combo items, as per mushi's request. should be a bit prettier now.
fixed most gcc warnings when compiling for linux.
client can now connect to 10002 servers. probably 10000+10001 too, but too lazy to test.
doom3 map loading is working again, but has too many issues for it to be useful (leaks, premature purges, no texture_d suffix support), so its still disabled for now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4999 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-02-15 06:01:17 +00:00
Spoike 46c63cbedb curtesy molgrum: allow_download_loc permits locs/*.loc to be downloaded. also fixes an strncmp. oops.
device ids with rawinput and xinput are now assigned only on the first event. this means the ordering is easily controllable, thus helping splitscreen usability.
fix compile errors with the nolegacy builds.
client updates "chat" userinfo to match ezquake. does not display them still. server now forwards them correctly for ezquake.
android can now switch gles version. a bit crashy with it though.
android: gyroscope is now available to csqc.
android: added vid_dpi_x/y cvars. will be 0 on other platforms, for now.
added screenshot_vr command, for 360-degree stereoscopic screenshots.
fix a potential crash from frag parsing.
added m_accel_style and friends, for nicer mouse acceleration.
fixed const-correctness in a few places.
added friendly spectate button to the server browser
display a warning if an mdl has dodgy seam values. this won't affect fte, but can crash winquake.
qcc: fix struct fields to at least appear to work.
qcc: -I is finally implemented.
qccgui: options now has tooltips, so people might have a chance of actually figuring out what each option does.
menusys: game configs menu now scans for files rather than listing specific ones. should probably be tested more.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4998 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-02-10 23:23:43 +00:00
Spoike 9360a016c2 mvd: cl_autotrack_team cvar locks autotrack to a specific team. getting the team name to match can still be problematic when it contains non-ascii chars however.
qw: fix recording mid-map.
q2: add support for recording demos on q2 servers.
q: fix setattachment not using the correct orientations.
q2: now supports splitscreen, as well as increased model and sound limits.
cl: fix crosshair not appearing in splitscreen.
cl: splitscreen clients now get their own colour tints (like the bf command)
snd: tweak audio to be a bit more usable in splitscreen by default.
cl: added con_logcenterprint cvar, for shoving a copy of centerprints onto the console. by default only appears in single player.
qc: add checkbuiltin builtin. for all those #0 builtins without their own extension name.
gl: fix r_dynamic -1 bug that was painfully visible in AD.
mdl: validate per-frame bounds of mdl files (stuff that would crash software renderers).
sv: fix -port or +sv_port commandline args to override the port correctly.
win: attempt to cope with windows symlinks enumerating with the wrong filesizes.
gl: fix skyboxes not appearing properly.
gl: fix sprite alpha/edge issue resulting in some invisible sprites in AD.
gl: fix screenshot_mega, in combination with r_projection. yay for HUGE panoramic screenshots.
q2: fix replacement textures issue.
qw: fix download demonum/X issue, both in client and server.
qw: fix multicast dimensions not always being honoured properly.
nq: fix starting angles sometimes being wrong.
menusys: I'm finally uploading my menusys library, plus example mod, which I'll now be providing like csaddon is.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4997 fc73d0e0-1445-4013-8a0c-d673dee63da5
2016-01-18 05:22:07 +00:00
Spoike e996609c73 added qccgui icon (courtesy of shpuld)
isolated transfers a little.
added preliminary support for r1q2 and q2pro protocols (no zlib).
fixed some missing q2 hud configstrings.
fixed models attached to particles not appearing the first time around.
fixed halos appearing on {foo fullbright textures.
fix particle crash bug from missing particlecubes.
implement r_converteffectinfo (instead of r_importeffectinfo with r_exportalleffects) for convenience. also now more complete and more accurate.
loadfont no longer auto-allocates slot 0.
fix issues with r_dynamic -1
don't restart audio on vid_reload (only reload it). this fixes audio issues with capturedemo with gamedir changes.
fix possible crash from loading sounds during an audio reload/restart.
now listens on both ports 27500 and 26000 when running quake, by default. sv_port or -port args will override.
work around surfedge corruption in some instance of the slide4 map that dimman found.
attempt to nudge players to travel at at least 200qu when travelling vertically through portals. this should help alieviate gravity-induced stuttering issues.
fix nested function types used in conjunction with op_state. now assumes static within the parent.
optimise array indexes slightly.
fix issue with ptr[float].foo
fix some qcc bugs to do with implicit type conversions
fix a portal / angle protocol extension issue, so legacy clients can use portals, they just can't see the other side (nor predict them).
fix q2 victory.pcx issue at the end of the game.
use abort/sigabort instead of sigsegv on linux sys_errors. this should help get people to report stuff better.
reformat the nq server advertising to be more helpful.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4996 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-12-28 17:41:39 +00:00
Spoike 9000f497ec misc fixes and tweaks:
added //it stuffcmd.
now parsing //wps stuffcmds for ezhud use.
rework worker threads a little so that the main thread is no longer guaranteed to be stalled at least once. This speeds up load times a little.
fix nq server player counts in the server browser.
fix switching from/to spectator mode from destroying frag counts.
tweak custom bf args a little.
fix issue with player names starting with char 0x80.
fix menu.dat not loading.
attempt to fix flush lag on windows.
some fixes for stencil shadows.
try to fix public builds not knowing their svn revision. this should fix autoupdates.
added global_gravitydir vector, for mods that want to be really weird. doesn't clear onground flags however.
reworked the status command a little to attempt to report bursts a little better.
fix multicasts missing in mvds issue.
fix illegible server message with dpp7 downloads.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4992 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-10-27 15:20:15 +00:00
Spoike 12dd83c20f Fix outdated hlsl11 shaders.
Enable d3d11 renderer by default (in builds that already have a d3d9 renderer anyway).
Fix d3d11 + multisample.
fix some sdl issues.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4988 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-09-14 15:20:09 +00:00
Spoike cc414506a8 make some tweaks to fix some model skin issues.
tweak manifest package lines to support key/value argument pairs for extensibility. unrecognised args are still assumed to be mirrors.
package lines can now contain condition "CONDITIONSTRING" pair, a (quoted) equivalent to the if console command. fps presets now do a fs_restart in order to give the filesystem a chance to download any new packages.
fix svc_finale bug resulting in corrupted svc_cdtracks.
change q1mdl code to use the same shader names as dp does. expect issues with dodgy shaders.
fix animmap to support float framerates.
fix 'if (a&&b) then' logic.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4984 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-09-07 14:34:39 +00:00
Spoike 8241ed13be tweak intermissions a little so that quakeworld mods actually works properly (especially mvds).
dynamically allocate music_playlist_* cvars. may require the use of set from configs in order to create them in advance.
add a trail to rogue's plasma weapon.
fix r_waterstyle bug
attempt to optimise qcvm slightly.
tweak copyentity to be a bit more useful.
tweak ban code slightly. 'stealth' penalty hides other penalties.
fix some d3d9 rendering issues with q3.
fix some q2 stuff.
add the NOLEGACY thing that a few people have asked for lately.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4978 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-09-01 04:45:15 +00:00
Spoike fc691d5be8 implemented gl_simpleitems.
load times reduced slightly.
don't show autoid armour if they're dead. its just not relevant.
fix csqc staticsound builtin.
fix some shader leaks/double-frees in certain situations.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4960 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-08-10 18:28:23 +00:00
Spoike f520bdede7 fix gameclock in mvds.
implement hardware cursors in d3d9+d3d11
fix crash from closing the audio menu in the webgl port.
make deluxemapping+softwarebanding require a vid_reload before anything happens. this solves missing textures until the user does it anyway.
fix scores+spectating issue. again. oops.
rename openal devices in the webgl port, so that it makes more sense.
remove glsl/hlsl parameter limit. this also fixes the final ie webgl issue (still gets half the framerate though).
fix some issues with bloom and waterwarp active at the same time.
attempted to give properish error messages from emscripten, despite emscripten hating me.
hack drag+drop into fteqccgui. I ought to make fteqw accept demos etc this way some time too.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4959 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-08-07 17:49:49 +00:00
Spoike 257610c89f add atlasing for wad images (batching means the entire regular hud can be a single draw call, assuming the ammo counts batch alongside show_fps).
d3d9 renderer can now use all the model batching stuff I wrote for gl.
fixed loading screens with d3d9 renderer.
cl_deadbodyfilter cvar is now archived.
autocam will avoid switching if the newly tracked player doesn't have anything interesting, etc.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4958 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-08-04 15:16:24 +00:00
Spoike f4d3df7bf5 make sure the capture command doesn't switch between gamedirs while capturing.
added dimension_default global to provide default dimensions. expected to be a (var) constant.
support setcustomskin in menuqc.
implement some considerations for win95, so it can actually run on that horrendously outdated system.
provide scr_autoid and r_showbbox-field info when running csqc.
ignore vid_restarts at the end of config.cfg files from other engines. in fte, these are at best redundant and at worst overrides user settings.
fix issue with latched cvars not flagging the config as modified.
path command always shows filenames properly.
fix some fteqcc inlining bugs.
added precaches command to display all active precaches.
added docs for mapcluster.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4881 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-06-04 06:15:14 +00:00
Spoike d5dbdff1d1 enable WEBCLIENT in dedicated servers.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4876 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-05-16 15:57:04 +00:00
Spoike d6bf654215 enable WEBCLIENT in dedicated servers.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4875 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-05-16 15:51:39 +00:00
Spoike 31506617f0 Implemented device enumeration for SDL+ALSA+OSS4 audio drivers. Back to using the 'default' alsa device by default, warts and all.
Fixed openal linux .so name, now usable in linux.
sdl audio code now uses sdl2 audio, and thus can support multiple devices simultaneously.
linux non-sdl builds now dynamically link to SDL2 for audio. This is now the default audio system in ALL non-android linux builds. This is the only real option to cope with the mess that is alsa.
Fix netgraph when running q2. No longer makes palette assumptions.
Fixed q2 ping values.
Tweaked a load of windows code to use wide chars, because microsoft do not support utf-8.
fixed an issue with winsspi where data from large packets could get lost.
now tries to read .lit2 files (although still refuses to read them for now).
Fixed motionblur. To make Shpuld happy... :P

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4871 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-05-14 03:06:58 +00:00
Spoike 56b8f125a1 hack some sort of hdr in there, because we can. I'm sure it could be improved.
provide xz support, because we might as well.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4866 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-04-27 12:51:42 +00:00
Spoike ad641efab3 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4863 fc73d0e0-1445-4013-8a0c-d673dee63da5 2015-04-22 00:27:59 +00:00
Spoike 4a582f949a git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4861 fc73d0e0-1445-4013-8a0c-d673dee63da5 2015-04-21 23:11:26 +00:00
Spoike bed989f529 q2w bsp format support.
automatic lightmap texture scaling to retain more performance on large maps.
r_clutter preliminary implementation should probably fix up the shader still.
CSQC_Parse_Damage implemented.
finally implement q2 inventory.
fix mixer overflow crash.
glsl can now use s_diffuse etc to force inclusion of a diffuse sampler/texture, meaning shaders don't need to include them.
fix issue with writeip

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4841 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-03-03 00:14:43 +00:00
Spoike d90095f511 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4831 fc73d0e0-1445-4013-8a0c-d673dee63da5 2015-01-21 22:02:20 +00:00
Spoike b0f0fc80bb try to fix android builds.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4813 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-31 06:11:12 +00:00
Spoike 898fc93b1b try to fix ar
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4810 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-29 06:50:24 +00:00
Spoike 47d4dbb633 attempt to statically link against scintilla.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4809 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-29 06:39:57 +00:00
Spoike c1e991f31c hide console while updating packages.
fix rate indicator with http downloads.
fix gamedir change crash.
force r_shadow_realtime_world_lightmaps to 0 if there are no rtlights on the map (to work around TF/etc maps where such 'useless' entities got stripped).
tweak profile lists to be slightly more verbose.
add extra parms to fteextensions.qc, so that people realise that fte actually supports that.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4808 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-29 02:35:10 +00:00
Spoike dddee3d76c rewrote some master server code to isolate games.
servers will subscribe to both ipv4 and ipv6 addresses if a master's name resolves to both types.
handle filename security more cautiously.
avoid some wasted memory with q3bsps. fix crashing bug in dedicated servers.
try fixing OMC's latest issue.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4803 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-23 15:26:42 +00:00
Spoike 4d9ee2395a warn clients when stuff will be invisible due to protocol limits. this does not include extra features, only limits.
try to handle mvd prespawning a little more generically, to enable support for vweps (when protocol extensions are active). also fix issues with mid-demo map changes, which can potentially affect qtv streams.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4795 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-12-02 02:00:41 +00:00
Spoike 9881bc3dd7 fix makefile issue
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4759 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-10-05 20:47:03 +00:00
Spoike 7f6c2054d9 threaded loading code and associated/extensive tweaks.
unified image loading code a little between renderers.
support switching worldmodel in csqc. also associated bugfixes.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4758 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-10-05 20:04:11 +00:00
Spoike 25d470bffb Try to fix some linux issues.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4756 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-09-21 03:35:38 +00:00
Spoike b29c68ef92 try to be more strict/paranoid with cvars.
load q2 game dlls from the binarydir in preference to gamedir (allows such dlls to be distributed with the engine).
add small emscripten msvc project so I can build the web port a little more conveniently.
require mouse releases to have had a corresponding mouse press while in the menu. this solves issues with mouse clicks triggering the load menu while dead and instantlyish loading one, and alt-tab issues too.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4755 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-09-20 04:11:39 +00:00
Spoike c6b8617d87 try to statically link sdl+vorbisfile+etc+png+jpeg for mac, in case I pester tuna in the future.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4741 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-09-02 04:00:45 +00:00
Spoike 230ce4e0a0 updated mapcluster mode a little, should be more robust now. also supports cross-server events.
added option for softer/wider lines.
attempt to use hardware cursors in windows. provide api for csqc to specify its own.
cl_downloads cvar blocks all automatic downloads.
QUAKETC: new compile-time setting. if defined lots of stuff will be disabled including built in menus.
remove spam from log files.
try to get the webgl port to complain a bit more reliably when webgl is not usable.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4738 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-09-02 02:44:43 +00:00
Spoike 258a4163ae random hacks to get rtshadows working in the gles/webgl port, no longer depend upon GL_ARB_shadow.
gles renderer can use fbos now.
webgl now saves configs+savedgames persistently using localstorage.
misc startup/manifest refinements.
make nacl compile again.
webgl port can now use #stuff to select different manifest files.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4733 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-08-27 08:41:31 +00:00
Spoike 957afd8c3b map command now strips parms+spawnflags. use changelevel if you want to keep that (unlike nq, we still won't kick players).
fix some compiler warnings.
update the emscripten port.
reduce bss a little (as emscripten blatently can't cope with it)
support for '_wateralpha'. also support for cvar_foo too.
demo_jump works in nq demos.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4732 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-08-25 07:35:41 +00:00
Spoike 1c38e52b3f kill svmodel.c from the makefile too.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4669 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-05-23 02:14:36 +00:00
Spoike 1c0373ae97 add headless renderer to make onemanclan happy. ish.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4645 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-04-24 01:56:00 +00:00
Spoike 2e98386da2 Added pm_watersinkspeed cvar.
Misc bugfixes, mostly hexen2-related. tibet5 bug is finally fixed.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4635 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-04-06 15:16:39 +00:00
Spoike 2e1a70e319 rewrote ban code, merging bans+nonbans+cuffs+mute+cripple+deaf+lagged+vip. added timeouts. new penalties have no dedicated command. use the addip command for it.
maplist command now generates links.
implemented skin objects for q3. added a csqc builtin for it. also supports compositing skins.
playing demos inside zips/pk3s/paks should now work.
bumped default rate cvar.
added cl_transfer to attempt to connect to a new server without disconnecting first.
rewrote fog command. alpha and mindist arguments are now supported. fog change also happens over a short time period.
added new args to the showpic console command. can now create clickable items for touchscreen/absmouse users.
fixed menus to properly support right-aligned text. this finally fixes variable-width fonts.
rewrote console tab completion suggestions display. now clickable links.
strings obtained from qc are now marked as const. this has required quite a few added consts all over the place.
probably crappy attempt at adding joypad support to the sdl port. no idea if it works.
changed key bind event code. buttons now track which event they should trigger when released, instead of being the same one the whole time. this allows +forward etc clickable buttons on screen. Also simplified modifier keys - they no longer trigger random events when pressing the modifier key itself.
Right modifiers can now be bound separately from left modifiers. Right will use left's binding if not otherwise bound. Bind assumes left if there's no prefix.
multiplayer->setup->network menu no longer crashes. added rgb colours to the translation view (but not to the colour-changing keys).
added modelviewer command to view models.
added menu_mods menu to switch mods in a more friendly way. will be shown by default if multiple manifests exist in the binarydir.
clamped classic tracer density. scrag particles no longer look quite so buggy.
added ifdefs to facilitate a potential winrt port. the engine should now have no extra dependencies, but still needs system code+audio drivers to be written.
if it can't set a renderer, it'll now try to use *every* renderer until it finds one that works.
added experimental mapcluster server mode (that console command). New maps will be started up as required.
rewrote skeletal blending code a bit.
added cylinder geomtypes.
fix cfg_save writing to the wrong path bug.
VFS_CLOSE now returns a boolean. false means there was some sort of fatal error (either crc when reading was bad, or the write got corrupted or something). Typically ignorable, depends how robust you want to be.
win32 tls code now supports running as a server. added connect tls://address support, as well as equivalent sv_addport support.
exposed basic model loading api to plugins.
d3d11 backend now optionally supports tessellation hlsl. no suitable hlsl provided by default. !!tess to enable.
attempted to add gamma ramp support for d3d11.
added support for shader blobs to speed up load times. r_shaderblobs 1 to enable. almost vital for d3d11.
added vid_srgb cvar.
shadowless lights are no longer disabled if shadows are not supported.
attempt to add support for touchscreens in win7/8.
Wrote gimmicky lua support, using lua instead of ssqc. define VM_LUA to enable.
updated saved game code. can again load saved games from vanilla-like engines.
changed scale clamping. 0.0001 should no longer appear as 1.
changed default mintic from 0.03 to 0.013 to match vanilla qw. I don't know why it was at 0.03. probably a typo.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4623 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-03-30 08:55:06 +00:00
Spoike 7e80062ab9 Added x11 unicode input support. Added wayland support (FTE_TARGET=linux-wayland). Added properly support for rpi+egl (FTE_TARGET=linux-rpi, warning: expects to cross-compile).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4622 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-03-30 00:39:37 +00:00
Spoike 8f6c1a3e92 fix misc junk that was buggy. hurrah for handy test cases.
q3 shader remapping now a bit more robust.
portals finally work properly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4610 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-14 09:59:32 +00:00
Spoike fd70ec0c62 fix misc warnings.
add support for q3's shader remapping feature.
don't mask sky depth on q3bsp. apparently it causes problems.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4609 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-13 23:54:57 +00:00
Spoike 13b586ea06 Tweaked svn stuff a little more. Should be more robust now. 3rd party SVN headers+libs are no longer on svn.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4605 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-09 09:25:28 +00:00
Spoike 1bb752b582 sdl2 support.
hacky rendertarget stuff. not polished. don't use except for testing. feedback desired.
switched file system to use a qofs_t type instead. define FS_64BIT to make it 64bit (standard on 64bit cpus).
rewrote zip support, ditching unzip.c. this provided zip64 support, and unicode in zips.
changed local address enumeration to not be so stupid.
updated ode support a little to match some dp features.
changed fs_cache scheme, to not rebuild needlessly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4596 fc73d0e0-1445-4013-8a0c-d673dee63da5
2014-02-07 08:38:40 +00:00
Spoike 591b848148 trying improve ftedroid and fix the issue with opera+file urls.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4558 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-12-07 00:30:48 +00:00
Spoike d75ef8869e add a default autoexec.cfg for android at mushi's request.
add temp(ish) workaround for non-functioning tmpfile libc function on android.
clarified the error message displayed when tmpfile fails.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4554 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-12-03 15:15:50 +00:00
Spoike 218006198d fix q2 bsp texture animations.
fix q2 prediction.
fix q2 saved games issues.
fix q2bsp fullbright/fullwhite lights.
fix potential issues from svs.clients no longer being preallocated.
fix rtlights not doing q1 bsp texture animations.
misc crash fixes.
hack to allow a clickable hud when using a touchscreen.
gl_max_size no longer affects 2d images.
select faithful fps preset option by default.
gl_font a,b,c works to select fallback fonts. freetype fonts reused to reduce memory usage when the same font is used multiple times either with different sizes or as fallbacks as part of other fonts.
allow static member functions. allow static locals.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4552 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-12-02 14:30:30 +00:00
Spoike 52a682bc8c misc tweaks to support:
opening (qtv) urls with android browser. mvds should stream using the same mechanism, if they have the right mime type.
arbitrary unicode basedirs in windows should work, and commandlines. not sure what else still doesn't work.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4542 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-28 01:41:55 +00:00
Spoike ad8d634916 misc tweaks to support:
opening (qtv) urls with android browser. mvds should stream using the same mechanism, if they have the right mime type.
arbitrary unicode basedirs in windows should work, and commandlines. not sure what else still doesn't work.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4539 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-28 00:45:22 +00:00
Spoike 32dacf7492 upgrade to nacl sdk 31 in an attempt to stop chrome from erroring out.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4531 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-22 03:09:06 +00:00
Spoike ef8a74fe1c grr
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4527 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-21 23:29:24 +00:00
Spoike f08489f141 .po support for qc.
rewrote messagemode to support utf8 properly, as well as left-arrow etc keys.
support for mouse-over images on console links and stuff.
added r_lerpmuzzlehack for certain viewmodels.
use libtool's dlopen stuff on cygwin to try to cover some cygwin path differences.
try to support utf-8 in filenames even in windows (only in nt, 9x is still ascii only).
added certificate validation for gnutls. gnutls now enabled by default in linux.
d3d11 tweaks. shadowmapping works.
tweaks for updated terrain format, to try to fix some inefficiencies/limitations.
xmpp plugin can now display avatars (xmpp /set avatars 1)
xmpp file transfers supported by default, but capability is disabled by default (can be enabled by hacking config).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4523 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-21 23:02:28 +00:00
Spoike 47fa0b93d2 nacl tweaks to get it working again.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4519 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-06 21:55:56 +00:00
Spoike d832b24d09 qcc debug builds were getting written to the release dir.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4517 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-11-05 18:12:18 +00:00
Spoike 07c93d76af favour mingw64 toolchain over the older mingw32 toolchain, because the headers associated with the toolchain are more up to date.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4498 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-10-08 16:49:42 +00:00
Spoike 5bb896392f git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4489 fc73d0e0-1445-4013-8a0c-d673dee63da5 2013-09-30 00:03:16 +00:00
Spoike dad407a8c3 hide our internals properly, to avoid issues with symbol name conflicts (which is currently crashing quake2 gamecode). Why the fuck this option isn't enabled by default I have no idea.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4486 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-09-29 17:07:57 +00:00
Spoike 07190feda6 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4457 fc73d0e0-1445-4013-8a0c-d673dee63da5 2013-08-07 14:24:04 +00:00
Spoike 3b51dae2c9 misc fixes/tweaks/stuff intended to get the emscripten port working better.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4456 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-08-07 14:20:24 +00:00
Spoike 1241494248 erk, emscripten defaults to asm_js now? o.O
I wouldn't mind, but its buggy!

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4449 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-31 07:01:34 +00:00
Spoike 6ca7c92303 asm_js generates bad javascript. disable it.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4448 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-31 05:08:33 +00:00
Spoike a343d8d843 Reduce webgl dependancies (no more q2/q3/plugins which wouldn't work anyway). Use websockets via our own javascript thunk to avoid issues/weirdness with emscripten's bsdsockets emulation.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4444 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-31 00:20:16 +00:00
Spoike 3099521350 don't do the console window thing in windows.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4442 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-29 19:27:09 +00:00
Spoike eff67b14e3 try to get the right extensions on windows qcc builds.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4441 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-29 18:09:16 +00:00
Spoike a05f3f36a0 slightly better doom3 compat
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4439 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-29 17:36:44 +00:00
Spoike fceb09fe37 reworked demo playback and interpolation.
added support for recording nq demos, but only if not already on the server.
added capturedriver as a sane way to select between screenshots, avi, or various plugins.
output sound device can now be selected via the menu. not all drivers provide device enumeration (openal and dsound do).
enabled openal, but not using it unless an openal device is explicitly requested as its still a little buggy.
added \"\"" markup in the console.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4427 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-07-26 17:19:06 +00:00
Spoike 2ff17aed07 Reworked the gnutls code. Now more consistant with windows, and more generic. Still does not validate the server's certificate, so disabled by default.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4402 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-06-24 09:04:00 +00:00
Spoike fa9252cefa splitscreen cleaned up more.
demo menu can now leave quake dir.
scissor+line rendering abstracted from csqc.
added a rain particle effect to the 'high' particle set.
added support for parsing ezquake's koi stuff. Still only generates utf-8.
implemented some string-buffer builtins from dp that have been stubs for quite some time.
http code now supports/uses gzipped downloads properly.
added support for non-blocking tcp connects.
#pragma optimize makes more sense with the gui version now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4397 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-06-23 02:17:02 +00:00
Spoike 1c95764c54 changed strip flags to not strip by default. cos that's kinda pointless tbh.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4387 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-06-04 16:08:00 +00:00
Spoike d97a163011 Playing around trying to make the emscriptem port more usable/nicer.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4371 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-14 18:38:42 +00:00
Spoike ab1d780e33 various linux tweaks that make it run a little better in debian. Added the handy stack dump code for debug client builds too.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4357 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-13 13:43:18 +00:00
Spoike 4182d5d160 revert that breakage
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4356 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-11 14:10:06 +00:00
Spoike 9dbf5b5837 changed to not load gamecode from quake paths, to avoid issues with buggy quakeworld clients that will freely download stuff from anywhere (not sure what to do about ktx, but it can be reenabled with a cvar).
image_width is now only set by a single function.
tweaked scancode inputs slightly. added support for printscreen binds.
changed the way gamma works. glsl gamma now used when running windows, or hardware gamma is not available. removed gl_contrast+gl_brightness.
q2 gamecode support no longer has a system componant. this means that ports only need the generic stuff.
misc tweaks to the d3d11 renderer.
added brief descriptions to many builtins. need to add comments to constants, globals, and fields too, somehow.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4355 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-11 14:02:55 +00:00
Spoike 873f0a8134 Fix various warnings.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4353 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-11 05:03:07 +00:00
Spoike 11c7f5965a For debug versions of plugins.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4334 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-04 10:37:51 +00:00
Spoike f7737ea294 Finally remove dependancy on X11 library, as no symbols are used from it anyway.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4331 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-04 04:48:14 +00:00
Spoike ffc2a08589 pass network addresses around as a pointer rather than as a struct. They've grown quite a bit from vanilla code and can now be quite large. this should give more efficient network filtering+matching.
Added version+time+date to segfault lots.
try to use vbo+vao as needed.
added a manifest file in order to disable uac emulation and its virtual store lies.
particles now support a sort of namespace. eg: an effect called "cfg.effect" will load up the 'cfg' particle config and use its 'effect' effect (but not replace any explicit effects). You can still create particle effects called 'cfg.effect' with no issue.
Added support for fsarchive plugins.
Added a sys_register_file_associations command. .bsp not yet handled, but demo playback should work fine.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4324 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-05-03 04:28:08 +00:00
TimeServ 292f61c6e0 add command line options via query string for web build, add web memory option and boost default to 384MB, use gcc4.7 for android build, fix pnacl, clean makefile slightly
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4310 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-09 21:31:44 +00:00
TimeServ 59ce059804 oops
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4292 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-06 08:37:45 +00:00
TimeServ 697657b628 some makefile cleanup, add option for prejs location
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4291 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-06 08:30:43 +00:00
TimeServ ecc445e88f fix nacl build, change output of web-sv for automated build
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4285 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-04 09:59:14 +00:00
Spoike 49197218bc Slow progress. Most of what I am fighting is emscripten's javascript-based libc. Its networking is laughable at best, trust me you don't want to see it. Whereas its GL emulation seems to break things rather than anything else so for now I'm just disabling everything that isn't vbo+es2 and I still get warnings about emulation being enabled. No idea how to get rid of those. Still, bsp objects should now render correctly, but not models+particles+2d+text stuff.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4283 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-04 08:08:49 +00:00
TimeServ 5c53a94b43 fix automated android builds
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4280 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-03 09:52:09 +00:00
Spoike 1e9af3f441 Early hack at emscripten compat.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4278 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-04-02 05:18:17 +00:00
Spoike 6a831e2f99 qwsvdef.h is no more. Many files changed because of this.
enabled ssl support in windows for plugins.
updated jabber plugin.
tweaked downloading logic in an effort to end the madness.
Updated sql code to support sleeping the qc thread until query completion, as a more readable alternative to callbacks.
Client updates should be more explicit now, removing a potential bug.
networked terrain editing should now be in a better state.
updated the dir command to show paths too (so when the same file is listed twice, the pak its in will at least be different). Many files changed because of this.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4273 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-31 04:21:08 +00:00
Spoike 64bc9464fe ------------------------------------------------------------------------
r4250 | acceptthis | 2013-03-08 03:32:56 +0000 (Fri, 08 Mar 2013) | 1 line

make sure -ldl is used.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4246 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:20:07 +00:00
Spoike 7b700555a9 ------------------------------------------------------------------------
r4249 | acceptthis | 2013-03-08 03:31:52 +0000 (Fri, 08 Mar 2013) | 1 line

make sure -lpthread is used.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4245 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:19:45 +00:00
Spoike edffd6c787 ------------------------------------------------------------------------
r4248 | acceptthis | 2013-03-08 03:29:24 +0000 (Fri, 08 Mar 2013) | 1 line

clumsy but hopefully more robust.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4244 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:19:24 +00:00
Spoike 2e009e1d26 ------------------------------------------------------------------------
r4227 | acceptthis | 2013-02-26 16:29:38 +0000 (Tue, 26 Feb 2013) | 2 lines

numerous small fixes and tweaks for the nacl+npfte ports.
support for q3bsp tangent-space deluxemaps.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4223 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:09:25 +00:00
Spoike 5cb6c9f190 ------------------------------------------------------------------------
r4225 | acceptthis | 2013-02-22 10:59:41 +0000 (Fri, 22 Feb 2013) | 1 line

Make npfte link dynamically to X11+Xt so we can print something meaningful and avoid random crashes if those libraries are missing.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4222 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:06:15 +00:00
Spoike 4dd127dc14 ------------------------------------------------------------------------
r4224 | acceptthis | 2013-02-22 01:28:16 +0000 (Fri, 22 Feb 2013) | 1 line

More explicit dependancies.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4221 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:05:47 +00:00
Spoike 584dba6ae6 ------------------------------------------------------------------------
r4223 | acceptthis | 2013-02-21 14:43:49 +0000 (Thu, 21 Feb 2013) | 1 line

use multithreading in linux too, because we can. Fix extra-quotes issue.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4220 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:05:17 +00:00
Spoike 4ddcdbb5f6 ------------------------------------------------------------------------
r4221 | acceptthis | 2013-02-21 10:29:11 +0000 (Thu, 21 Feb 2013) | 1 line

npfte now links against lib png/jpeg fully dynamically on linux, and thus optionally, reducing dependancies.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4218 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:04:31 +00:00
Spoike 6567fe92dd ------------------------------------------------------------------------
r4219 | acceptthis | 2013-02-21 04:54:35 +0000 (Thu, 21 Feb 2013) | 1 line

npapi support on linux too.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4216 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 23:03:46 +00:00
Spoike b8e29f5a47 ------------------------------------------------------------------------
r4198 | acceptthis | 2013-02-13 19:35:33 +0000 (Wed, 13 Feb 2013) | 1 line

Use xinput2, if available, for "raw" mouse input without mouse acceleration or middle-button emulation or anything.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4196 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:54:12 +00:00
Spoike 6299d07c0a ------------------------------------------------------------------------
r4192 | acceptthis | 2013-02-10 17:21:31 +0000 (Sun, 10 Feb 2013) | 1 line

-DUSE_EGL no longer excludes the use of glx
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4190 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:49:04 +00:00
Spoike 0ecf71adaf ------------------------------------------------------------------------
r4189 | acceptthis | 2013-02-05 12:54:29 +0000 (Tue, 05 Feb 2013) | 1 line

clipboard, icon, fullscreen support for glx. Numerous fixes for compile-time warnings.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4187 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:47:42 +00:00
Spoike 602e8cfb45 ------------------------------------------------------------------------
r4180 | acceptthis | 2013-01-27 13:24:22 +0000 (Sun, 27 Jan 2013) | 1 line

fix menu tint.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4178 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:37:59 +00:00
Spoike a339c727d0 ------------------------------------------------------------------------
r4175 | acceptthis | 2013-01-26 18:23:37 +0000 (Sat, 26 Jan 2013) | 8 lines

improved replacementdeltas+nq a little, still needs work.
embrace the menuqc! pr_dumpplatform now includes MENU defs+builtins.
swapped search ordering of paks+dirs, so progs.dat will be used instead of pak0.pak/progs.dat.
fteqcc slightly more sensible with if statements and void+vector types.
fteqcc shows the first line where models are precached/used instead of showing no line at all.
fix missing explosions when running qw gamecode.
accept channels between 8 and 255. 
support for sending fitzquake's increased stat limits.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4173 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:35:33 +00:00
Spoike 8d5b217266 ------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines

removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen. 
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéíóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
Spoike 95266f8215 d3d11 fixes. mipmapping implemented, vertex streaming more performant. Still behind the d3d9 renderer.
Fixed d3d11 vs d3d9 conflicts when switching renderers.
Fixed hlsl-less d3d9 lava.
Added gl_specular_fallback to override the default gloss level.
Added these cvars to give more control over imported/dlight lighting r_shadow_realtime_dlight_ambient r_shadow_realtime_dlight_diffuse r_shadow_realtime_dlight_specular r_editlights_import_radius r_editlights_import_ambient r_editlights_import_diffuse r_editlights_import_specular. Effective value of r_editlights_import_specular is now 1. Was 4.
Fixed spot/cube/smap lights.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4160 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-12-04 19:37:57 +00:00
Spoike d248ce223f added support for persistent particle effects in hexen2.
tweaked shutdown of sql to not make sql unusable after 'disconnect' on a listen server, fixed a couple of mem leaks.
audio no longer starts up twice in windows.
removed specular permutation. its either globally active or globally inactive.
Use oblique near-plane clipping instead of a clipplane, fixing our rtlighting+water warping.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4156 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-11-29 13:37:48 +00:00
Spoike 53a7b3d47c added support for external capture plugins - and using avcodec as a plugin.c.
The ragdoll API is potentially usable now, but still really limited.
Enabled SQL requests by default using sqlite. Note that you'll need the sqlite dll to use this. MySQL should still be usable, but I didn't try. MySQL requires -DUSE_MYSQL to compile it, and a dll and -mysql argument to enable it.
Fixed nacl.
NPFTE plugin now invokes an exe to run the game rather than running the game within the browser.
externvalue builtin now accepts & prefix to return a pointer instead.
Fixed vector autocvars.
uri_get, bufstr_add, bufstr_free, now functional.
QC debugger can now show asm if line numbers are not available.
Added support for QC watchpoints. Use the watchpoint command.
gl_specular now give specular even without rtlights, thankfully not as blatently, but its there.
android will not crash due to supported audio formats, and gles2 can be selected via a cvar (requires full FTEDroidActivity/program restart).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4152 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-11-27 03:23:19 +00:00
Lance 9552e7fb64 Tweaking Speex still
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4150 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-25 07:02:09 +00:00
Lance cc0f60c2f7 Let's hope I got it right this time
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4149 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-25 06:10:20 +00:00
Lance 978af08cbf Fix my mistake in last commit
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4148 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-25 06:05:20 +00:00
Lance 5747d75042 Added Speex development files, updated headers as well.
Makefile changed to statically compile Speex into FTEQW where possible.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4146 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-25 04:52:55 +00:00
Lance 8d4a0a671c Disable Ogg for Mac too
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4145 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-24 14:05:19 +00:00
Lance c8d3f617e0 MorphOS doesn't need Ogg
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4144 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-24 12:57:12 +00:00
Lance 089f40b8e6 Prefer the stable MinGW 64bit compiler over the experimental one.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4143 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-24 12:49:23 +00:00
Lance 70c0818c4c Enabled Ogg in Linux builds
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4141 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-24 04:16:38 +00:00
Lance c16517fbcb OggVorbis support now turned on (AVAIL_OGGVORBIS)
Ogg/Vorbis: Will now look for 'libvorbisfile-3.dll' as well as 'vorbisfile.dll' in Windows.
MinGW builds now have OggVorbis statically linked. (LIBVORBISFILE_STATIC)

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4138 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-24 02:59:31 +00:00
Lance 78b59d54c3 Allow win32 fte to be large address aware (access beyond 2GB address space).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4135 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-22 14:26:47 +00:00
Spoike e9de58cf6a couple of compile fixes.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4130 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-14 11:20:14 +00:00
Spoike cac1e0fb57 Unified input subsystems. Should now all act the same.
_windowed_mouse 0 on windows is basically identical to mono-touch on android, at least the touchless emulator. :)
This needs testing on other platforms. Committing so I can easily get my source onto loonix.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4126 fc73d0e0-1445-4013-8a0c-d673dee63da5
2012-10-14 09:00:49 +00:00