fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity
4239 commits 1 branch 0 tags 50 MiB
Commit graph

1684 commits

Author SHA1 Message Date
Mark Olsen
b39b0fae51 Not that it is accepting server announcements currently anyway, but changed asgaard.morphos-team.net to qwmaster.fodquake.net. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4027 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-04-23 18:43:12 +00:00
Spoike
b6d08f44c5 Added $time and $properdate macros to dedicated servers too, for bigfoot's easyrecord stuff. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4015 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-04-16 12:15:05 +00:00
Spoike
82542ae037 Committing this before I break it any more. 
Massive terrain system rewrite.
Added a Native Client port (sound is stereo 44khz only, rendering is gles2, networking is websockets only (sv_port_tcp supports acting as a qw websockets server with non-nacl servers, filesystem is downloads-only - no saves/configs). Blame Zalon. Grr.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4013 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-04-09 19:12:12 +00:00
Spoike
39fa352534 fix typo. reported by DeCypher 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4009 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-03-23 07:23:39 +00:00
Spoike
56b48c2f7c compile fixes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4008 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-03-23 05:22:22 +00:00
Spoike
14507b55f3 doubled -mem size to a 16mb heap. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4007 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-03-22 22:50:19 +00:00
Spoike
5049001068 compile fixes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4006 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-03-20 03:52:16 +00:00
Spoike
53116a9763 tweaked console completion to be less spammy and to show descriptions for commands where available. 
added a few descriptions to a few cvars.
tweaked strzone/strunzone, added memalloc/memfree/memcpy/memset (use pr_dumpplatform to dump out a new defs).
tweaked android to use a smaller audio buffer, hopefully reducing latency slightly. let me know if this results in bugs...

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4005 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-03-19 06:30:41 +00:00
Spoike
95569fc5dd Trying to fix stuff from last commit. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4002 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-27 13:55:23 +00:00
Spoike
4149c85ab6 tweeks and changes for android. 
audio mixer revamped to cope with threads. 'cache' memory functions no longer used for audio.
added windows acm code to decode mp3 files.
audio playback rates scale with game speed. snd_playbackrate added to control the rate of new samples.
sv_gamespeed no longer needs a map change.
fixed '=' on german keymaps and in_builtinkeymap 0 (and similar issues). bug: keybind names still use US keymap.
added support for rmqe's 24bit network precision.
fixed byterate reporting to no longer be protocol-dependant (nq rates are no longer wildly inaccurate).
removed waterjumping when already dead.
fixed model matrix for viewmodels (modelview unchanged), thus fixing rtlighting on viewmodels.
Added bspx support for rgblighting, lightingdir, and (preliminary)brushlists.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4001 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-27 12:23:15 +00:00
Spoike
5f12e8c9dd bug fixes... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3999 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-17 01:35:22 +00:00
Spoike
854157a4e7 Added .vector gravitydir; 
Added csqc getentity builtin (untested, broken for players).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3998 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-17 01:12:37 +00:00
Spoike
47ccd3bd0d fix movetypes, fix q2. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3994 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-15 13:53:30 +00:00
Spoike
0736882c60 trying to fix q2 connectivity. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3993 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-15 13:35:37 +00:00
Spoike
ee72d0ca0d I'm tweeking pmove.c for the luls. 
fixed 8859-1 for non-english hexen2
tweeking my deltaing.
cl_demospeed bugs fixed.
fixed things being seen through skys.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3990 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-14 15:50:34 +00:00
Spoike
24e5adeb2b qcc: added somevec[0] to read somevec_x 
qcc: fixed struct->ptrfield = ptrvalue
qcc: fixed spam with unused struct members
qcc: fixed str[0][0] and similar situations.
bgqc: fixed sprintf builtin's vector prints.
csqc: added flags field to beginpolygon. value&4 will draw the poly immediately (orthographic projection).

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3988 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-13 09:24:01 +00:00
Spoike
9acd5a61a6 trying to fix q2. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3986 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-13 04:11:11 +00:00
Spoike
37ce84814d random quick fixes... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3984 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-12 08:32:39 +00:00
Spoike
f43b8d535c random quick fixes... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3982 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-12 05:54:44 +00:00
Spoike
7ca0ccd48c random quick fixes... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3980 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-12 05:33:16 +00:00
Spoike
9ee7301d32 my attempt at android multitouch (csqc can also distinguish separate mice in windows too). 
playing around with fragmentation and mtus. added net_mtu to negotiate some mtu size for smaller (or larger) network messages. setting a custom mtu allows for message fragmentation too.
trying to add a reworked deltaing protocol, including all sorts of fun stuff like bbox sizes, and higher ent limits.
added support for content override entities. set the skin field to some (negative) contents value, and you get movable water with prediction and waterwarp and everything, though you likely want a custom qbsp or a shader to get backface culling.
removed some madness with model skins, fixing some weird q3 bugs.
fixed forced-pause-on-start for q2
fixed q3 server to actually accept client packets again.
fixed strftime builtin

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3979 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-02-12 05:18:31 +00:00
Spoike
114cc22cbc Fix screen rotations making the screen black. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3970 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-29 12:53:12 +00:00
Spoike
c1f65683bb I'm an idiot. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3969 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-28 10:49:12 +00:00
Spoike
4496bb6ea0 Removed limit on strcat builtin's length. 
Fixed issues with DP7 protocol.
Fixed .fatness.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3965 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-28 10:30:44 +00:00
Spoike
aa72d14cec don't use TRUE or FALSE. apparently fte's headers don't define them, so depending on them is folly. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3964 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-25 04:41:12 +00:00
Spoike
567e9f112b added DP_QC_ENTITYSTRING builtins. 
mvd playback fixes/cleanups
r_fb_models more closely matches ezquake.
readded str[i] support.
fixed char constants (outside of strings).
string table compression no longer affects distinction between "" and string_null.
multiplayer savedgame fixes.
don't bugilly change hexen2's playerclass on loadgame, and preserve the STR_foo globals which are not marked for saving.
fix small bug on player renames. added a temp debug print to try to catch the issue onemanclan is having.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3961 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-24 04:24:14 +00:00
Spoike
770948a320 d3d compiles again (yes, your poking does work Moodles). 
Fixed particle beam/torch weirdness (rjlan poked me for this one!).
tiny optimisation in the gl renderer.
offsetmapping info is loaded even with bumpmapping disabled.
Fixed some hexen2 annoyances.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3960 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-21 07:53:49 +00:00
Spoike
fb214142a3 tcpconnect fixes 
lots of hexen2 fixes
fixed clipped decals again, still not using any...
fixed zips over 2g
rewrote bloom to use glsl. should be slightly more usable now.
lots more hexen2 fixes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3957 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-17 07:57:46 +00:00
Spoike
2b7b9720f3 this is one way to fix that error anyway. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3953 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-03 23:44:01 +00:00
Spoike
0453b1bbae Missed a file for android. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3951 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-02 14:59:00 +00:00
Spoike
1f4c6c0da3 fun text to speech hack. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3949 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-01 15:34:02 +00:00
Spoike
1e621416ce added support for ambient/diffuse/specular scale properties on rtlights. 
attempting to fix up the avi code for mingw weirdness.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3947 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-01 11:22:24 +00:00
Spoike
3b3d08542a avi audio decoding. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3946 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-01 07:02:45 +00:00
Spoike
016c840497 fixed rcon_address not having a default port 
sv_port now accepts a space-delimited list of addresses/ports to listen upon.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3945 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-01 06:25:51 +00:00
Spoike
d877bd4e39 preliminary attempt to get rtlights in d3d builds. shadows are only cast by world, and the hlsl code is somewhat lacking. also only works in d3d-only builds. 
no longer using the vfw header or lib, so avi playback/recording should work when compiled with gcc.
added d_mipcap cvar.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3944 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2012-01-01 02:26:42 +00:00
Spoike
f32a88f684 saneified dynamic light colour values. 
added preliminary support for some rtlight cubemaps.
no longer using tmpfile in win32 - its too unreliable.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3942 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-27 08:35:19 +00:00
Spoike
54358b62b2 bugfix 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3941 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-26 16:26:15 +00:00
Spoike
9e4edb8a9a Small fixes and tweeks. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3940 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-26 15:19:13 +00:00
Spoike
de29dce680 skel_set_bone_world implementation. 
fix attempt to fix npfte issues.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3938 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-24 04:05:28 +00:00
Spoike
6bb579f24b improve compat. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3937 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-23 17:33:28 +00:00
Spoike
354879befc fixed up player lerping. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3934 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-23 14:36:25 +00:00
Spoike
1693ba6c58 revamped fog to use glsl. shouldn't harm framerate quite so much. 
tweeked d3d renderer. certain shader constructs might be broken now so don't try q3 with it, but framerates are up when playing quake.
tweeked gl rendering too, timedemo results seem a little higher also.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3933 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-23 03:12:29 +00:00
Spoike
2d23892be0 Misc fixes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3930 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-06 00:39:39 +00:00
Spoike
345d9a6e50 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3929 fc73d0e0-1445-4013-8a0c-d673dee63da5 2011-12-06 00:37:14 +00:00
Spoike
d6d0105d3c A couple of changes. 
Added a higher quality particle config.
Quick hack for crepuscular rays.
added new command, eg: pr_dumpplatform -FFTE -O csplat
used package reporting on servers, auto package downloading on clients, should be fully implemented.
Smoothed out players a little. Added option to menus.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3926 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-12-05 15:23:40 +00:00
Spoike
790052a28e tighter bsp model culling. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3923 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-11-09 04:14:38 +00:00
Spoike
119c9c412c Basic collisions. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3922 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-11-09 04:12:57 +00:00
Spoike
b91b32cd38 Just breaking stuff, trying to get axfte stuff working. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3916 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-29 19:01:33 +00:00
Lance
18179bcf48 .cpp handling in makefile added, lowercase'd an include file in sys_axfte 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3915 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-29 04:06:49 +00:00
Spoike
e5845b86a8 stub Sys_RandomBytes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3912 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-28 15:15:35 +00:00
Spoike
b356dc75aa linux/gcc/general fixups. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3911 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-27 16:42:53 +00:00
Spoike
5118de8bdd committing for fixes for OMC 
some minor changes. Mostly bug fixes and internal reorganisation.
Added code to provide an activex control as part of the npfte.dll plugin. If the dll is registered the regsvr32 way, the plugin can be used with IE as well.
fisheye/panoramic view enable is now controlled by rulesets instead of serverinfo.
server will list all pak files it has loaded. client will probably do the wrong thing and still needs fixing properly.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3909 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-27 15:46:36 +00:00
Mark Olsen
12678040d4 Completely untested and not even attempted compiled MorphOS implementation of Sys_RandomBytes(). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3907 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-10-03 09:23:34 +00:00
Spoike
8d2cc63faf Audio support for droid. No idea how the latencies are. Probably terrible. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3903 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-09-22 15:57:16 +00:00
Spoike
4b27934867 Basic Android support. Icon resources still need to be replaced. No sound, no accelerometer. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3901 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-09-16 05:56:54 +00:00
Spoike
5a7f34bd50 Couple of tweeks, breakages, and fixes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3898 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-09-05 01:48:23 +00:00
Spoike
e8c1f669cc Couple of changes. 
D3D now supports hlsl shaders. Much functionality is still missing, but sky and water surfaces are in.
IQM models now supported.
Engine physics code is now potentially callable from csqc, but there are some issues which need to be resolved before its enabled.
FTEQCC has had some pointer/struct/array functionality improved. Complex trees can now be navigated properly.
added r_dumpshaders command to dump internal glsl scripts for editing.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3896 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-09-03 03:49:43 +00:00
Spoike
261b104c09 Added a cvar to enable recording mvd files containing 'unsafe' extensions, so CSQC ents can now be recorded. This defaults to off, and is expected to be enabled for mods that are truely FTE only. 
Recording qwd files works again.
Not all extensions are fully implemented, when recording both mvds and qwds, particularly the initial connection info (including model list length).
Ezquake's invalid chunk requests generate no protocol response. Ezquake should no longer kick itself after every download.
Couple of other bugs fixed.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3893 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-08-16 04:12:15 +00:00
Spoike
604576ae18 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3891 fc73d0e0-1445-4013-8a0c-d673dee63da5 2011-07-31 11:18:49 +00:00
Spoike
729d6181c2 Misc bugfixes, including q3bsp-rtlights and bloom. Matrix use clarifications. Working towards skeletal glsl code. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3890 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-30 14:14:56 +00:00
TimeServ
0f31d3d7e8 bump dynamic channel count 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3888 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 20:49:15 +00:00
TimeServ
c088ddf18e remove extra check from channel picking 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3887 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 20:26:22 +00:00
TimeServ
952f0557aa fix cl_gameclock formatting 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3886 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 18:56:18 +00:00
Lance
3ddbd0e9b1 GCC fix for my last commit 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3885 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 15:38:50 +00:00
TimeServ
fb073f3507 change alot of sprintfs 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3884 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 15:11:35 +00:00
Lance
d309c3338a Mouse-over tooltips, mostly teamplay and network ones 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3883 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 15:05:40 +00:00
Spoike
f28726af74 Trying to remove the length limit on the demobrowser filenames. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3882 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-22 13:54:42 +00:00
Spoike
8ea074e55e Fix for the script Evaron gave me yesterday. Specifically: Disable auto-repeat on triggering binds. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3881 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-19 12:34:49 +00:00
TimeServ
20180cf49f fix cl_netfps sendcmd 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3880 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-18 13:23:52 +00:00
TimeServ
a0e7300da2 add cl_yieldcpu, fix setmodel with NULL pointer 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3869 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-13 05:48:09 +00:00
Lance
eadc1d9a1e Got rid of master servers that don't exist anymore (client server browser, big speed up), added existing master servers that previously weren't being sent heartbeats 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3863 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-09 09:14:05 +00:00
Lance
b92571839e Updated the master servers the client server browser uses (Q1, Q2 & Q3), and also updated the master server list the server reports heartbeats to (Q1). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3862 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-09 06:32:29 +00:00
TimeServ
8c17e200bb fix sdl non-multithreaded 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3848 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-06 06:02:12 +00:00
TimeServ
a88b23e1f3 use colormap only for determining fullbrights, commit in sound paint funcs 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3847 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-06 05:53:25 +00:00
TimeServ
c6f4994293 attempt fix minimal build, add 7.1, try to fix speaker spacialization 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3846 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-06 01:40:40 +00:00
TimeServ
7f1db63765 remove defunct splash screen code, add cl_idlefps to reduce cpu usage in "idle" situations 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3845 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-06 01:01:13 +00:00
TimeServ
4a59ea5993 make threaded physics/input/whatever use generic mutex calls, fix up multithread calls and add sleep func 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3844 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-03 16:24:53 +00:00
Lance
f870305702 Removed -rdynamic from MinGW targets, others are compile fixes 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3842 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-07-01 07:27:38 +00:00
Spoike
61e4aa96b3 removed separate trigger/solid links. 
some q3 fixes.
q2 will autosave on map changes, like q2 normally does.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3839 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-29 18:39:11 +00:00
TimeServ
e9af82b76b version bump and version string fix 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3837 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-25 23:40:34 +00:00
TimeServ
1c1723d237 merge wip branch back into trunk 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3835 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-25 18:33:11 +00:00
TimeServ
62585f3a83 disable texture menu for non-gl builds 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3833 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-25 12:41:40 +00:00
Lance
faabc498a1 Hexen2 crashfix for stmedgaz.mdl not found (medusa poison gas) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3832 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-25 12:00:59 +00:00
TimeServ
d474631cd4 allow crosshairsize to scale console font crosshair 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3831 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-24 01:05:43 +00:00
TimeServ
c9186d2ab5 quick rail fix for highfps set 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3827 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 19:00:14 +00:00
TimeServ
58c2c63708 misc particle fixes 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3825 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 15:00:56 +00:00
TimeServ
c3573173ef fix sin/cos table macros 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3824 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 13:57:20 +00:00
TimeServ
9d87fd127c fix high fps particles on classic r_particlesystem, don't pass trailstate to fallback system, fix trail names in particle sets 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3823 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 13:05:14 +00:00
TimeServ
9d4586b532 delink particle states on r_particlesystem change, correctly use default trails on models 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3822 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 12:25:36 +00:00
TimeServ
027c09bd6a cl_indepphysics -> cl_threadedphysics, properly register r_rockettrail/r_grenadetrail, fix menu spacing regression 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3821 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-18 05:41:10 +00:00
Spoike
74e9d14432 Added vid_triplebuffer to enable/disable triplebuffering in d3d (gl_triplebuffer is now an alias to this). Has no effect in OpenGL as OpenGL does not provide a way for an application to set, or even query. 
Blocked vid_restart use from configs. Engines that write vid_restart into config.cfg are the antisocial engines that do not understand keeping themselves to themselves, and they can keep their half-speed startups to themselves. Even in such engines, such configs ignore the commandline.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3820 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-17 01:54:54 +00:00
TimeServ
2fe74cfda3 shameless quick menu collision hack 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3819 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-16 21:41:05 +00:00
Spoike
174ba9f64b Trying to fix lingering d3d bugs. Added support for proquake's angles extension. Various other hacks and changes and tweeks. Mostly trying to fix D3D issues. Also added con_separatechat cvar. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3818 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-16 02:03:57 +00:00
TimeServ
b0124c7df5 remove cl_predict_players2, slightly more menu work 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3817 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-15 23:01:07 +00:00
TimeServ
eda3ab4e6f small fixes, add teamplay settings under multiplayer 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3815 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-09 07:09:53 +00:00
TimeServ
67139b771a menu overhaul (unfinished, still need more tips, tp/cheats/other entries still need readd) 
fixes to menu system, removed/corrected some cvars


git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3814 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-07 23:54:58 +00:00
Spoike
78d4632097 Added -dumpstack option to catch fatal signals for stacktrace dumping. Writes to both stderr and a crash.log in the WORKING directory. Admins are expected to email a copy or something to an FTE dev, then delete it. Clients connecting will be notified, but unable to obtain actual details via quake. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3813 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-06 01:41:33 +00:00
Spoike
d039841d21 Does this fix anything? 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3812 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-05 23:53:33 +00:00
Spoike
f66110b5e6 Trying to fix mvd recording/playback a little. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3811 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-05 01:36:14 +00:00
Spoike
0d17471975 Tiny bugfixesish. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3810 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-04 16:11:35 +00:00
Lance
71b8797d9e More MinWW64 warnings addressed. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3809 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-04 12:56:45 +00:00
Lance
950f914180 More GCC warnings gone (32 & 64bit) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3806 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-02 05:16:44 +00:00
Lance
21860bd9dc Fixed more GCC warnings, alot of 64bit portability things mostly. Minor PNG header fix. Changed instances of errno to strerror(errno). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3805 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-06-01 13:21:54 +00:00
TimeServ
8464020053 remove gl_lightmap_shift, fix shader to match gl_overbright, es2/egl fixes 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3804 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-30 21:48:32 +00:00
Lance
fc421a05bc Added parentheses around some assignments (where they're meant to assign instead of compare in an if statement) which GCC was giving this warning "warning: suggest parentheses around assignment used as truth value" 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3803 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-30 13:36:44 +00:00
Lance
4b93855ff8 Handling of return values of filesystem functions (fread, write etc) by printing to console when the return value isn't equal to size of the data being read/written 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3801 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-30 04:32:04 +00:00
Lance
afa29b36fb Wrapped #pragma comments()'s with MSVC specific macros so GCC can be read more easily. Also undeprecated edict_size in world.h. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3800 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-29 04:26:29 +00:00
Lance
d66ee38d9f Minor fixes to libpng to support the 1.5.x series (previously deprecated things that were removed/renamed) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3798 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-28 13:43:11 +00:00
Spoike
ccc0750de0 Trying to fix bugs. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3797 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-27 17:59:31 +00:00
Spoike
646fd03f44 Trying to fix stuff. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3796 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-26 16:46:43 +00:00
Spoike
d5ab16befc heightmap semi-functional again, but still useless. 
A few bugs fixed.
Slightly better compatibility with DP.
Added breakpoint_csqc command to set breakpoints in csqc to better debug csprogs.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3793 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-20 04:10:46 +00:00
Lance
9c0a84e3aa SDL again, previous rev (3720) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3792 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-19 16:26:50 +00:00
Lance
f32d19e0f9 Reverted back to previous revision (3401), SDL miscommit by me 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3791 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-19 16:24:59 +00:00
Lance
a2fa186921 Reverted back to r3711, miscommit on my behalf 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3790 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-19 16:09:33 +00:00
Lance
f6a334e87e Slight modification to my last commit, so MSVC can still compile it 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3789 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-19 13:55:05 +00:00
Lance
0e078381b3 Fixed incorrect pointer types, and some other warning types for GCC and MinGW 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3788 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-19 13:34:07 +00:00
Lance
f6741d8dde My attempt at handling GCC warnings, everything but incorrect pointer types, #pragma warnings, " is deprecated etc. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3787 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-05-15 13:23:13 +00:00
Spoike
132ef961bc Fixes... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3785 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-30 17:58:24 +00:00
Spoike
93aba48cdc TA couple of fixes. 
Meshes now have the right lighting if they were cached before rendering.
npFTE startup/shutdown/restartup is more robust and is less likely to crash browsers.
Re-added the r_shadows cvar. It now provides blob shadows.
Hopefully fixes mingw voip crash, may need mingw upgrade, sorry in advance moodles.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3784 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-30 17:21:10 +00:00
Spoike
5edcd6c0e8 compile fix for d3d. 
changed screenshot message to show the full path of the screenshot (so you can find it in your profile dir and stuff).
removed a couple of warnings.
fixed the screenshot code for windowed mode and privacy concerns.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3782 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-25 13:48:30 +00:00
Spoike
528b27b719 Hopefully improves lighting on players, they won't look so garishly ugly any more. 
Also added powerup shells. Could do with some glsl, or a texture or something. Defaults to off.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3781 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-25 03:25:22 +00:00
Spoike
f7aece9d48 Moved entity and poly handling code to a common location. This means sprites work in D3D. Fixed .alpha on mdls. Slightly better q2 compat. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3779 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-23 20:37:20 +00:00
TimeServ
0ffb6c11e2 use q2 style lightmap clamping 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3778 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-21 12:11:15 +00:00
Spoike
546c49870d Fixes a couple of bugs, the overkill way. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3777 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-20 23:34:13 +00:00
TimeServ
5cc7d591fd code cleanup, fix a few things set as RESTRICT_RCON, attempt to fix up color lighting clamping problem, add r_lightstylesmooth_limit 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3776 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-20 23:05:45 +00:00
Spoike
84717bc230 Fix sounds not downloading when precached only in csqc. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3775 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-20 21:32:43 +00:00
Spoike
b59935e30f Q2 choke info works, so netgraphs are now sane. Q2 has its own gunkick cvar, so the default doesn't make q2 seem broken. Changed Q1 dlight flickering behaviour - pick a new value no more than 20 times a second (500 updates without vsync was horrible). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3774 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-20 03:38:59 +00:00
Lance
a39d6740c5 "Apply" menu option now works on D3D builds (when changing 3d, 2d resolutions etc) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3771 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-04-03 04:49:33 +00:00
TimeServ
52fd75801c attempt implement d3d and gl es getrgbinfo, fix typos/commit with crosshair 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3766 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-31 23:05:19 +00:00
TimeServ
0a1b14b202 attempted v_cshift fix for bad gamecode, move gl crosshair code to r2d, default crosshaircolor to 255 255 255 since now crosshaircolor/crosshairalpha work on crosshair 1 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3765 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-31 19:46:26 +00:00
TimeServ
795406b8e4 gldraw_transpictranslate -> r2d_transpictranslate, removed old unused code 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3764 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-31 11:00:23 +00:00
Spoike
6a4976300e fog control, vaugely similar to fitzquake, but runs slower. does at least work properly with rtlights. 
fixed menutint.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3761 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-31 02:32:32 +00:00
TimeServ
a0f3482093 change out "renderer specific" draw_* calls for r2d_* and trim rendererinfo struct 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3760 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-31 01:14:01 +00:00
TimeServ
479bf96982 move ver info to bothdefs.h, work in resource script to get windows exe data to match 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3759 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-30 20:10:24 +00:00
TimeServ
15498207a7 replace Draw_Fill/Draw_FillRGB -> Draw_FillBlock 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3758 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-30 17:34:37 +00:00
TimeServ
e4e2399c69 change out build number/version number logic, remove some unused variables 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3757 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-30 15:17:55 +00:00
TimeServ
cdb6dccb97 remove bulleten support, rename vidgles -> videgl 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3756 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-24 14:35:24 +00:00
Spoike
8d0800545b Cleanups, wine fixes, generic stuff, added makefile directive for use of gccs -combine option. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3754 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-12 13:52:24 +00:00
Spoike
fcb7dbd04b Cleanups, wine fixes, generic stuff, added makefile directive for use of gccs -combine option. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3753 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-12 13:51:40 +00:00
Lance
334ebf7b67 Latest GCC and MinGW hate certain #pragma's, just making the old main trunk compile again 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3752 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-10 09:07:43 +00:00
Spoike
933c854776 small fix that will never be noticed. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3749 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-06 15:34:56 +00:00
TimeServ
b558134529 new defaults: snd_khz 44/gl_overbright 1/r_lightmap_shift 1, merge mdl alias frame code, report .bsp missing instead of .cm 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3744 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-03 17:09:15 +00:00
TimeServ
c75305f9bf hack in overbright into d3d path, isolate d3 map support into MAP_PROC define so hopefully minimal can build again 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3743 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-03 13:32:27 +00:00
TimeServ
85fc11e682 trash assembly, old d3d renderers (d3d7/d3d9/fakegl), projects and makefile broken in this commit 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3742 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-03 12:57:34 +00:00
Spoike
79497a07f7 overbrights. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3741 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-03-02 03:43:38 +00:00
TimeServ
23bc19fc14 particle parse fix (count=255 should be explosion), fix qtest mdl loading, fix decompile, map MOVETYPE_ANGLENOCLIP to MOVETYPE_NOCLIP, map some qtest builtins/globals 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3740 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-02-27 15:01:56 +00:00
Spoike
552e396b98 grr 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3739 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-02-27 02:09:45 +00:00
Spoike
060fc0f546 grr 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3738 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-02-27 02:07:49 +00:00
Spoike
d7b9d1019a fix makefiles for the recent d3 proc hack 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3737 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-02-27 02:04:36 +00:00
Spoike
cb834a8534 Forgot to add this. its buggy as heck. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3736 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2011-02-27 01:01:22 +00:00