eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity
3334 commits 1 branch 0 tags 50 MiB
Commit graph

2902 commits

Author SHA1 Message Date
Spoike
921bfbb1d3 Fixed some warnings. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3257 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-11 18:23:57 +00:00
Spoike
386aac4da7 Stub out bindbuffer if its not present. The generation code will work around it. The renderer will ignore it. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3256 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-11 18:23:07 +00:00
Spoike
f7b9395261 Updated to support mvdsv's qvm api version 13 instead. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3255 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-11 18:22:02 +00:00
Spoike
03aa7fefaf Fixes a conflict. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3254 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-11 18:21:14 +00:00
Spoike
0cf09d8063 Well that was a stupid bug. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3253 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-11 16:49:36 +00:00
Spoike
b1ac73b6cb Should help mingl 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3252 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-09 22:12:29 +00:00
Spoike
2513254510 My god, was I asleep when I did that? 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3251 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-09 18:31:43 +00:00
Spoike
eda16ea10f Permit precaching of just an md5anim with no md5model. You'll see a debug wireframe skeleton if you actually try drawing it. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3250 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-08 01:17:27 +00:00
Spoike
6147a2dcd3 That should fix bigfoot's shift. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3245 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-07 21:32:54 +00:00
Spoike
699104d667 Notify text should no longer be in the middle of the screen. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3244 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-07 20:00:19 +00:00
Spoike
cfadc8e717 Now works properly with larger multi-surface md5 models. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3243 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-07 06:35:15 +00:00
Spoike
c021324009 Fixed non-square dds images. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3242 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-07 06:34:07 +00:00
Mark Olsen
670b45edd9 Now builds again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3241 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-06 13:36:16 +00:00
Mark Olsen
632cba0618 No, Spike, you're not programming C++. Besides, b was already declared once. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3240 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-06 13:33:12 +00:00
Spoike
e1ab049608 Attempting to fix recent breakages. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3239 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-06 07:45:46 +00:00
Spoike
4767b7215d Blame the monkey. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3238 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-06 06:09:49 +00:00
Spoike
7ddd50b854 frames keyword is now supported in externalanim files. 
it inserts an entire anim into a sequential series of frames.
there's no control over starting/ending frame numbers. so you need to change frame indexes if any frames are added/removed in any md5anim files that are expanded in this way.
void(float modidx, string framename) frameforname = #276 should be usable for this, but its not tested yet - expanded frame names are eg: path/blah.md5anim0

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3237 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-06 01:44:26 +00:00
Spoike
18b617f4a1 vweps. 
added builtin float(float modidx, float framenum) getframeduration = #277; to both csqc and ssqc.

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

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3234 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-05 18:45:53 +00:00
Spoike
5206c1a0c8 Fixed a couple of bugs regarding normals. Welded verts together that share coords, compensated for angle of triangle, skeletal fat bastards (erm), added clampgroups to possibly freeze an animation at its end. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3233 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-04 16:53:01 +00:00
Spoike
2b58210060 Bugfixes courtesy of Blub: 
Fixed new line counting in multi-line comments.
Fixed unary operators to favour a single term, except for the unary not operator.
Added:
Unary not operator warns whenever it consumes more than a single term.
Added more ways to optimise logic (a+0 = a).


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3232 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-07-03 19:02:42 +00:00
Spoike
2f848fa7b0 Should now calculate and animate vertex normals on skeletal models, and apply that for the q1-style lighting. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3231 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-30 22:05:18 +00:00
Spoike
ca7a6224a4 Fixed flickering entities bug. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3230 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-28 19:57:09 +00:00
Spoike
06b20185b5 cmd efpslist now shows incoming/outgoing packet rates per client, too (expressed in bytes per second - same as rates). 
Semi-colon can now be bound properly in the menus.
Fixed a bug with one of my more recent commits.

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

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3226 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-21 17:45:33 +00:00
Spoike
8260a0d206 Doesn't look like indexes are actually needed first here (this should fix the issues with the md5s that electro has). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3225 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-17 21:57:45 +00:00
Lance
17512cc406 Changed all instances of -lwsock32 to -lws2_32, "apparently wsock32 is old and shouldn't be used (since win95..)" 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3224 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-14 13:51:13 +00:00
TimeServ
cefc6d187a fix makefile for qclib 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3223 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-14 01:15:00 +00:00
Spoike
82f3ae2102 Looks like someone forgot a file. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3222 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-13 20:52:43 +00:00
Spoike
1c985c65d2 and a bit more 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3221 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-13 12:25:39 +00:00
Spoike
b3b885c122 Trying to clean up qclib a little. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3220 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-13 11:57:52 +00:00
Spoike
bd51fb8e9d Fixed unproject to work as originally intended. Rather than just being a steaming pile of poo (it was the matrix inversion routine that was broken). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3219 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-11 21:09:39 +00:00
Spoike
c66ff953b5 Fixes up tcpconnect a bit (based on bigfoot's patch). Should now work a little better than it ever did. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3216 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-10 22:36:53 +00:00
Lance
226ae08d0a Use -DCLANG with clang (sv_rankin.c hotfix), Makefile cleanup (cleaner filenames) and -D_SDL added to the 
win32_SDL 
targets


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3215 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-08 08:10:32 +00:00
Lance
691f57ee80 Changed path to a SDL header, only affects mingw32 + SDL 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3212 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-07 13:25:02 +00:00
Lance
a028aca503 r3120 take 2. Applied a parentwindow fix to the Windows SDL binary, now exits gracefully instead of a crash. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3211 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-03 09:13:55 +00:00
Lance
183461a428 Crossbuilt MinGW32 SDL binaries working again, applied a parentwindow 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3210 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-06-03 09:09:35 +00:00
Spoike
f472410ad2 Fixes the angle clamping issue in q3. The cgame is meant to clamp, not the engine. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3209 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-31 11:46:57 +00:00
Spoike
f3970ede24 Hopefully fixes the recent +gamedir failures. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3208 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-30 23:54:41 +00:00
Spoike
d010181ff7 Work around for mvdsv's latest incompatibilities. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3207 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-30 23:48:18 +00:00
Mark Olsen
b5106b68a4 Now builds and works again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3206 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-30 21:14:31 +00:00
Spoike
6b21ccabee ATI suck almost as much as I do 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3205 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-25 14:05:35 +00:00
TimeServ
740f4a09f9 actually apply fteqcc intrinsics patch http://stud4.tuwien.ac.at/~e0725517/patches/fteqcc_fix_intrinsics.diff 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3204 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 18:56:05 +00:00
Spoike
6d3e1b7188 Fixing up some custom build assembler commands. They were missing quotes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3203 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 15:00:31 +00:00
Spoike
95a26340ac Added the fs_win32.c file to the 2005 projects. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3202 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 14:47:11 +00:00
Spoike
bd22b975d0 Attempt 2. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3201 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 11:24:57 +00:00
Spoike
252face9c5 Should fix my breakage of morphos builds. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3200 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 11:20:21 +00:00
Spoike
9a20ae8fa2 Fixed linux sw building. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3199 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 10:51:01 +00:00
Spoike
dcefeaa8fa Fixed the makefile so qcc builds again by default. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3198 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 10:49:21 +00:00
Spoike
b7c8b33b98 Stopped Moodles from being quite so evil. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3197 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 10:37:50 +00:00
Spoike
0afe8f9dc5 Didn't test all targets. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3196 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 10:28:26 +00:00
Spoike
9cd988a836 Added csqc->ssqc requests. 
Fixed up cl_indepphysics. Sending is fully independent, bar sync points.
Fixed so #if 0 works in qc code.
Fixed up error conditions in qclib when features are not supported.
The webpage generator will now refcount properly.
Fixed error conditions when using glsl shaders.
If MULTITHREAD is defined, r_loadlit will not light inside a separate thread.
We now generate VBOs for bsp objects. Shaders/rtlights don't use them yet.
Fixed up MVD/multiview playback a bit. It now looks like it works! (cl_hightrack will no longer track the same person in all views).
Fixed error conditions when attempting to download versioned csprogs.
Reduced the number of places that a q3-style marked up string is expanded. I think there are a couple places left still though. Approximated ezquake colour codes.
Memory mapped read file access in win32, where we can. Not sure about this. Lets see how things pan out.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3195 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-24 10:11:17 +00:00
Spoike
48e757c860 cosmetic changes. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3194 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-21 09:36:18 +00:00
Spoike
640aafdc34 Makes Q3 somewhat playable again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3193 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-20 23:59:17 +00:00
Spoike
80e511ec1e Try and get alsa to start up and work a bit more reliably, an impossible task, I know. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3192 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-20 17:28:15 +00:00
Spoike
88085a1cbc Strip out some dead code 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3191 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-20 17:25:48 +00:00
Lance
4e21d2c88d Blub\0's FTEQCC patch, to fix intrinsics: http://stud4.tuwien.ac.at/~e0725517/patches/fteqcc_fix_intrinsics.diff 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3190 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-19 01:54:00 +00:00
Spoike
ff22785542 Should fix certain compiler issues reported to me by Blub\0, found when compiling nexuiz code. This is Blub's fix. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3189 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-11 00:17:31 +00:00
Mark Olsen
2decc6d5c8 Please do not try to shut down the video code twice, kthx. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3188 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-10 21:44:13 +00:00
Lance
cdb9eed996 Fix GCC complaining about Mod_GetBoneRelations having conflicting types with the software-only client. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3187 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-05-07 12:18:35 +00:00
Mark Olsen
af09a50527 Fixed 'unban all' to unban all, not just the first. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3186 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-28 15:49:20 +00:00
TimeServ
022e1dc76e possible sw linux build fix, add tooltip code (but no tooltip text associated with anything yet) 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3185 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-19 10:50:31 +00:00
Lance
812ae15aaf "version" command I tried to make it be more helpful by identifying the compiler that was used to build it, and also identifying any optimizations (or lack of) that were used during the compile process. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3184 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-19 05:01:55 +00:00
Lance
57c102a6b6 GLRelease was using __fastcall (/Gr) which was causing black screens when trying to use the plugin and also causing firefox to crash if the plugin was still open in a tab when trying to exit firefox. __cdecl (/Gd) was the solution. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3181 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-19 01:42:02 +00:00
Spoike
a96b5ee4e9 okay, the cprint builtin I just added will now actually do something useful. ho hum. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3179 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-19 01:02:56 +00:00
Spoike
5f1a9d8cbf added cprint console command. 
fixed nq client loading-screen persisting bug
fixed nq clients getting flooded by packets.
fixed nq clients not receiving any entities
removed a bit of redundant code in pmove
fteqcc: merged array function calls with real function calls, fixing return values in the process.
vid_preservegamma now defaults to off. windows sucks.
tweeked the prototype FTE_CSQC_SKELETONOBJECTS a bit. still not official nor advertised.
added a little bit more functionality to halflife support
csqc got some pmove tweeks. this is how I want it to work. nothing has been changed that is really incompatible with darkplaces in this commit.
added markers around some ext_csqc_1 features.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3178 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-19 00:50:42 +00:00
TimeServ
42b4577802 don't flash when already the active window 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3177 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 23:48:35 +00:00
TimeServ
caa9dffb2c fix sw screen render to act a bit more like gl 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3176 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 23:29:03 +00:00
Lance
4b85112ce1 Added ctype header to fix MSVC2008 complaining about "tolower" being unresolved. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3175 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 23:17:09 +00:00
TimeServ
2f6fb049e4 revert splitclient, fte->fteh2 for hexen 2, fix sw console background drawing 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3174 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 22:55:00 +00:00
Spoike
d96f8e3d77 No more upside down spiders in hexen2. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3173 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 22:03:59 +00:00
TimeServ
5381de8bd5 set splitclients to 1 for q2 sendcmd 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3172 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-18 21:21:27 +00:00
Spoike
c3300cb0f7 Fix non-win32 builds again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3170 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-13 12:54:18 +00:00
Spoike
b8bd024a1d Tweeked the filesystem some more, now prompts if a game directory could not be found. 
Fixed up clipped decals slightly. They should now be usable.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3169 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-12 16:57:30 +00:00
Lance
43d97c3e31 win_SDL binaries now have icons 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3168 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-10 03:39:47 +00:00
Spoike
aa8ca7c111 Can script some things now, including playername and connecting it to other servers. Though its still a little limited in what it can do. 
Scripting does work with both firefox and opera. Don't know about others.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3167 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-10 00:33:02 +00:00
Spoike
1c644b51e7 Fixes a crash with demos. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3166 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-09 07:19:59 +00:00
Lance
e71b59bf92 Crosscompile all Win32 SDL binaries from Linux with FTE_TARGET=win32_SDL, binaries have been tested alittle and still have bugs 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3165 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-08 08:12:29 +00:00
Spoike
9a2ed9307a Quick fix for something that noone noticed. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3164 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-07 20:03:25 +00:00
Lance
84117bd7e3 MinGL & Merged targets added to SDL. Dedicated server, OpenGL & Software rendered SDL clients now build in Linux 
and run but untested. r3162 was to resolve the SDL MinGL's build error: undefined reference to `NET_Sleep'


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3163 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-07 03:48:32 +00:00
TimeServ
aac9ba3f4f oh hey look i can code without looking at the specs oh wait 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3162 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-07 03:41:24 +00:00
TimeServ
e79171082f sdl wait code possible fix 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3161 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-07 03:38:08 +00:00
Spoike
e403cebc65 Should be more robust with first-run config execs now. 
Multiple download sources can be specified (eg for mod+map). Takes the form "providedfile:urltodownload providedfile:urltodownload". This comes via the browser so relative urls = woot. The old single-url-only path is no longer supported. This is an incompatible change, but we're still young. The unpacking process is still the same, and still only paks/pk3s are extracted. Note that the providedfile is relative to the base dir rather than the game dir. You can specify potential alternate gamedirs.
The QTV file is not mandatory, you can use map="blah" join="blah" stream="0@blah", so long as you set the mime type as: type="application/x-fteplugin". src="someqtvfile" still works, of course (and doesn't mandate the type= field, although that should probably be specified to make life easier on configuring servers to use the correct mime types).
The splash image can be set with: splash="myurlhere". Note that only jpg and png files are supported. This comes via the browser so relative urls = woot.
Game property can take multiple game dirs now, too. First argument is the basic game. If its one of the special ones then FTE is meant to hunt down your prior install for that. If its not recognised then its added as the only game directory. Additional ones are added after (eg: "id1 fortress" adds just id1+fortress while "q1 fortress" adds id1+qw+fte+fortress). Use appropriately.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3160 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-07 01:26:47 +00:00
Lance
f2688e7866 My attempt to get SDL binaries under Linux to compile 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3159 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 14:19:29 +00:00
Lance
030e080baa Wrapped sv.state with #ifndef CLIENTONLY to resolve npqtv's compile 
error (I hope it's the proper fix, Spike please check if I did the 
right thing):
./client/cl_main.c: In function "Host_Init"
./client/cl_main.c:3708: error: "sv" undeclared (first use in this 
function)
./client/cl_main.c:3708: error: (Each undeclared identifier is reported 
only once


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3158 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 05:46:17 +00:00
Lance
648caa9c57 Just make the help output alittle more helpful, added crosscompiling 
comments


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3157 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 02:45:11 +00:00
Spoike
8b022435de make msvc2005 happy. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3156 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 01:23:44 +00:00
Spoike
a838650a40 try that 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3155 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 01:01:31 +00:00
Spoike
879e5b59c6 Missed a file. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3154 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 00:54:46 +00:00
Spoike
2adb420a6d Reworked the console/loading screen a little. The console is no longer directly shown at startup. MSVC2005 project files update for npqtv. 
Added vid_wndalpha to make the window transparent (only supported in GL-win32).
Multiple issues with SW rendering, which I'll fix eventually. It does at least run, even if it looks ugly.
Plugins are now able to read the console input. Bigfoot, feel free to tweek.
Fixed up a few mismatched prototypes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3153 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-06 00:34:32 +00:00
Spoike
6ebabd8d88 GCC-built plugins no longer insta-crash. Go Mozilla! You rule!... 
'make npqtv-dbg' works for me.

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

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3148 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-04-01 22:03:56 +00:00
Spoike
262bc69548 So I can define globals/functions as static. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3147 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-29 23:47:29 +00:00
Lance
2e768fe44c Blub/0's fteqcc macro line fix to quote "seem to be some problems with 
newlines in macros (causing wrong line numbers in error/warning 
outputs)"


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3146 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-20 01:12:01 +00:00
TimeServ
4f6543abc2 commit back older jpeg.lib 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3145 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-08 06:57:08 +00:00
Lance
c8315688b0 IJG's r6b JPEG library with x86SIMD support v1.02 (2006-02-04): http://translate.google.com/translate?hl=en&sl=ja&u=http://cetus.sakura.ne.jp/softlab/jpeg-x86simd/jpegsimd.html&sa=X&oi=translate&resnum=1&ct=result&prev=/search%3Fq%3Dhttp://cetus.sakura.ne.jp/softlab/jpeg-x86simd/jpegsimd.html%26hl%3Den%26safe%3Doff%26client%3Dfirefox-a%26rls%3Dorg.mozilla:en-US:official%26hs%3D3fO 
Compiled with VS6. FTE compiles fine in both VS6 and VS2008. Unsure if I compiled it with MMX or SSE, if it is SSE it might crash on CPUs with bugged SSE implementation like the old Athlon XPs

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3144 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-08 01:55:17 +00:00
Lance
da6a8bb1e5 A "proper" (VS2008 converts it and compiles from it no problem, I didn't actually test with VS2005) for a different file I commited in r3141 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3143 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 12:08:33 +00:00
Lance
a0c23db682 A "proper" (hopefully) for the file I commited with r3141 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3142 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 12:02:23 +00:00
Lance
1db5efee0b My evil commit, libjpg & libpng static libraries has been compiled from scratch with VS6 (and work with VS .net 2008 aka VC9). LibPNG upgraded from 1.2.10 
to 1.2.35 to cover any possible exploits. I hope I haven't broken anything (had to ignore msvcrt.lib as well as libc.lib to get VS to compile with my libs)

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3141 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 11:50:19 +00:00
Spoike
eb6d283806 Does that get past the msvc2008 bug yet? 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3140 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 05:22:17 +00:00
Spoike
76f6ad0345 CSQC_DAT and MENU_DAT can now be enabled in CLIENTONLY/MINIMAL builds (so long as both are enabled). 
Tweeked a statement that was causing crashes with msvc2008.
Dedicated servers should build again.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3139 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 05:05:54 +00:00
Spoike
75fb5f5398 The different aspects of directx are now activated independently from each other, allowing greater custom build control. 
Tweeked win64 options so as not to conflict with 32bit builds.
Win64 builds now with NO_LIBRARIES added. Yes, you need to provide 64bit libraries yourself if you want to use them (dinput/dsound should be part of the directx sdk and are, strictly speaking, not re-distributable). See bothdefs.h for how to activate individual 64bit libs.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3138 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 04:37:24 +00:00
Spoike
dad710ee27 Fixes the other IRC plugin crash. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3137 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 03:55:51 +00:00
Spoike
37fbf203c5 This should fix Moodles's release-only crash. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3136 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-07 03:48:02 +00:00
Lance
44c39eb40d Updated the MinGW libpng library to latest version (1.2.35) from 1.2.22 
to enhance security and possible crash bugs.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3135 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-06 05:06:25 +00:00
Spoike
7156e20dfe Mneh, it matches. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3134 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-04 00:29:22 +00:00
Spoike
c50ea9c54a Fixed a warning. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3133 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-03 01:53:19 +00:00
Spoike
b763b5594d My monthly commit. I wonder what I broke. 
Contains some stuff to get twig working a little better.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3132 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-03-03 01:52:30 +00:00
Spoike
ed0cb0749b Added a developer print any time any hostname (or ip) is resolved. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3131 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:51:52 +00:00
Spoike
99c153199e version console command is now common, instead of client only. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3130 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:50:17 +00:00
Spoike
eff6909662 Fixed a warning. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3129 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:48:40 +00:00
Spoike
af1ccb9333 Support for valve-style lmps/qpics on the conback. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3128 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:47:49 +00:00
Spoike
02b182a260 Fix a crash with halflife sprites. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3127 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:46:48 +00:00
Spoike
aac9d42554 Fixed up halflife model support - we now support models with textures stored in an external model. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3126 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-22 13:45:35 +00:00
Spoike
d18566f4e8 My god. I suck. I really do. I really really apologise. Sorry. Really really sorry. GAH! 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3125 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-21 22:27:51 +00:00
Spoike
672035b1a9 Fixed particles. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3124 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-10 21:50:10 +00:00
Spoike
3b402813d8 Don't resolve master servers at startup. This stops huge stalls when you don't have complete internet access (lan games/single player). 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3123 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 19:05:28 +00:00
Spoike
32591b4df6 second attempt at ctrl+enter 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3122 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 18:42:41 +00:00
Mark Olsen
c3e186ef7a Spike is ordering me to break things again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3121 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 14:31:11 +00:00
Spoike
40742dcc55 Forgot to commit this. Whoops. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3120 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 14:29:19 +00:00
Mark Olsen
9adb6c81d9 Reverted to revision 3116. Spike, use a real compiler. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3119 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 13:49:12 +00:00
Spoike
c8f10aa212 Allow the user to change the protocol used by FTE to connect to itself. Only 'qw' is fully reliable at the moment, and that's the default. Eventually this can be cleared out to default to match the running progs type. 
Also made the 'user' command semi-work in NQ.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3118 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 04:39:46 +00:00
Spoike
c737b31f1b Reverted bigfoot's reversion. Fixing the reason why bigfoot felt a need to revert - an old prototype in the header. This should make sw rendered particles a bit better. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3117 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-08 04:34:12 +00:00
Mark Olsen
1e02645c08 Caps lock, work! 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3116 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-07 00:02:03 +00:00
Spoike
29e4982454 Fix for bigfoot with his weird trailing slash in his $HOME. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3115 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-03 00:12:50 +00:00
Spoike
c11da690e1 Fix for player colormaps with NQ protocol. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3114 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-02-03 00:08:32 +00:00
Spoike
4e5e28b1ee Fixes the phantom grenades in twig. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3113 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 06:46:21 +00:00
Spoike
a7ee0f883d Fixes rotations in twig. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3112 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 06:32:49 +00:00
Spoike
88aa502054 Reduced spam a little. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3111 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 06:31:51 +00:00
Spoike
51ec8d2912 trying to make bigfoot happy. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3110 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 04:42:26 +00:00
Spoike
d3bcc14e5a Should allow bigfoot to aim with the lightning gun. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3109 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 04:20:46 +00:00
Spoike
40a24ea7f2 Please insert volume... 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3108 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 03:54:03 +00:00
Spoike
02b53fc859 When acting as an NQ client, actually send impulses please. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3107 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 02:50:01 +00:00
Spoike
e2b905e74c NQ clients now get broadcast messages again. Whoops. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3106 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-30 02:48:03 +00:00
TimeServ
1206f6ae07 removed const block/default string logic because it doesn't realloc safely and doesn't really save much, substituting code should catch the common cases anyway 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3105 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-29 02:55:08 +00:00
Spoike
f06fcc78af Fixed a potential incomprehensible server message bug. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3104 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-29 01:41:28 +00:00
Mark Olsen
3e6d9af3d4 Ugh, when a player changes a userinfo string, please don't send the update to all connected players n times, but just 1 time. 'Fixes' the 'crashes' on busy servers, but the real problem is still there: Too much client input can clog up the server, effectively causing a DoS. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3103 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-22 04:08:45 +00:00
TimeServ
8b658df029 attempted vs2008 compile fix 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3102 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-18 01:47:48 +00:00
Mark Olsen
e3017a8fe4 Some random #ifdef SKELETALMODELS scattered around the code. Enough to make it build, but not enough to exclude unused code from being built. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3101 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-16 01:24:57 +00:00
Mark Olsen
2f59695476 Reverted to r3051 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3100 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-15 16:06:55 +00:00
Spoike
4b1032c337 Script particles and d3d renderer will now build again. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3099 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-15 04:58:12 +00:00
Spoike
9fc7a20e9c old fixes including for rgb_gen_topcolor in shaders 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3098 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-15 04:56:44 +00:00
Spoike
7f90f66bfc Strip all extensions before trying to add new ones to image file names. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3097 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-14 16:08:57 +00:00
Spoike
45692d1d1e an old new feature which had been on the wrong comp for a while. 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3096 fc73d0e0-1445-4013-8a0c-d673dee63da5
 2009-01-14 16:07:07 +00:00