1
0
forked from 0ad/0ad
Commit Graph

942 Commits

Author SHA1 Message Date
8364a7fffe Non-gcc fixes
This was SVN commit r698.
2004-07-10 22:05:33 +00:00
901d44d2a6 More SDL_ACTIVEEVENT
This was SVN commit r697.
2004-07-10 21:50:35 +00:00
929fe237ce SDL_ACTIVE => SDL_ACTIVEEVENT (wsdl called it SDL_ACTIVE - official SDL has it
as *EVENT). Support for the "windowed" config value, and a bool
fullscreen
argument for set_vmode.

This was SVN commit r696.
2004-07-10 21:33:31 +00:00
1001aeacf5 Linux/GCC compat, headers and such
This was SVN commit r695.
2004-07-10 21:25:35 +00:00
073a683e56 gcc fixes
This was SVN commit r694.
2004-07-10 21:23:06 +00:00
b780be8bde wchar_t/etc fixes
This was SVN commit r693.
2004-07-10 21:21:20 +00:00
0eecb81bac wchar_t/etc fixes
This was SVN commit r692.
2004-07-10 20:56:15 +00:00
2dbaa2129f wchar_t/etc fixes
This was SVN commit r691.
2004-07-10 20:44:28 +00:00
970685e82c wchar_t/etc fixes
This was SVN commit r690.
2004-07-10 20:33:42 +00:00
4769a92894 Added newline at end
This was SVN commit r689.
2004-07-10 20:28:18 +00:00
5c4699d7dc wchar_t/etc fixes
This was SVN commit r688.
2004-07-10 20:25:20 +00:00
c00e774089 Removed crc32 code - use zlib's instead
This was SVN commit r687.
2004-07-10 20:24:33 +00:00
c3c0f5194e CStr16 => CStrW. CStr16 is a deprecated name
This was SVN commit r686.
2004-07-10 18:58:09 +00:00
027d18a8b5 Linux/GCC compat
This was SVN commit r685.
2004-07-10 18:57:13 +00:00
cdd3317ded utf16string defines a basic_string specialization for UTF-16 strings stored in
uint16_t's

This was SVN commit r684.
2004-07-10 18:47:19 +00:00
77fbf1ab6d Fixed one more memory leak
This was SVN commit r683.
2004-07-10 14:14:36 +00:00
29de67dff8 Fixed potential memory leak
This was SVN commit r681.
2004-07-10 12:56:17 +00:00
268d81ad27 Fixed another memory leak
This was SVN commit r680.
2004-07-10 12:51:35 +00:00
dd700f6a4b Fixed memory leak
This was SVN commit r679.
2004-07-10 12:43:29 +00:00
1a8f8df5f6 write screenshots to /data/screenshots, now that that is possible after fixing the appropriate VFS bug :)
This was SVN commit r677.
2004-07-09 20:03:15 +00:00
127edbd271 pass FILE_NO_AIO to vfs_store instead of calling uncached_* (which ended up duplicating code)
This was SVN commit r676.
2004-07-09 19:59:19 +00:00
d5197e3c77 revised mount logic; now stores the mount point and uses it to correctly convert from VFS to native paths
This was SVN commit r675.
2004-07-09 19:58:43 +00:00
af58e59633 pass FILE_NO_AIO at open instead of calling uncached_* (which ended up duplicating code)
This was SVN commit r674.
2004-07-09 19:57:59 +00:00
fcb85a5968 Added exit() JS function
This was SVN commit r673.
2004-07-09 12:44:12 +00:00
dc5e5dd774 PNG and BMP "encode" now operational
This was SVN commit r672.
2004-07-09 02:18:59 +00:00
41d8db6f81 add vfs_exists, uncached_io, and change IO interface to value-return buffer param (void**)
This was SVN commit r671.
2004-07-09 02:17:37 +00:00
306053c994 bring read interface into line with vfs_io (value-return buffer param)
This was SVN commit r670.
2004-07-09 02:14:21 +00:00
8306c53492 increase control block size to "plenty" until things settle
This was SVN commit r669.
2004-07-09 02:13:09 +00:00
5931a06606 add WriteScreenshot (see announcements)
This was SVN commit r668.
2004-07-09 02:04:30 +00:00
bad0b0629d add lseek (needed for uncached_io)
This was SVN commit r667.
2004-07-09 00:17:55 +00:00
af9c336b43 JS GUI interface
This was SVN commit r666.
2004-07-08 15:23:47 +00:00
a8f48ff7e0 XMB
This was SVN commit r665.
2004-07-08 15:22:09 +00:00
92f14cd90a move hInst = GetModuleHandle to wsdl_init, to make sure it's done before anything else
This was SVN commit r664.
2004-07-08 15:16:31 +00:00
c33bcfd03d add keyboard hook to intercept printscreen and windows keys
This was SVN commit r662.
2004-07-08 15:11:42 +00:00
226fd70292 now open files in binary mode on windows (thanks to philip for catching this)
This was SVN commit r661.
2004-07-08 15:10:26 +00:00
fc30c305f4 Added necessary #includes
This was SVN commit r660.
2004-07-08 14:44:04 +00:00
e803594239 Removed unnecessary #includes
This was SVN commit r659.
2004-07-08 14:43:16 +00:00
a779ef8595 common interface to texture format codecs; work started on encoders (to write textures)
This was SVN commit r658.
2004-07-08 14:40:24 +00:00
b7a05fd50b fix iterator invalidation bug triggered by multiple mount points; add vfs_uncached_io()
This was SVN commit r657.
2004-07-08 14:38:58 +00:00
9f84c8b0fa Removed unnecessary #includes
This was SVN commit r656.
2004-07-08 14:36:52 +00:00
875d78d10b reqnum = int; complain if watch failed
This was SVN commit r655.
2004-07-08 14:33:58 +00:00
0c05abb304 fixes for write code and new uncached_write routine (bypass cache, no file padding problem)
This was SVN commit r654.
2004-07-08 14:30:35 +00:00
3d7b76c140 add read/write prototypes (file.cpp wasn't including a windows header that defined them elsewhere)
This was SVN commit r653.
2004-07-08 14:24:17 +00:00
b07360ccf7 reqnum uint->int, to allow error return
This was SVN commit r652.
2004-07-08 14:22:10 +00:00
5c96e991eb cleanup; more last-error neutral; fix start_io for file writes
This was SVN commit r651.
2004-07-08 14:21:14 +00:00
765477e1a8 no message
This was SVN commit r650.
2004-07-08 12:53:10 +00:00
602b706481 Non-PCH header fix
This was SVN commit r649.
2004-07-07 19:40:20 +00:00
d59e656986 Added config file settings for VBO, vsync and shadows
This was SVN commit r647.
2004-07-07 18:47:11 +00:00
c866494fdc Allow getGlobal() from JS code
This was SVN commit r645.
2004-07-07 18:27:25 +00:00
2a26d9f506 - Implemented WriteFile to write config files back to disk
- JS Interface for all operations supported by the C++ Interface

This was SVN commit r644.
2004-07-07 18:06:02 +00:00
44ad38830c made c_str() const
This was SVN commit r643.
2004-07-07 18:03:42 +00:00
715c208907 Fixed "www.wildfiregames/com" URLs
This was SVN commit r642.
2004-07-07 10:59:53 +00:00
ab1190ef55 Added JSCLASS_HAS_PRIVATE
This was SVN commit r641.
2004-07-07 10:57:36 +00:00
eb530b7d94 Use the correct JS lib for Debug/Release.
Errors are now also reported through debug_out to reduce the chance of
missing them.

This was SVN commit r640.
2004-07-07 10:52:45 +00:00
f55e9a72bd Use the correct JS DLL for Debug/Release.
Define NDEBUG in Release builds.

This was SVN commit r639.
2004-07-07 10:44:15 +00:00
b5bd1b82ec Fixed handling of paths without leading ..'s, now relative paths starting in the same directory (i.e. subdir/file.dtd) and absolute paths (/art/actors/object.dtd) work as one would think they should
This was SVN commit r635.
2004-07-07 01:44:54 +00:00
6b4c07a5a7 add dbghelp
This was SVN commit r634.
2004-07-07 01:36:59 +00:00
bfafb8fce4 add to some comments
also removed redundant VFS file open flags

This was SVN commit r633.
2004-07-05 02:33:47 +00:00
7bb375ac69 completed support for writing files (hopefully). now adds them to the VFS tree.
also removed VFS file open flags, used file.h flags instead

This was SVN commit r632.
2004-07-05 02:32:43 +00:00
680d5dd7b4 revisions to file open flag comments. btw, these are now also used by VFS
This was SVN commit r631.
2004-07-05 02:31:32 +00:00
e9a7876e0d slight changes to open / stat interface to bring in line with SUS (and therefore POSIX, i hope)
also pass in pmode

This was SVN commit r630.
2004-07-05 02:30:53 +00:00
66e202afa5 S_* flags in sys/stat are wrong! spent quite a while searching for this problem. disassembly reports S_IWRITE is 0x80, header says 0x100.
fixes aio_open warning tossed when file was created by file_open

This was SVN commit r629.
2004-07-05 02:29:21 +00:00
1f9ac488cd open wrapper: fixes file sharing bug, now passes in O_CREAT mode
This was SVN commit r628.
2004-07-05 02:27:51 +00:00
e22f6b120a revised aio_open (now: aio_reopen) interface; now closer to open(), so that pmode can be passed
This was SVN commit r627.
2004-07-05 02:26:55 +00:00
85b0e120af fixed file sharing + open mode bug
This was SVN commit r626.
2004-07-05 02:26:04 +00:00
2914b616c7 Fix for debug builds using the static xerces lib
This was SVN commit r625.
2004-07-04 15:45:49 +00:00
52b07a6fe9 Added ps/Network/ to workspace
This was SVN commit r624.
2004-07-04 15:45:02 +00:00
6559b5c8a6 Updates for PCH Compat, and other misc. revisions
This was SVN commit r623.
2004-07-04 15:41:17 +00:00
baa374ae13 Moved JS Init further to the beginning
This was SVN commit r622.
2004-07-04 15:38:18 +00:00
1fc404a12a - JavaScript Interface
- Slightly relaxed config file syntax

This was SVN commit r621.
2004-07-04 15:36:48 +00:00
3109d4361a - Get/SetGlobal() added
- Made CreateCustomObject call the constructor (JS_NewObject =>
JS_ConstructObject)
- Made the JS error reporter work even before the console has been
constructed

This was SVN commit r620.
2004-07-04 15:35:04 +00:00
b137e965f3 nice new timeSinceLastFrame filter, stable yet responsive. useful for interpolating stuff and of course for FPS.
FPS update code is a hack/unfinished, but it's not important right now.

This was SVN commit r619.
2004-07-02 03:04:55 +00:00
fd6a4d6aed no change, fixed conflict with local version (i have the debug new stuff commented out, because it conflicts with BC)
This was SVN commit r618.
2004-07-02 03:02:40 +00:00
d467b1a944 fixed resolution calculation for GetTickCount (previously assumed uniform updates)
This was SVN commit r617.
2004-07-01 13:28:07 +00:00
f588f903d3 Avoid some warnings
This was SVN commit r616.
2004-07-01 09:56:44 +00:00
64444251d4 fixed bug (missing else) reported by philip. thanks!
This was SVN commit r615.
2004-06-30 18:47:15 +00:00
5f6e9f3819 Slightly nicer control of debugging memory allocators
This was SVN commit r614.
2004-06-30 16:06:05 +00:00
98ef9125fc our programming schedule, for easier updating. what do ya'll think of putting it into cvs?
This was SVN commit r613.
2004-06-30 14:32:12 +00:00
6a85b4a331 some more comments and cleanup
This was SVN commit r612.
2004-06-30 14:31:19 +00:00
12170cabeb Headers for non-PCH
This was SVN commit r611.
2004-06-28 15:34:10 +00:00
e0fab05437 Make errors more noticeable when debugging
This was SVN commit r610.
2004-06-28 15:30:15 +00:00
02f509feb7 fixed timer jump issue when timer implementation changes at runtime; now calculates time more accurately
This was SVN commit r609.
2004-06-27 01:45:47 +00:00
bbad6a4d6a fix order of detect calls (TSC wasn't getting selected in wtime due to not-yet-set cpu_smp)
This was SVN commit r608.
2004-06-27 01:42:55 +00:00
70b7f4249f fixed sneaky iterator bug: when ring buffer full, begin() was equal to end()
This was SVN commit r607.
2004-06-27 01:42:17 +00:00
2b1364ffa5 now uses texture loader only, not opengl texture functionality
This was SVN commit r606.
2004-06-26 16:44:01 +00:00
c23d7830fd Minor improvements
This was SVN commit r605.
2004-06-26 12:58:35 +00:00
43c52335ae Added delete/home/end keys to console
This was SVN commit r604.
2004-06-26 12:45:54 +00:00
608e481398 fix event handler return value
This was SVN commit r603.
2004-06-25 22:22:05 +00:00
ddd7821425 res reload callback interface change: now also receives handle of object being reloaded. simplifies tex reload code
This was SVN commit r602.
2004-06-25 22:19:19 +00:00
766a0b4077 split tex code into (file format specific) loaders and opengl texture ops like upload()
This was SVN commit r601.
2004-06-25 22:18:03 +00:00
d1a66a4503 fix event handler return value
This was SVN commit r600.
2004-06-25 22:13:48 +00:00
6348dc1f0e Fixed null-pointer crash-on-exit
This was SVN commit r599.
2004-06-24 16:09:29 +00:00
a9e358b9bc change to use new event handler interface
This was SVN commit r598.
2004-06-24 14:06:24 +00:00
74ad38fa95 better interface (constants for event handler return value, instead of "what does it do again" bool)
This was SVN commit r597.
2004-06-24 14:05:39 +00:00
ce8f5d3520 described a way to make the TSC work on SMP systems, but not gonna tackle it for now (too little benefit).
also added a bugfix from someone whom i sent the source (hrt_origin now
correct after switching timer)

This was SVN commit r596.
2004-06-24 14:04:30 +00:00
2b7491d159 improvement to timer_res, allows multiple calls
This was SVN commit r595.
2004-06-24 00:41:29 +00:00
cc02e9ea97 more abstraction in VFS<->dir watch interface (thinking of using dazuko and/or FAM)
This was SVN commit r594.
2004-06-23 16:29:03 +00:00
20211609c5 Added tolerance for whitespace, to fix assert
This was SVN commit r593.
2004-06-23 16:00:19 +00:00
ca4558d48d fix hExitEvent double-free
This was SVN commit r592.
2004-06-23 14:49:14 +00:00
7d35d84ecf fixed stupid bug found by philip - was skipping entire main loop if deltatime=0, not just skipping update
This was SVN commit r591.
2004-06-23 14:42:35 +00:00
da7d60e3ec fixed HT detect (thanks to philip for testing)
This was SVN commit r590.
2004-06-23 13:45:50 +00:00
0517546d19 load hello.xml instead of hello2.xml, which may be broken (or exposes a bug in CParser)
This was SVN commit r589.
2004-06-23 13:29:48 +00:00
d633fd201d add code to check if system is SMP (needed for wtime; not trivial, since hyperthreading may be in play)
This was SVN commit r588.
2004-06-22 17:20:38 +00:00
4c2463d7c3 fix typos in comments :)
This was SVN commit r587.
2004-06-22 17:20:11 +00:00
d5424bcb41 fixed check for monotony (was a no-op); added resolution check (previously guessed 1ms)
This was SVN commit r586.
2004-06-22 16:05:44 +00:00
fd701dc5d9 more L4 warnings stomped
This was SVN commit r585.
2004-06-22 13:22:46 +00:00
fc476e04f6 stomped on numerous warnings
This was SVN commit r584.
2004-06-21 16:29:47 +00:00
fa0741c5f6 increase buffer size; cleaned up basic type lookup routine
This was SVN commit r583.
2004-06-21 14:23:36 +00:00
0d4f9b8a00 add on_each_cpu comments
This was SVN commit r582.
2004-06-21 14:22:33 +00:00
55f7411ba9 improved thread start code
This was SVN commit r581.
2004-06-21 14:22:07 +00:00
d231baccef use ia32_cap() instead of direct access to cap var
This was SVN commit r580.
2004-06-21 14:19:43 +00:00
8c8a692025 added feature bit for SpeedStep; intel added another reg to the CPUID definition, so changed the feature flag ("cap") interface - no more direct access
This was SVN commit r579.
2004-06-21 14:17:48 +00:00
250c46ee9e add __ to variables declared in macros for safety
This was SVN commit r578.
2004-06-21 14:16:10 +00:00
ff00971bc8 split ps init/shutdown into separate function; don't use 100% cpu when alt+tabbed out; added sanity check for delta time; removed some older main-loop code (was commented out)
This was SVN commit r577.
2004-06-21 14:14:12 +00:00
9d13d607ab SDL_Delay, SDL_APPACTIVE event
This was SVN commit r576.
2004-06-21 13:59:58 +00:00
d49e4c622c removed unused vars; only scroll/accept input if app active
This was SVN commit r575.
2004-06-21 12:52:01 +00:00
24f0756712 bail if #chars = 0 (avoid BC warning); fix debug messages
This was SVN commit r574.
2004-06-21 12:49:37 +00:00
6891ca6e1f improve timer detection logic and document time-source disable macros
This was SVN commit r571.
2004-06-19 22:53:14 +00:00
62f3945116 use EnumDisplaySettingsA instead of unicode version, which seems to cause a memory overrun
This was SVN commit r570.
2004-06-19 22:51:54 +00:00
1514075c9f fixed last vestige of ascii-specific stuff (tolower)
This was SVN commit r569.
2004-06-19 21:35:00 +00:00
eed80d019a Memory leak fix
This was SVN commit r568.
2004-06-19 21:27:23 +00:00
c01eb01dfb Linux fixedness
This was SVN commit r567.
2004-06-19 21:13:10 +00:00
aed6d949d5 new #included
This was SVN commit r566.
2004-06-19 21:12:39 +00:00
561299f899 Memory leak fix
This was SVN commit r565.
2004-06-19 20:54:36 +00:00
f9382306c8 changed to use MT DLL CRT
This was SVN commit r563.
2004-06-19 15:00:22 +00:00
ccd32180ec fixed header name
This was SVN commit r562.
2004-06-19 14:57:29 +00:00
ed17ed9fb4 debug functions (superassert with stack trace)
This was SVN commit r561.
2004-06-19 14:54:25 +00:00
a9864a5e66 add some code for detecting hyperthread systems (needed for timer). incomplete
This was SVN commit r559.
2004-06-19 14:46:44 +00:00
2299573567 now catches bad_alloc exceptions thrown during reloads (=> no need to wrap new in exception handler there)
This was SVN commit r558.
2004-06-19 14:45:46 +00:00
0eeca662cc split stuff out into cpu, os, gfx interfaces
This was SVN commit r557.
2004-06-19 14:45:04 +00:00
1e47f64630 add log2
This was SVN commit r556.
2004-06-19 14:43:31 +00:00
df821a7a1c don't mandate static xerces lib yet, still some problems (warnings due to missing debug info, and conflicting CRT heaps?!)
This was SVN commit r555.
2004-06-19 14:41:54 +00:00
73954008d0 renamed loop variable to avoid warning
This was SVN commit r554.
2004-06-19 14:39:24 +00:00
a27224db69 split out of wdetect; added some code for hyperthreading support (incomplete)
This was SVN commit r553.
2004-06-19 14:36:59 +00:00
f761c91c73 no change
This was SVN commit r552.
2004-06-19 14:31:43 +00:00
3c11f6e5d6 split into os, cpu, and gfx parts
This was SVN commit r551.
2004-06-19 14:30:55 +00:00
fa7d4991d6 move SDL headers to sysdep/win (only used by wsdl)
This was SVN commit r550.
2004-06-19 14:29:40 +00:00
0e664237b6 Finally, a mostly-working font builder on Linux
This was SVN commit r549.
2004-06-19 13:46:11 +00:00
9bc8559c49 Even more Linuxness
This was SVN commit r547.
2004-06-19 12:56:09 +00:00
5da9ecd1b0 move SDL headers to sysdep/win (only used by wsdl)
This was SVN commit r546.
2004-06-19 12:21:05 +00:00
384c6891a1 Put the whole save/load feature back in
This was SVN commit r545.
2004-06-18 22:52:34 +00:00
033b6e70c2 Sort-of-working Linuxness
This was SVN commit r544.
2004-06-18 22:50:34 +00:00
09a56c1dfc Attempted Linuxness
This was SVN commit r543.
2004-06-18 22:05:58 +00:00
d181ccf97e Hopefully now working in gcc *and* MSVC
This was SVN commit r542.
2004-06-18 19:14:42 +00:00
32b6627645 Miscellaneous gcc fixes
This was SVN commit r541.
2004-06-18 18:56:10 +00:00
673c7d7318 Replace L".." with (XMLCh*)L"...", for gcc
This was SVN commit r540.
2004-06-18 18:55:26 +00:00
00442470a2 Added newline at end, for gcc
This was SVN commit r539.
2004-06-18 18:49:12 +00:00
114313771b Replace L".." with (XMLCh*)L"...", for gcc
This was SVN commit r538.
2004-06-18 18:46:34 +00:00
710f26eb2f Make it work when premake is in . and not in PATH. (Also, make it not work in the opposite situation)
This was SVN commit r537.
2004-06-18 18:43:50 +00:00
3b6ad836e2 Minor header adjustments
This was SVN commit r536.
2004-06-18 18:34:04 +00:00
38bfabeb38 fixed goto problem with gcc - was jumping over an (unused) var decl
This was SVN commit r535.
2004-06-18 14:59:50 +00:00
4258ba245d while working on cstr, search and destroy made "CStr &x" -> "CStr& x". didn't intend to hit gui code, but ok :)
This was SVN commit r534.
2004-06-18 14:07:06 +00:00
a2fdd3e190 renamed some vars for clarity
This was SVN commit r533.
2004-06-18 13:34:37 +00:00
6eadce8d1d added history, following mark's example :)
This was SVN commit r532.
2004-06-18 13:33:06 +00:00
941f7c3661 bullet-proofing - fail if reloading VDir
This was SVN commit r531.
2004-06-18 13:32:33 +00:00
3c6becec37 was thinking about documenting the whole lib design goals/rationale, added a few notes.
This was SVN commit r530.
2004-06-18 13:24:59 +00:00
b09211c4a3 remove *tot - non-portable and inefficient. replaced with stringstream
This was SVN commit r529.
2004-06-18 13:22:26 +00:00
df62c14469 commented out line 684 (JSI_BaseEntity::init();) the JS_DestroyContext crash is thereby avoided
This was SVN commit r528.
2004-06-18 13:11:58 +00:00
b65d35ea2e Font builder code
This was SVN commit r527.
2004-06-17 19:32:04 +00:00
8347bebebc Spelling corrction
This was SVN commit r524.
2004-06-16 16:29:38 +00:00
9aff01cf23 Unicode fonts
This was SVN commit r523.
2004-06-16 15:44:24 +00:00
48d94cd86a Altered to work with the Unicode console
This was SVN commit r522.
2004-06-16 15:43:34 +00:00
f8247f56e0 Uses Unicode internally
This was SVN commit r521.
2004-06-16 15:42:48 +00:00
f149e007e1 Unicode fonts
This was SVN commit r520.
2004-06-16 15:36:49 +00:00
358f43205a Allow texture format override, so that the 8-bit GL_ALPHA fonts can work
This was SVN commit r519.
2004-06-16 15:35:05 +00:00
d4423850ef Leak-detect malloc/etc too
This was SVN commit r518.
2004-06-15 21:27:12 +00:00
0d7f2501f9 Enable memory leak detection
This was SVN commit r517.
2004-06-15 21:08:51 +00:00
ea68626ec1 Remove new new (Xerces doesn't like it)
This was SVN commit r516.
2004-06-15 21:08:05 +00:00
71a81f3432 Fixed minor memory leak
This was SVN commit r514.
2004-06-15 20:54:55 +00:00
9114856b11 added and removed oglPrintError debug code
This was SVN commit r513.
2004-06-15 02:44:53 +00:00
136182e8bc oglPrintError now outputs to debug output window
This was SVN commit r512.
2004-06-15 02:43:56 +00:00
5cca6d753a found GL error by adding oglPrintError everywhere; now removed agian
This was SVN commit r511.
2004-06-15 02:43:38 +00:00
614420615e walk freelist and free the chunks (fixes mem leak)
This was SVN commit r510.
2004-06-14 16:01:38 +00:00
99b30d61ec added dtor to eliminate vertexbuffer mem leak
This was SVN commit r509.
2004-06-14 16:00:14 +00:00
952ec353fb fix overflow problem if timer res is low; cleaned up in general; use RingBuf for averaging
This was SVN commit r508.
2004-06-14 13:29:23 +00:00
7fb1f4892e adapted ringbug operator[] for timer's needs
This was SVN commit r507.
2004-06-14 13:27:33 +00:00
e1997e6b31 added a few comments
This was SVN commit r506.
2004-06-14 12:59:15 +00:00
17fb3238c7 fixed some unfreed XMLString::transcode's
This was SVN commit r505.
2004-06-13 23:37:37 +00:00
a5c221fe16 fixed some unfreed XMLString::transcode's - I think I stomped them all
This was SVN commit r504.
2004-06-13 23:36:16 +00:00
70b53d90ef Avoid problems when get_time() frequently returns the same value twice
This was SVN commit r503.
2004-06-13 19:48:04 +00:00
e61f416e0d Changes to make the numpad minus (and other keys) be recognised in KEYDOWN correctly
This was SVN commit r502.
2004-06-13 19:42:48 +00:00
ade1ee19cc re-enable exceptions (wasn't necessary to strip them)
This was SVN commit r501.
2004-06-13 19:41:42 +00:00
2efcfa9145 Added left+right click/drag to rotate
Made W and H work
Made numpad plus/minus work

This was SVN commit r500.
2004-06-13 19:35:04 +00:00
0fb2ec31fc fix LONG_PTR VC6 error reported by stuart
This was SVN commit r499.
2004-06-13 19:23:37 +00:00
3c7826ca27 comment out delete g_ScriptingHost - avoids crash within js32
This was SVN commit r498.
2004-06-13 19:22:08 +00:00
ed23cb7cc1 hopefully bulletproof is_subpath
This was SVN commit r497.
2004-06-13 19:13:32 +00:00
da1e6df5f0 uhoh, yet another problem. quick fix so others aren't impacted; investigating
This was SVN commit r496.
2004-06-13 17:15:38 +00:00
3893d1597d fixed loophole in mount path handling (cannot now mount parent dir of a previous mounting)
This was SVN commit r495.
2004-06-13 16:58:22 +00:00
d7992dc50d no longer need delayimp.lib - source is included in lib/sysdep/win
This was SVN commit r493.
2004-06-13 16:17:20 +00:00
b58d3c15fe add unload linker flag (for delay loading)
This was SVN commit r492.
2004-06-13 16:16:42 +00:00
f1713bbca0 improved mount logic; added comments
This was SVN commit r491.
2004-06-13 16:12:54 +00:00
475d4ed509 snazzy new module init/shutdown hook mechanism
This was SVN commit r490.
2004-06-13 16:06:23 +00:00
0cce0ea5bc handles details of delay loading and implements the helper function (=> extra lib no longer needed)
This was SVN commit r489.
2004-06-13 16:05:38 +00:00
7975657f0b variable name change for clarity
This was SVN commit r488.
2004-06-13 16:04:11 +00:00
3d984d042c re-allow debug version of xerces (since we will link against msvcrtd in future)
This was SVN commit r487.
2004-06-13 16:03:12 +00:00
96cb1d0596 removed fmod dependency; free g_ConfigDB at exit
This was SVN commit r486.
2004-06-13 15:35:08 +00:00
641ad1e382 moved fmod shutdown here from main - this module is responsible for that.
This was SVN commit r485.
2004-06-13 15:32:34 +00:00
2442f558a2 added delayimp fix for VC6 compiler hybrid
This was SVN commit r484.
2004-06-11 18:35:33 +00:00
b5f4478bcb add another checkpoint for timing; remove GetSingletonPtr (now uses the singleton's #define)
This was SVN commit r483.
2004-06-11 18:02:57 +00:00
c5bd66b528 no longer use debug xerces dll - heap conflict! (it links against msvcrtd)
This was SVN commit r482.
2004-06-11 17:58:04 +00:00
f9625ecd00 make possible DLL CRT (declare CRT funcs as _CRTIMP)
This was SVN commit r481.
2004-06-11 17:55:24 +00:00
Ben
1887a82873 First commit of APE files
This was SVN commit r480.
2004-06-11 04:07:28 +00:00
Ben
434888d7f1 First commit of APE files
This was SVN commit r479.
2004-06-11 03:24:25 +00:00
Ben
101e6d4fa0 First commit of APE files
This was SVN commit r478.
2004-06-11 03:11:26 +00:00
5276a527ae Added the UniDoubler; this means that code can use CStr or CStr8 for 8-bit ascii strings, as well as CStr16 for wchar_t strings (magic! :-P)
This was SVN commit r477.
2004-06-11 02:55:09 +00:00
6593bc959b CStr namespace de-pollution; added namespace qualifiers
This was SVN commit r476.
2004-06-11 02:23:00 +00:00
0983fdcf9c CStr namespace de-pollution; added using namespace to source
This was SVN commit r475.
2004-06-11 02:20:59 +00:00
112139371b UniDoubler.h initial commit
This was SVN commit r474.
2004-06-11 02:18:11 +00:00
15ca5cbf21 newline stomper and fixed warnings
This was SVN commit r473.
2004-06-11 02:14:18 +00:00
041e60f6ab delay-load dlls
This was SVN commit r472.
2004-06-11 02:12:09 +00:00
362405d470 removed pause
This was SVN commit r471.
2004-06-11 02:08:12 +00:00
MarkT
e4fe4ed602 JS Interface to entities. It even partially works now.
This was SVN commit r469.
2004-06-10 22:24:03 +00:00
663f25f6b6 Added two new camera movement system (change the #define to select between them)
This was SVN commit r468.
2004-06-10 09:58:33 +00:00
a06bff04b6 Added VK_CONTROL/_ALT/_MENU mappings onto SDLK_LCTRL/etc (I can't find an non-positional SDL CTRL key)
This was SVN commit r467.
2004-06-10 09:57:03 +00:00
797f660ef0 take two.. the typedefs should match now - hopefully on both VC++ and GCC
This was SVN commit r466.
2004-06-09 22:47:02 +00:00
a30a82469e some toe-stepping that evidently resulted in two prot variables :P
This was SVN commit r465.
2004-06-09 22:38:37 +00:00
ca1994892e main now displays g_CameraZoom
This was SVN commit r464.
2004-06-09 18:02:33 +00:00
5a59c28e95 now includes wglext for "proper" definition of win-specific funcs
This was SVN commit r463.
2004-06-09 17:59:01 +00:00
0997ca4c19 added xerces headers (speeds up build a bit)
This was SVN commit r462.
2004-06-09 17:56:28 +00:00
2521765276 added hack to CEntity::processGotoNoPathing - avoids BC warning in the case where delta -> 0
This was SVN commit r461.
2004-06-09 17:56:03 +00:00
bb1a9bad7d fail file_map requests for empty files (avoids bc warning)
This was SVN commit r460.
2004-06-09 16:10:23 +00:00
25d2a41c64 glprintf: ignore empty strings (avoids bc warning)
This was SVN commit r459.
2004-06-09 16:09:07 +00:00
a0a9276b21 not freeing dll after manual import; allows delay load
This was SVN commit r458.
2004-06-09 15:52:15 +00:00
f197601cbb clean up test delayload hook. very tricky - automagically calls WSAStartup on first sockets call
This was SVN commit r457.
2004-06-09 15:50:38 +00:00
1c5c3da703 some fixes to coexist with windows.h, if included from win-specific code (i.e. wsdl)
This was SVN commit r456.
2004-06-09 15:48:47 +00:00
0409f4d9d3 support for delay loading
This was SVN commit r455.
2004-06-09 15:45:47 +00:00
40b2cbcba3 fix bc warnings (RDC params)
This was SVN commit r454.
2004-06-09 15:45:15 +00:00
69fb0064b4 remove winmm dependency (timeSetEvent -> thread)
This was SVN commit r453.
2004-06-09 15:44:44 +00:00
131573f7c4 fix boundschecker warning (was resetting gamma ramp after shutdown)
This was SVN commit r452.
2004-06-09 15:43:59 +00:00
7e410dffcb line-reader loop without strtok_r (which doesn't exist on windows)
#include precompiled.h

This was SVN commit r451.
2004-06-09 14:58:33 +00:00
a6246b9045 read_le16/32 can't be inline in source and extern in header - gcc won't export them
This was SVN commit r450.
2004-06-09 14:11:35 +00:00
5366bafe3f Moved -xres and -yres into ParseArgs, added ConfigDB init (and ParseArgs uses ConfigDB for x/yres handling - just a demo ;-P )
This was SVN commit r449.
2004-06-09 14:10:31 +00:00
d044898294 Added libfam to linux link options
This was SVN commit r448.
2004-06-09 14:03:48 +00:00
609d519d3d GCC/linux compat (required extern qualifier, int/JSInt32 conversion)
This was SVN commit r447.
2004-06-09 14:02:40 +00:00
b520430cb5 Added correct XML String conversion - was leaking memory, and added logging for Warnings
This was SVN commit r446.
2004-06-09 14:01:09 +00:00
4efc41cb30 XMLTranscode param change (CStr => const char * - handle both types of strings)
This was SVN commit r445.
2004-06-09 13:56:29 +00:00
ac894d0886 GCC/linux compat
This was SVN commit r444.
2004-06-09 13:55:01 +00:00
8b617e732b Config Database, initial commit
This was SVN commit r443.
2004-06-09 13:53:32 +00:00
ca523e9f3c GCC compat (init skipped by goto)
This was SVN commit r442.
2004-06-09 13:49:32 +00:00
5d440712f2 GCC compat
This was SVN commit r441.
2004-06-09 13:48:49 +00:00
d022ac51f8 _WIN32 ifdefs around wglext.h include
This was SVN commit r440.
2004-06-09 13:46:39 +00:00
d455ac90ef Linux/unix debug macros
This was SVN commit r439.
2004-06-09 13:46:06 +00:00
5b8d980809 Fixed path_validate debug statement
This was SVN commit r438.
2004-06-09 13:44:12 +00:00
8002f5fe6e str[n]icmp => str[n]casecmp on non-windows
This was SVN commit r437.
2004-06-09 13:43:25 +00:00
b824eac403 Entity resolver cleanup (relative paths kludge)
This was SVN commit r436.
2004-06-09 13:41:11 +00:00
264a0a9b86 fixed for loop variable, delete-ing malloc-ed memory, several memory leaks
Trim and ToLower are now in-place

This was SVN commit r435.
2004-06-09 13:35:20 +00:00
9c9af2ab75 moved all xerces includes into XML.h
(rationale: they're in the PCH - speeds up the build)

This was SVN commit r434.
2004-06-09 12:45:42 +00:00
48ad93ad34 added instrumentation for startup time - hack
This was SVN commit r432.
2004-06-08 20:41:28 +00:00
770845d823 investigating delay loading; mess
This was SVN commit r431.
2004-06-08 20:37:15 +00:00
921463e55a added timestamp to measure startup time
This was SVN commit r430.
2004-06-08 20:36:17 +00:00
3c220be8ef added getcwd
This was SVN commit r429.
2004-06-08 20:35:46 +00:00
notpete
c61144cc84 Redundant; removed.
This was SVN commit r428.
2004-06-08 18:50:58 +00:00
53425fa4b5 implementation complete, hopefully :P
This was SVN commit r427.
2004-06-08 15:22:40 +00:00
825289242a added vfs_get_path (bad name) - returns the VFS path to a given real dir
(used by res.cpp to translate paths from WFAM)

This was SVN commit r426.
2004-06-08 15:21:42 +00:00
d7dbf08bc2 auto-reload finished (last remaining problem: translating OS paths to VFS)
This was SVN commit r425.
2004-06-08 15:18:01 +00:00
78fa30be94 export path conversion function for res.cpp interaction with FAM
This was SVN commit r424.
2004-06-08 15:16:50 +00:00
8d52add5ea ran newline stomper; no real changes
This was SVN commit r423.
2004-06-08 12:10:51 +00:00
fec51baee5 fixed undefined label and type conversion warnings (cast to uint and ptrdiff_t to long)
This was SVN commit r422.
2004-06-08 12:00:39 +00:00
e4378ffbdc added precompiled.h. these need to be newline-fixed also!
This was SVN commit r421.
2004-06-08 11:50:52 +00:00
notpete
69f0a99f9a Fixed some assumptions PATCH_SIZE is 16.
This was SVN commit r420.
2004-06-07 20:12:22 +00:00
notpete
a93418e353 Moved "res" directory; updated ScEd source to accomodate engine changes.
This was SVN commit r419.
2004-06-07 20:07:11 +00:00
notpete
5b3be293ca Removed Xerces initialisation; added some prop-related logging for errors.
This was SVN commit r418.
2004-06-07 20:03:10 +00:00
notpete
e8f2611b9c Constructor added to CObjectEntry::Anim.
This was SVN commit r417.
2004-06-07 20:01:46 +00:00
notpete
178e5a1c47 Modified to calculate bone transformation matrices in world space, rather than object space.
This was SVN commit r416.
2004-06-07 20:00:56 +00:00
notpete
97b7efab20 Fixed some assumptions PATCH_SIZE is 16.
This was SVN commit r415.
2004-06-07 19:59:20 +00:00
notpete
71d74e9121 Minor change for modified CTextureEntry interface.
This was SVN commit r414.
2004-06-07 19:57:59 +00:00
notpete
05ae51351c Minor change to support on-demand texture loading; fixed backwards orientation issue.
This was SVN commit r413.
2004-06-07 19:57:19 +00:00
notpete
6caf7c7466 Support for loading texture data on data, rather than loading all known textures on startup.
This was SVN commit r412.
2004-06-07 19:56:26 +00:00
notpete
a7d0c194ad Reworked model and terrain rendering to use new VertexBuffer classes; many other smaller changes.
This was SVN commit r411.
2004-06-07 19:53:58 +00:00
notpete
4f8ce4b1d4 Initial revision.
This was SVN commit r410.
2004-06-07 19:52:37 +00:00
notpete
bd0d3e1c36 Moved Xerces initialisation out of CObjectEntry to here (still need to moved GUI and entity XML code at some point). Added simple fixed camera view for basic profiling.
This was SVN commit r409.
2004-06-07 19:51:52 +00:00
9210297729 Unix/Linux update script
This was SVN commit r408.
2004-06-07 10:45:48 +00:00
f9ad314f5a fix empty-statement warning (i.e. comment out - that spot isn't implemented yet)
This was SVN commit r407.
2004-06-07 00:04:37 +00:00
815e177beb now responsible for watching mountings for changes via FAM
This was SVN commit r406.
2004-06-07 00:04:02 +00:00
6380ff781f written against new res.cpp reload interface
This was SVN commit r405.
2004-06-06 23:59:57 +00:00
092fa131ff more faithfully emulating the real FAM now (keeping track of watches by request number). not finished
This was SVN commit r404.
2004-06-06 23:58:52 +00:00
916ddc8c02 fixed ICC warning about func decl
This was SVN commit r403.
2004-06-06 23:58:03 +00:00
94941af636 removed FOV zoom hack (harking back to terrain demo) - rich has written the real thing
This was SVN commit r402.
2004-06-06 23:57:07 +00:00
2dcb0d8056 more header fixes
This was SVN commit r401.
2004-06-04 17:47:12 +00:00
7b9e881039 initial code using FAM API. unfinished; one problem remaining is how to convert absolute paths to their VFS equivalent
This was SVN commit r400.
2004-06-04 17:44:56 +00:00
0ca334ed39 now emulates FAM API so other code can use one interface. implemented but untested.
This was SVN commit r399.
2004-06-04 17:44:17 +00:00
cd3755b935 added headers (needed if !HAVE_PCH)
This was SVN commit r398.
2004-06-04 17:23:39 +00:00
9dcd2a0c12 re-enabled HAVE_PCH (disabled for testing - oops)
This was SVN commit r397.
2004-06-04 16:06:31 +00:00
0dc6007fbd (re)added headers so it'll work without HAVE_PCH
This was SVN commit r396.
2004-06-04 12:41:53 +00:00
0bd696a27d now supports PCH (see announcements)
This was SVN commit r395.
2004-06-04 02:19:42 +00:00
kezz
8eedf2f505 kezz - added fmod initialisation code to main.cpp
This was SVN commit r394.
2004-06-03 19:43:19 +00:00
df4b9df830 fixed reference to since removed hrt.h
This was SVN commit r393.
2004-06-03 18:46:21 +00:00
c7a84e84be added precompiled.h everywhere
This was SVN commit r392.
2004-06-03 18:38:14 +00:00
5747fe33b0 new: windows-specific opengl header (included by ogl.h)
This was SVN commit r391.
2004-06-03 18:37:07 +00:00
8e6e179187 cleanup
This was SVN commit r390.
2004-06-03 18:36:48 +00:00
520e2a1ff6 rename hrt -> wtime; emulate POSIX routine with HRT (simplifies timer code)
This was SVN commit r389.
2004-06-03 18:36:35 +00:00
d6e6dd72e9 \ handling for vfs entity resolver.. ugly as hell, but works :P
This was SVN commit r388.
2004-06-03 17:34:49 +00:00
c15300446e fix stupid mmap bug reported by simon
This was SVN commit r387.
2004-06-03 14:20:09 +00:00
0b3d0c9e5c small interface changes to bring in line with vfs and file
This was SVN commit r386.
2004-06-03 13:57:36 +00:00
cb75497412 documentation! w00t
This was SVN commit r385.
2004-06-03 13:57:00 +00:00
d9b1daf2e4 restored fminf
This was SVN commit r384.
2004-06-03 13:35:39 +00:00
9a9c0055dc Use the VFS wrapper instead of Xerces' local file input source
This was SVN commit r383.
2004-06-03 13:27:01 +00:00
2c2b9ab71a Removed mods/official/ prefix now that ObjectEntry is VFS aware
This was SVN commit r382.
2004-06-03 13:22:19 +00:00
831defdf07 Use the VFS Wrapper instead of Xerces' local file input. Use XMLCh/CStr
conversion functions from XML.h/XMLUtils.cpp

This was SVN commit r381.
2004-06-03 13:20:36 +00:00
d759a8ef82 Conventience functions and VFS Wrappers for Xerces
This was SVN commit r380.
2004-06-03 13:00:19 +00:00
MarkT
d32be2011f Pathfinding tweaks; coldet fixes.
This was SVN commit r379.
2004-06-03 02:20:48 +00:00
4daa183dd3 stripped some headers from deprecated prometheus.h => huge rearrange
This was SVN commit r378.
2004-06-03 01:43:33 +00:00
a5938f5e13 tiny bit of dox
This was SVN commit r377.
2004-06-03 01:42:40 +00:00
2339389870 implemented refcount for mmap
This was SVN commit r376.
2004-06-03 00:27:50 +00:00
6782c17105 fixed a few warnings; updated vfs file enum code
This was SVN commit r375.
2004-06-03 00:20:20 +00:00
af05b758c6 animation: console scrolls in from top of screen
This was SVN commit r374.
2004-06-03 00:19:22 +00:00
2d51e32878 some bulletproofing; completed+documented mmap
This was SVN commit r373.
2004-06-03 00:17:24 +00:00
f84bc36ca3 moved fminf+fmaxf to sysdep
This was SVN commit r372.
2004-06-02 21:50:50 +00:00
af3949ab7a updated file mapping (was partially unimplemented)
This was SVN commit r371.
2004-06-02 20:41:05 +00:00
8b91bbc27a integrated console with some changes (added input handler and update mechanism)
This was SVN commit r370.
2004-06-02 20:40:07 +00:00
62b8deb03d integrated console
This was SVN commit r369.
2004-06-02 20:39:21 +00:00
b82d4dd4b3 removed misc.h - name tells me it isn't necessary ;) everything moved into lib.h
This was SVN commit r368.
2004-06-02 19:02:12 +00:00
06c8a2ca90 Linux Changes
This was SVN commit r367.
2004-06-02 17:44:30 +00:00
d94c41fe9c fixed incorrect endian detect macro
This was SVN commit r366.
2004-06-02 17:40:43 +00:00
0ce04bf73f no message
This was SVN commit r364.
2004-06-02 16:59:12 +00:00
7c86e3459e fixed usage of vfs_next_dirent
This was SVN commit r363.
2004-06-02 16:58:55 +00:00
f8dafe455d CVS dirs are skipped when mounting
This was SVN commit r362.
2004-06-02 16:58:35 +00:00
719b8f1074 fixed *nix libpng include fix
This was SVN commit r361.
2004-06-02 16:33:59 +00:00
72ad0e5d79 Removed the non-windows fallback initialization now that CTextureManager
is converted to VFS directory enumeration

This was SVN commit r360.
2004-06-02 16:29:26 +00:00
c09ab35453 Extended the hash_map kludge to detect gcc
This was SVN commit r359.
2004-06-02 16:28:12 +00:00
4ba7fc3b7c yet more tree_lookup fixes for bug pointed out by simon
This was SVN commit r358.
2004-06-02 16:12:13 +00:00
df501b11ac - Minor GCC compat changes
- return( [CLASS]() ); generates a parse error (GCC Bug)

This was SVN commit r357.
2004-06-02 16:11:32 +00:00
a1fb048fe5 Converted to VFS enumeration
This was SVN commit r356.
2004-06-02 16:06:19 +00:00
a2c508ff1a Log XML errors to mainlog.html
This was SVN commit r355.
2004-06-02 15:38:31 +00:00
85f335e0fe fixed tree_lookup - now allows dir names (with optional trailing slash)
This was SVN commit r354.
2004-06-02 15:32:42 +00:00
c0d33d3330 Linux/GCC compat, a few newlines at end of file, minor changes
This was SVN commit r353.
2004-06-02 15:31:55 +00:00
e511599f8b ADD_TYPE macro: added the extra macro argument used by the code
This was SVN commit r352.
2004-06-02 15:22:53 +00:00
01e94151cf added usage of SDL_BUTTON_WHEELUP/DOWN instead of the win-specific constant values
This was SVN commit r351.
2004-06-02 15:22:19 +00:00
270aa5974e - endian ifdefs => __BYTE_ORDER == __BIG_ENDIAN
- round moved to sysdep with _MSC_VER ifdefs
- alternative CHECK_ERR macro (in lib.h)
- some linux compat stuff

This was SVN commit r350.
2004-06-02 15:15:12 +00:00
f1a3cd9e31 ../lib/lib.cpp
This was SVN commit r349.
2004-06-02 15:12:48 +00:00
af3cb23fde Minor changes for linux
This was SVN commit r348.
2004-06-02 15:03:17 +00:00
016ca6ed06 fixed gcc error with asm code
This was SVN commit r347.
2004-06-02 15:00:23 +00:00
48d981b030 - Added a OS_UNIX define for unix variants (Linux and Mac OS X)
- OS_UNIX => HAVE_GETTIMOFDAY
- OS_LINUX => HAVE_X

This was SVN commit r346.
2004-06-02 14:31:27 +00:00
35d6803581 VC6 compat removed for gcc compat ;-)
This was SVN commit r345.
2004-06-02 14:29:49 +00:00
bc9ac47ada Converted to VFS directory enum
This was SVN commit r344.
2004-06-02 14:27:54 +00:00
c07e561241 - Added a little logging for successful and failed loading of animations
This was SVN commit r343.
2004-06-02 14:26:29 +00:00
04763a1f35 - Added a few logging statements (using CLogger)
- Converted to use VFS directory enum instead of _findfirst

This was SVN commit r342.
2004-06-02 14:24:37 +00:00
kezz
77acc78067 kezz - added fmod libs to vc workspace
This was SVN commit r341.
2004-06-02 10:47:27 +00:00
b03e0743e6 no message
This was SVN commit r340.
2004-06-02 01:08:34 +00:00
9bdbc49306 now pull in .lib file via source (more convenient than using project settings)
This was SVN commit r339.
2004-06-02 01:07:25 +00:00
kezz
93486469e6 kezz - added fmod to required libs
This was SVN commit r337.
2004-06-01 23:11:39 +00:00
kezz
11979a48fa kezz - adding preliminary sound code
This was SVN commit r336.
2004-06-01 22:19:53 +00:00
3721e05a74 There was a presumably unnecessary unmatched { in misc.h. Updated it to avoid compiler error.
This was SVN commit r335.
2004-06-01 20:03:24 +00:00
3abf9ac4b5 lots of type fixes; types.h is now a convenience wrapper on top of the standard uintN_t routines
This was SVN commit r334.
2004-06-01 17:34:12 +00:00
3856c2ab1e removed - conflicts with headers on *nix. functionality moved into wsdl
This was SVN commit r333.
2004-06-01 16:52:30 +00:00
bf846be6f5 removed obsoleted _int etc. typedefs
This was SVN commit r332.
2004-06-01 16:51:37 +00:00
notpete
e555221221 Moved UI specific code to it's own directory.
This was SVN commit r331.
2004-05-31 20:37:59 +00:00
notpete
ad2e237946 Removed zoom FOV hack; changed to actually move camera position.
This was SVN commit r330.
2004-05-31 15:52:53 +00:00
5af6d6007b removed endian.* and rolled it into (w)sdl
This was SVN commit r329.
2004-05-31 12:21:14 +00:00
notpete
0d39ed6155 Fixing broken commit; version in CVS has nothing in it.
This was SVN commit r327.
2004-05-30 09:31:57 +00:00