1
0
forked from 0ad/0ad
Commit Graph

1453 Commits

Author SHA1 Message Date
b259381fbf 1) minor error handling improvements (was passing back invalid handle error, instead of the cause; also added a CHECK_ERR)
2) we attempt to load missing files (see bug #32). with the fix above,
CHECK_ERR would fire every run (which it should until the problem is
fixed :P), which is annoying.
Instead, FileUnpacker now checks if the file exists; if not, it throws
immediately and thereby bypasses the VFS error mechanism.

This was SVN commit r1503.
2004-12-15 14:24:12 +00:00
32854fc162 JS scripts are now loaded via VFS, as per "JS optimization" email from stu.
This was SVN commit r1502.
2004-12-15 14:23:27 +00:00
fa25746df7 CFilePacker now takes version+magic string in the ctor (allows writing data in one go, so vfs_store can be used).
This was SVN commit r1501.
2004-12-15 14:22:50 +00:00
bc0c59b084 as per "JS Optimisation?" email from stu, updated to use VFS.
This was SVN commit r1500.
2004-12-14 17:58:37 +00:00
80b1876b77 Reduced GUI's exception usage (=> shortened debug-mode start time by a couple of seconds)
This was SVN commit r1494.
2004-12-13 12:07:12 +00:00
6d7d049d89 Attempted to minimise dependencies between header files (to make compilation minorly faster)
This was SVN commit r1490.
2004-12-12 19:43:55 +00:00
24abb51b59 First crack at loading screen (though need to figure out a way to move session loading to next frame to get it to actually stay on the screen). Some preliminary work on sub-windows.
This was SVN commit r1489.
2004-12-12 19:34:38 +00:00
aa1442e8f8 Fix for mesh manager crashes (plus some parts of Boost, which may be a little excessive)
This was SVN commit r1488.
2004-12-12 18:40:00 +00:00
9f6d085732 oops, removed one const too many. fixed.
This was SVN commit r1484.
2004-12-10 00:14:10 +00:00
9d317d8164 1) removed scaffolding from file
2) VFS: add path_copy convenience routine
3) various lib code: removed unnecessary const cluttering things (like
const char* _const_ name in param list)

This was SVN commit r1483.
2004-12-09 23:12:02 +00:00
cc02422908 1) TIMER added to timer.h (moved from main)
2) wposix: cache file status in struct dirent (Win32 specific)
3) vfs: speed up vfs_mount (via 2) and zip_cb path lookup caching
scheme)
4) temp scaffolding added to file.cpp to measure performance

This was SVN commit r1482.
2004-12-09 20:17:09 +00:00
0598081a57 Changed Xeromyces to care about the .xml's size/mtime rather than its contents (to avoid needing to load the .xml), and also to store that information in the .xmb's filename rather than inside the file (to avoid getting confused when rewriting files that are inside archives)
This was SVN commit r1480.
2004-12-09 16:57:21 +00:00
c3fafdca99 Added CStr::FindInsensitive
This was SVN commit r1479.
2004-12-09 16:54:02 +00:00
6a04509455 Fixed Release-mode compilation
This was SVN commit r1478.
2004-12-09 16:09:58 +00:00
e2062ccee1 Faster parsing
This was SVN commit r1477.
2004-12-08 18:15:39 +00:00
f36008ac3b added TIMER(name_of_block). it declares a scoped object that measures time between ctor and dtor, and is therefore perfect for measuring how long functions or basic blocks execute. used to gather results reported in "analysis: why is startup slow" thread.
also split out a few functions from Init() (more structured, easier
measuring)

This was SVN commit r1475.
2004-12-08 15:34:15 +00:00
196229add7 add JS sound binding interface rationale
This was SVN commit r1474.
2004-12-08 13:10:11 +00:00
2248b615ea NOP
This was SVN commit r1473.
2004-12-07 22:14:23 +00:00
643810a276 cleaned up VFS after yesterday's new code;
explicit shutdown, instead of atexit

This was SVN commit r1472.
2004-12-07 22:10:46 +00:00
0f18178fda fixed sched. priority code: wouldn't work for all values.
This was SVN commit r1468.
2004-12-07 03:01:12 +00:00
77196dbe06 less dependencies on res/res.h in headers (a bad thing) => less recompiles when I change vfs.h :)
This was SVN commit r1467.
2004-12-07 02:04:38 +00:00
e76871e7b0 - heavy changes to VFS tree internals: now allows loose files and archives to coexist, choosing archive if they're the same date+size
- reworked tree_lookup: dir names now require trailing '/' to
disambiguate. exception: vfs_open_dir (convenience)
- display VFS tree in stdout.txt unless g_Quickstart

This was SVN commit r1466.
2004-12-07 01:22:25 +00:00
e15562b7ae 1) file: clean up path conversion call sites (was using private routine)
2) all: change file_enum and cohorts to pass struct stat instead of just
size

3) minor cleanup

This was SVN commit r1465.
2004-12-07 01:19:10 +00:00
1d1a2ce3e4 use VC's stat() for now, even if slower - mtime time conversion is a pain to implement
This was SVN commit r1464.
2004-12-07 01:12:35 +00:00
8d20cfefdb remove cout << "initialized"
This was SVN commit r1463.
2004-12-07 01:08:56 +00:00
e1506b6d3a Removed unused Elvish
This was SVN commit r1462.
2004-12-07 00:17:14 +00:00
a2a6f29ab3 s/Prometheus/Pyrogenesis/
This was SVN commit r1459.
2004-12-05 21:56:09 +00:00
ffb5f87857 Corrected mesh manager's use of hashmap. Added CStrW support to JS/GUI interface. Added error checking to CStr::Left/Right to make bugs more obvious.
This was SVN commit r1456.
2004-12-05 18:26:43 +00:00
761261880a Correction to restructuring (part 2 of 2)
This was SVN commit r1455.
2004-12-05 18:05:16 +00:00
ec3452679c Restructuring
This was SVN commit r1453.
2004-12-05 17:59:29 +00:00
936fc885a1 Don't convert paths here since it's already done by the caller (API change)
This was SVN commit r1449.
2004-12-04 20:27:07 +00:00
445915942a Fix to restore setInterval() to its former functioning glory.
This was SVN commit r1447.
2004-12-02 23:36:47 +00:00
0c49853a3a Premake updates: unbroke PCH; disabled edit-and-continue; disabled runtime checks in Testing mode; fixed stack overflow problem; renamed to 'pyrogenesis'
This was SVN commit r1446.
2004-12-02 18:22:46 +00:00
453c8c68af Fixed warnings
This was SVN commit r1445.
2004-12-02 17:17:38 +00:00
3fb241054f add master sound disable, triggered if g_Quickstart == true.
(skips OpenAL init => speeds up startup)

This was SVN commit r1437.
2004-12-01 22:19:58 +00:00
f1dac9c626 better error handling: lots of little changes.
added some error codes, tried to eliminate unspecific return -1  where
it made sense.

This was SVN commit r1436.
2004-12-01 21:37:01 +00:00
6c2f455547 added tga and raw encoders (based on common routine extracted from bmp encoder), so I wouldn't have to add NOT_IMPLEMENTED error returns :P
This was SVN commit r1435.
2004-12-01 21:34:49 +00:00
2c0d5c0248 bugfix: needs to use full path conversion routine
This was SVN commit r1434.
2004-12-01 21:34:01 +00:00
c0ef326340 1) file.cpp: add functions for relative path conversion, also better dox
2) ERR_PATH_LENGTH (instead of ERR_VFS_): now used by file.cpp also
3) better document file_enum and FileCB

This was SVN commit r1433.
2004-12-01 18:44:38 +00:00
f04af0077e ignore .svn folders (and their contents) when mounting dirs
This was SVN commit r1432.
2004-12-01 08:16:01 +00:00
4d83cba7e6 add required precompiled header include
This was SVN commit r1431.
2004-12-01 06:52:39 +00:00
2eed8a8b45 even longer SND_CARD_LEN
This was SVN commit r1430.
2004-11-30 23:40:44 +00:00
b8d0df4b03 Re-enabled crash-dumping exception handler
This was SVN commit r1427.
2004-11-30 15:52:10 +00:00
b50ddcc9bc Added all external libraries
This was SVN commit r1424.
2004-11-29 04:22:37 +00:00
MarkT
f930bf1df4 Added semi-intelligent text parser for XMLs - so that numeric properties on entities are no longer stored as strings instead.
This was SVN commit r1409.
2004-11-27 20:02:51 +00:00
d9f30a5d42 Faster Ogg reading (~2.5x in extremely unoptimised builds)
This was SVN commit r1408.
2004-11-27 04:14:34 +00:00
fe54b3deeb Fixed minor warnings
This was SVN commit r1406.
2004-11-27 03:22:04 +00:00
c82c7d2e2a Increased SND_CARD_LEN to handle "Realtek AC97 Audio"
This was SVN commit r1405.
2004-11-27 02:57:54 +00:00
caf8471132 Testing svk (and fixing tab usage)
This was SVN commit r1404.
2004-11-26 21:34:35 +00:00
Gee
caff02e8da I had to ask some things to make some word-processing easier/faster. Feel free to adjust anything that's crooked.
This was SVN commit r1395.
2004-11-24 23:47:48 +00:00
Gee
0adc8f6ca2 Unfinished Input box.
This was SVN commit r1394.
2004-11-24 23:39:52 +00:00
30ad195c0b Linux/GCC Compat
This was SVN commit r1393.
2004-11-23 23:56:10 +00:00
7bf6d11d8c "*.<ext>" filter as per new vfs_next_dirent
This was SVN commit r1392.
2004-11-23 23:52:52 +00:00
7a84eca26b "*.<ext>" filter as per new vfs_next_dirent; also use ARRAY_SIZE
This was SVN commit r1391.
2004-11-23 23:52:39 +00:00
5a09dcd81b "*.xml" filter as per new vfs_next_dirent
This was SVN commit r1390.
2004-11-23 23:52:13 +00:00
d9ed18f8ca fixed stupid bug, simplified vfs_next_dirent
This was SVN commit r1389.
2004-11-23 23:51:34 +00:00
86940ee0aa Minor changes in MP player handling, slightly more correct
This was SVN commit r1388.
2004-11-23 23:46:15 +00:00
b3cba5f48c Deadlock Fix in Linux code
This was SVN commit r1387.
2004-11-23 23:37:10 +00:00
313df4064c vfs_next_dirent filter can now match *? wildcards (no longer limited to extensions)
updated dox, and added ERR_VFS_DIR_END code

This was SVN commit r1386.
2004-11-23 21:12:18 +00:00
5c923bbe70 update filter dox to bring in line with new vfs_next_dirent
also accounts for new ERR_VFS_DIR_END code when checking errors

This was SVN commit r1385.
2004-11-23 21:11:00 +00:00
5857361da2 add ERR_VFS_DIR_END code
This was SVN commit r1384.
2004-11-23 21:08:59 +00:00
9a00cd11d5 add match_wildcard function (for vfs_next_dirent)
This was SVN commit r1383.
2004-11-23 20:52:03 +00:00
03db724b99 better error handling: no assert blowing up in your face if SndData_reload fails (or is made to fail)
This was SVN commit r1382.
2004-11-23 19:08:30 +00:00
2fe43a46fc Other changes to incomplete systems
This was SVN commit r1381.
2004-11-23 18:21:43 +00:00
033666c2de Various ancient changes that were never committed (since they don't quite work yet)
This was SVN commit r1380.
2004-11-23 18:19:27 +00:00
4596b7dfc8 sound driver version detect code takes DLL search path into account; hardened
This was SVN commit r1378.
2004-11-22 07:41:02 +00:00
3b5ab280d4 add win_exe_dir (application's start directory)
This was SVN commit r1377.
2004-11-22 07:40:32 +00:00
affc35521f remove dsound.h - fixes compile error on vc6/7 hybrid (probably mismatched DX headers)
This was SVN commit r1376.
2004-11-22 03:03:25 +00:00
2fadd87e4f remove zlib.h from header to xeromyces.cpp
it's only used to forward-declare a function used in the impl =>
shouldn't be in header
also added ZLIB_DLL before zlib.h

This was SVN commit r1375.
2004-11-22 00:19:08 +00:00
b2ba38e7a4 define ZLIB_DLL before zlib.h
This was SVN commit r1374.
2004-11-22 00:17:37 +00:00
af56d5829b improved png write code while searching for cause of bug #24
This was SVN commit r1373.
2004-11-22 00:10:16 +00:00
73834cee73 upgraded to libpng 1.2.7 to fix bug #24
This was SVN commit r1372.
2004-11-22 00:09:36 +00:00
bfd2a43dfb sound code: now uses DX5 (instead of default of DX8), more error checking vs. bug #33
This was SVN commit r1371.
2004-11-21 08:41:40 +00:00
daab6788b9 add SetPosition and SetGain wrappers. untested
This was SVN commit r1366.
2004-11-20 21:32:00 +00:00
d4f31c09da replace detect() with individual routines; add sound card system_info;
add g_Quickstart that skips writing system_info (speeds up startup by
700ms)

This was SVN commit r1364.
2004-11-19 22:58:01 +00:00
c9303e0e40 delay load dsound.dll
This was SVN commit r1363.
2004-11-19 22:56:17 +00:00
c6cf8593c9 add windows sound card info query (via directsound; OpenAL is entirely unhelpful)
This was SVN commit r1362.
2004-11-19 22:43:02 +00:00
d489c48652 safer check if TSC is useable (and CPU detect has occurred)
This was SVN commit r1361.
2004-11-19 22:42:20 +00:00
2f9a735232 add win_sys_dir for win-specific code
This was SVN commit r1360.
2004-11-19 22:41:37 +00:00
1ba56151ca explicit string size; remove reference to detect()
This was SVN commit r1359.
2004-11-19 22:41:05 +00:00
d5473db68e warning fix: remove redundant uint >= 0
This was SVN commit r1358.
2004-11-19 22:40:27 +00:00
4a9fc1e1d1 add sound card info; remove central detect() call
This was SVN commit r1357.
2004-11-19 22:40:00 +00:00
cda100e72d fix warning: cast -1 to uint
This was SVN commit r1353.
2004-11-18 20:56:45 +00:00
df2e7f1b08 fix warning: add typecast to JSVAL_NULL
This was SVN commit r1352.
2004-11-18 20:56:13 +00:00
e04df2616b remove redundant size_t >= 0 check to satisfy ICC
This was SVN commit r1351.
2004-11-18 20:52:27 +00:00
b4fef6c1f2 fix incorrect 64-bit serialization
(was shifting u32 32 bits left, which is 0)

This was SVN commit r1350.
2004-11-18 20:51:49 +00:00
16287e8195 commented out EntityResolver LOG statement (less spew)
This was SVN commit r1339.
2004-11-16 18:22:54 +00:00
MarkT
d30e10042f Minor changes to sound-script interface.
This was SVN commit r1332.
2004-11-15 22:30:01 +00:00
e1bb0a3d2e get ride of separate snd_open_def (simplifies JS interface)
filename is assumed to be a definition file if extension == .txt

This was SVN commit r1329.
2004-11-15 18:34:13 +00:00
c3a331b73f add JS sound binding
This was SVN commit r1328.
2004-11-15 18:23:39 +00:00
ae6baf5134 Changed all the spaces back into tabs
This was SVN commit r1326.
2004-11-15 13:38:07 +00:00
Fire Giant
8d7c180457 Fixed a missing comma on line 76, which made the batch-file not work any more.
This was SVN commit r1325.
2004-11-15 10:05:12 +00:00
2f27947101 Minor oops
This was SVN commit r1324.
2004-11-15 04:58:33 +00:00
Fire Giant
eb1424cb8f Fixed a stupid typo (missing semicolon).
This was SVN commit r1315.
2004-11-14 21:16:39 +00:00
Fire Giant
a9fe8c0c61 Changed GUI load sequence in order to fix a problem which came up through the global objects being loaded before the main menu background object. The globals are now in 6_global.xml (should always be at the end of the load order) and the JS initialization now is in 1_init.xml.
This was SVN commit r1314.
2004-11-14 21:14:00 +00:00
fb09faf5be Parser bug-fix
This was SVN commit r1313.
2004-11-14 18:56:13 +00:00
2bac35868b Highly advanced unit-testing framework
This was SVN commit r1312.
2004-11-14 18:53:26 +00:00
4af3eca831 Prefer compile-time errors to run-time errors
This was SVN commit r1311.
2004-11-14 18:52:22 +00:00
64646cfbbf Some more verbose error reporting
This was SVN commit r1307.
2004-11-12 22:11:04 +00:00
9a69d76feb Minor update to add link to 5_atlas.xml, so that GUI development of the Atlas Editor is supported.
This was SVN commit r1303.
2004-11-11 23:51:52 +00:00
MarkT
793794649f Combat code, some scripting, broken network, and fixed some bugs.
This was SVN commit r1301.
2004-11-11 07:09:32 +00:00
Calefaction
9b47d446d2 Updated to instansiate and tear down the mesh managed.
This was SVN commit r1300.
2004-11-08 22:21:50 +00:00
Calefaction
f257c67967 Updated to fix compile errors caued by missing CVertexProgram
This was SVN commit r1299.
2004-11-08 22:15:06 +00:00
Calefaction
efe4673f15 Removed, no longer needed. GLSL replacement coming.
This was SVN commit r1298.
2004-11-08 22:10:30 +00:00
Calefaction
11900f8b38 *** empty log message ***
This was SVN commit r1297.
2004-11-08 22:10:06 +00:00
Calefaction
82108a30c9 Removed, no longer needed (replacement using GLSL coming)
This was SVN commit r1296.
2004-11-08 22:09:28 +00:00
Calefaction
e3137cd302 Various updates, including the new MeshManager
This was SVN commit r1295.
2004-11-08 22:02:01 +00:00
f66de9d098 log when files are opened (used to arrange files in zip archive)
also added mtime to *_stat calls for XMB (check date instead of
checksum)

This was SVN commit r1288.
2004-11-07 23:00:32 +00:00
e48b5f9b64 enable file listing hook in ParseArgs
This was SVN commit r1287.
2004-11-07 22:46:57 +00:00
f76d099956 Proper Player Handling
This was SVN commit r1286.
2004-11-07 21:59:52 +00:00
c32e6d5215 String conversion fix/extension
This was SVN commit r1285.
2004-11-07 21:57:46 +00:00
3136791492 Linux/GCC Compat(tm)
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
5ab0be984b CStr alterations
This was SVN commit r1283.
2004-10-31 22:00:01 +00:00
5e42dad394 CStr alterations
This was SVN commit r1282.
2004-10-31 20:29:09 +00:00
Calefaction
3c69a79f0f Updated to output OpenGL version
This was SVN commit r1281.
2004-10-31 07:37:32 +00:00
Calefaction
955ddcf9a1 More programmable pipeline updates
This was SVN commit r1280.
2004-10-30 21:57:46 +00:00
2cf79ca6cf more dox :]
This was SVN commit r1279.
2004-10-30 15:17:19 +00:00
4e7b6bd165 improved dox a bit; explicit deque_finished_bufs call, instead of changing update behavior via VS_ flags.
This was SVN commit r1278.
2004-10-25 13:07:34 +00:00
728e6e1f10 Update to fix likely GCC compile problem
This was SVN commit r1277.
2004-10-24 15:49:52 +00:00
Calefaction
09ce67303e Updates to fix VC2K5 compile problem
This was SVN commit r1276.
2004-10-24 00:48:54 +00:00
06051e3628 cleaned up and documented. ready for use.
This was SVN commit r1275.
2004-10-23 19:55:41 +00:00
0c95417dec Avoid type warnings
This was SVN commit r1274.
2004-10-23 19:24:55 +00:00
96807dd6f3 remove resource.h include - not needed, was actually referring to sced resource.h
This was SVN commit r1273.
2004-10-23 18:41:02 +00:00
Calefaction
7947293015 Initial programmable pipeline push
This was SVN commit r1272.
2004-10-23 18:13:54 +00:00
MarkT
d33d2e4450 Added some support for user profiles
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
01456b797c further cleanup + fixed another shutdown order bug via h_force_close
This was SVN commit r1269.
2004-10-22 22:00:57 +00:00
6f114dcd5e h_force_close support for sound shutdown issue
This was SVN commit r1268.
2004-10-22 21:58:03 +00:00
a8fff67c91 remove "p-pressed" debug_out
This was SVN commit r1267.
2004-10-22 21:54:31 +00:00
0f93e53e61 \n on debug_out
This was SVN commit r1266.
2004-10-21 15:08:10 +00:00
0a4c838185 Exciting space->tab transformations
This was SVN commit r1265.
2004-10-21 15:04:19 +00:00
27d52a8c45 WIP. have added some dox and armor-plated the lower-level components.
fixed shutdown order issue mentioned in task report.

further refactoring expected for vsrc_update et al (messy) and list_*

This was SVN commit r1264.
2004-10-20 23:18:52 +00:00
20061f0e38 due to h_allow_free, no longer rely on h_mgr cleaning up buffers (that was a hack, and wouldn't work if OpenAL is reset at runtime)_
now snd_cleanup before h_mgr_cleanup - makes sense anyway.

also added snd_update call that doesn't change OpenAL position - this is
so sound works in the main menu.

This was SVN commit r1263.
2004-10-20 23:16:38 +00:00
0540792825 add ERR_AGAIN error
This was SVN commit r1262.
2004-10-20 13:36:49 +00:00
1ef7ce088c add support for forcibly closing cached files (needed when closing all active sounds before resetting openal)
This was SVN commit r1261.
2004-10-20 00:58:55 +00:00
0afc3c159d trivialities: add extern, add assert to make sure oglInit called
This was SVN commit r1260.
2004-10-19 17:49:12 +00:00
d30c7ef9aa use correct path to sound assets
This was SVN commit r1259.
2004-10-19 13:45:50 +00:00
8764693bd8 allow 0-length allocs without complaint (required when vfs_loading 0-length files, as happens with current art pack)
This was SVN commit r1258.
2004-10-19 13:29:51 +00:00
3c9823fd31 Don't override the printscreen key when the user's looking at some other program
This was SVN commit r1257.
2004-10-18 22:08:21 +00:00
34b553e2b2 remove ogg_display junk
This was SVN commit r1256.
2004-10-18 14:25:13 +00:00
Calefaction
50dee130ae Updated to properly support LOD bias settings in config. Fixes mipmap blurryness.
This was SVN commit r1254.
2004-10-17 21:01:00 +00:00
e31edf4fb4 Fixed mouse-wheel zooming
This was SVN commit r1253.
2004-10-17 10:55:57 +00:00
b5d9f886a4 Don't complain when shutting down without having played a sound
This was SVN commit r1252.
2004-10-17 10:21:06 +00:00
f0f7f236b7 sound test filename -> game data, since ogg playing works again.
This was SVN commit r1251.
2004-10-16 20:55:56 +00:00
f144aa0686 as per meeting today, disabled use of OpenAL ogg extension; wrote a quick, ugly, no-good hack to decode OGG files 'manually' (using vorbis)
(it doesn't stream, it loads the whole thing into memory - baad)
but the steaming pile seems to work! all is good ;)

This was SVN commit r1250.
2004-10-16 20:54:24 +00:00
d272a7ebb4 remove ofs field for vfs_start_io - never used
This was SVN commit r1249.
2004-10-16 20:52:18 +00:00
90a0860081 Added load for 4_manual.xml.
This was SVN commit r1243.
2004-10-15 18:01:22 +00:00
1798a1ab1d remove testing code that makes clicks do strange things ;)
This was SVN commit r1242.
2004-10-15 17:26:36 +00:00
45ffe69f90 fix sign conversion bug (int -> size_t)
This was SVN commit r1241.
2004-10-15 13:42:13 +00:00
390fe343a0 gives sound engine current position during update; also fixed sound shutdown order issue (must come after h_mgr_shutdown)
note: you will need to fiddle a bit to test this ATM: see
http://forums.wildfiregames.com/0ad/index.php?showtopic=1672  #5

This was SVN commit r1240.
2004-10-15 13:29:04 +00:00
cd24c9c6f7 fixes for RES_UNIQUE (used by sound instances) - no longer add such handles to the h_find lookup data struct, because it can't handle several instances backed by the same file
This was SVN commit r1239.
2004-10-15 13:19:37 +00:00
6f2c1fbb8c WIP; still tons of debug code
now theoretically supports 3d positional sound; solidified snd data
provider -> VSource code

This was SVN commit r1238.
2004-10-15 13:18:34 +00:00
Gee
fd91563f42 Sorry! Totally forgot to add the CInput.cpp/h
This was SVN commit r1237.
2004-10-14 21:01:13 +00:00
Gee
cdf7334d34 Added GetHeight()
This was SVN commit r1236.
2004-10-14 10:10:43 +00:00
Gee
5b74afce82 Added unifont_height...
This was SVN commit r1235.
2004-10-14 10:09:51 +00:00
Gee
f4b410ff82 A bunch of updates:
- Added *unfinished* control input.
- The GUI captures the events now, so that you can't press anything in
the game if the GUI is infront of it. The GUI needs some cleaning up
though.
- Made the type 'empty' unpressable, because all those "0 0 100% 100%"
empties were just like pieces of glass making the user unable to select
anything in the game.
- A bunch of other updates I made like weeks ago and never committed.

This was SVN commit r1234.
2004-10-14 10:09:26 +00:00
Gee
c4684effb6 Progress bar added, and an optional attribute for the [icon] tags in text.
You can now displace an icon using: "[icon="smiley" displace="2 -3"]

I may rename it from 'displace' to something else if someone gives me a
good suggestion.

This was SVN commit r1232.
2004-10-14 02:32:26 +00:00
Calefaction
5275dc862b Initial mini-map check-in
This was SVN commit r1230.
2004-10-08 01:10:14 +00:00
6b084c3173 Fixes to comply with VC2005.
This was SVN commit r1229.
2004-10-07 22:03:12 +00:00
769e521349 Added references to multiple GUI XML files (temporary adjustment to make it easier to work on different GUI pages).
This was SVN commit r1227.
2004-10-07 21:06:08 +00:00
442c6f315f Added 'const' to appropriate bits of Xeromyces
This was SVN commit r1226.
2004-10-07 20:49:35 +00:00
2c9ac03375 Another minor fix
This was SVN commit r1225.
2004-10-07 20:14:20 +00:00
MarkT
6f10c954de Missing JSCollection*. Oops.
This was SVN commit r1224.
2004-10-07 20:09:11 +00:00
53719430d1 Minor bug fixes
This was SVN commit r1223.
2004-10-07 20:02:58 +00:00
MarkT
3469e90636 Couple of files missing from previous commit.
This was SVN commit r1222.
2004-10-07 19:35:08 +00:00
MarkT
2ab625720b Fairly major XML/entprop changes; some more minor stuff that fell out as a consequence.
This was SVN commit r1220.
2004-10-07 19:23:35 +00:00
notpete
e260a5eb8e Support for recursive actor directories; few other minor changes.
This was SVN commit r1219.
2004-10-06 18:46:33 +00:00
notpete
17a4174505 Minor additional functionality.
This was SVN commit r1218.
2004-10-06 18:45:59 +00:00
notpete
81c829ec4c Minor changes.
This was SVN commit r1217.
2004-10-06 18:44:47 +00:00
711118ee97 less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
This was SVN commit r1216.
2004-10-06 14:25:36 +00:00
975344b515 less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
This was SVN commit r1215.
2004-10-06 14:12:10 +00:00
67d95dd3af add ARRAY_SIZE
This was SVN commit r1214.
2004-10-06 14:11:55 +00:00
4f230f061d less dependencies: handle.h forward-defines Handle, so that not everything that uses res headers is dependent on h_mgr
This was SVN commit r1213.
2004-10-06 14:00:43 +00:00
53f8283cfc update sound test rig, have added a few (local) filenames for testing
This was SVN commit r1212.
2004-10-05 13:14:34 +00:00
622febf5b7 update sound test rig, have added a few (local) filenames for testing
This was SVN commit r1211.
2004-10-05 13:14:03 +00:00
fecb8e38de buggy, work-in-progress. can now again play sounds. basic culling/prioritization code in place.
This was SVN commit r1210.
2004-10-05 13:11:28 +00:00
7a0cf92c25 add RES_UNIQUE, required for sound code
This was SVN commit r1209.
2004-10-05 13:10:49 +00:00
13dfff0e12 removed unnecessary (unused) calc
This was SVN commit r1208.
2004-10-05 13:07:25 +00:00
10a81394ff removed test rig crap
This was SVN commit r1207.
2004-10-03 23:28:57 +00:00
b6c1ad7126 had a look at CPU freq detect due to win32asm thread.
added comments + slight improvement (get system time first, then rdtsc)
=> good bit more accurate

This was SVN commit r1206.
2004-10-03 13:06:37 +00:00
cb11ff27c2 startServer() display corruption bug, bug #28
This was SVN commit r1202.
2004-09-28 16:01:11 +00:00
011666f393 Minor fixes for Linux/GCC
This was SVN commit r1201.
2004-09-26 21:21:34 +00:00
Calefaction
39501530d4 Updated to properly update material parameters.
This was SVN commit r1200.
2004-09-26 04:09:57 +00:00
Calefaction
4e93961f92 Minot change. The renderer now no longer does any work unless the game state is indicated as "started" by g_Game->IsGameStarted()
This was SVN commit r1199.
2004-09-26 04:05:35 +00:00
Calefaction
f888544789 *** empty log message ***
This was SVN commit r1198.
2004-09-24 03:52:32 +00:00
Calefaction
b1c269b72e Complete materials checkin
This was SVN commit r1197.
2004-09-24 03:52:03 +00:00
7f962ea9c4 Fixed very minor bug
This was SVN commit r1196.
2004-09-23 13:23:42 +00:00
6d4f94112d Fixed memory leak
This was SVN commit r1195.
2004-09-23 12:42:37 +00:00
Calefaction
0a05c2977a Updated to reflect MaterialManager
This was SVN commit r1194.
2004-09-23 05:21:18 +00:00
Calefaction
831053d680 Update to the material system
This was SVN commit r1193.
2004-09-23 05:10:03 +00:00
Calefaction
4fff66cfce Initial import of material code. MaterialReader is implemented and functional. Currently models do not attempt to load materials, nor does the renderer use them.
This was SVN commit r1192.
2004-09-23 04:00:56 +00:00
9c2fb5a466 stomped on vc2k5 warning (size_t -> uint)
This was SVN commit r1191.
2004-09-22 18:14:00 +00:00
df1b502bbd Linux Compat and some updated PARANOIA code
This was SVN commit r1189.
2004-09-22 15:20:58 +00:00
ab7b542c20 console height now relative to y resolution instead of always 600 pixels
This was SVN commit r1188.
2004-09-22 14:01:50 +00:00
7c157c5f90 Avoided minor for-scoping complaints
This was SVN commit r1187.
2004-09-22 11:51:43 +00:00
c28c5a1beb fix of VC2k5 fix (both pointers to tokenized string are now char*)
This was SVN commit r1186.
2004-09-22 00:46:12 +00:00
4a7757dac6 VC2k5 fix: avoided ambiguous parameter naming
This was SVN commit r1185.
2004-09-21 22:11:33 +00:00
a1bd91d198 VC2k5 fix: don't keep converting char* -> const char* -> char*
This was SVN commit r1184.
2004-09-21 22:10:49 +00:00
0868b2ee6c VC2k5 fix: strchr return value saved as const char* (cf Stu's CVS report #161)
This was SVN commit r1183.
2004-09-21 18:43:58 +00:00
ff4af72da1 fix incorrect round up calculation
This was SVN commit r1182.
2004-09-21 16:59:50 +00:00
eb2989176e startGame() shouldn't crash and burn if the game's already been started
This was SVN commit r1181.
2004-09-21 16:10:46 +00:00
777f06143d - A lot of small network fixes
- Connecting client(s) to a server and giving orders to a shared set of
entities now works - Yeah!
- Removed thread sync from CNetServer

This was SVN commit r1180.
2004-09-21 14:40:43 +00:00
6787a32b3c potential vsnprintf buffer overflow
This was SVN commit r1179.
2004-09-21 14:35:30 +00:00
92ade065c3 vector<char> magic changed into a nicer std::string constructor (heap corruption induced paranoia =] )
This was SVN commit r1178.
2004-09-21 14:33:13 +00:00
a9075a887f - Chat fix (server user didn't see his own text)
- Removed filter for Ctrl-Alt combinations (some pretty useful chars
like {[]} are on AltGr/CtrlAlt combinations here in Sweden)

This was SVN commit r1177.
2004-09-21 14:31:02 +00:00
8b2e918e05 cleanup + bulletproofing
This was SVN commit r1176.
2004-09-21 13:40:14 +00:00
dce92ce677 fix 2 stupid bugs causing crashes when loading from loose files - wasn't detecting all causes where transfers are unaligned => read rounded-up amount of data into original buffer as opposed to realign buffer => clobbered the heap.
This was SVN commit r1175.
2004-09-21 11:58:22 +00:00
7925a3fc4d Avoid crashing when something minor that should never fail fails (though the cause of that failure is fairly major (but currently unknown))
This was SVN commit r1174.
2004-09-20 18:27:22 +00:00
ae2d42bbad fix incorrect buffer free (now handled by ALBuffer); work in progress
This was SVN commit r1172.
2004-09-19 19:29:03 +00:00
85cf439f62 slight changes (memset IOSlot; if(.. < 0) -> CHECK_ERR)
This was SVN commit r1171.
2004-09-19 19:28:00 +00:00
b459e7e640 fixed debug_check_heap definition
This was SVN commit r1170.
2004-09-19 19:27:04 +00:00
ea9bd61195 now correctly set m_UnpackPos
This was SVN commit r1169.
2004-09-19 19:22:18 +00:00
69e9f3ef79 now stores its data in buffer, rather than copying to std::vector
This was SVN commit r1168.
2004-09-19 18:51:19 +00:00
a0f0215c15 fixed debug_check_heap definition
This was SVN commit r1167.
2004-09-19 18:45:04 +00:00
c3ed7df432 0 -> FALSE + add/removed debug code
This was SVN commit r1166.
2004-09-19 18:44:21 +00:00
1166c2a22c workaround for stupid "void* -> unsigned cast" warning
This was SVN commit r1165.
2004-09-19 17:27:03 +00:00
022964c43b moved low-level sound code to res/snd.cpp. CMusicPlayer is now an empty shell, pretty much; it will contain higher-level music logic (selecting track, fading in/out) implemented via snd calls
This was SVN commit r1164.
2004-09-19 16:01:41 +00:00
6fd0c451c2 changed to include sound code (test "rig")
This was SVN commit r1163.
2004-09-19 15:58:13 +00:00
cfe4562e6a move low-level sound/music code from musicplayer to res/snd; also put oal.* in there
work in progress.

This was SVN commit r1162.
2004-09-19 15:57:20 +00:00
f6cfcd0555 slight change to interface (FileIO* vs simple void* output value) to simplify Zip interface (needed to change because now it has to store data of its own in IOs when doing partial reads)
This was SVN commit r1161.
2004-09-19 15:51:12 +00:00
5db49638cf worked on partial zip reads. also changed to bring in line with file/vfs for slightly changed streaming interface
This was SVN commit r1160.
2004-09-19 15:49:46 +00:00
d3f452cd80 - add vfs_io_complete (wasn't in header) and vfs_size (convenience function)
- have vfs_load allocate the buffer, so mem_assign is no longer needed.
exposes buffer alignment requirement to VFS, but hey. simplifies things
a good bit.
- moved performance measuring crap to vfs_timed_io, a wrapper function
- various fixes for streaming code

This was SVN commit r1159.
2004-09-19 15:42:32 +00:00
b3a5bad377 fix 2 stupid h_mgr_shutdown bugs leading to failure to close some leaked handles at exit (see bug 26)
- was iterating over all HDATA slots up to last_in_use, but it is
inclusive
- when closing, wasn't resetting refcount, so h_free kept those with
refcount > 1 open

This was SVN commit r1158.
2004-09-19 13:46:38 +00:00
a872461a47 no longer 2 tex_write calls - just one that fills a TexInfo directly => no longer need mem_assign to wrap a pointer, only to dereference immediately thereafter
This was SVN commit r1157.
2004-09-19 13:43:53 +00:00
d46cf9cf1f remove mem_assign and mem_assign_user (all call sites rewritten so that they're no longer needed)
still available in source, but shouldn't be necessary.

This was SVN commit r1156.
2004-09-19 13:41:49 +00:00
e4f160df27 fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't
included by default anymore.

This was SVN commit r1155.
2004-09-19 11:57:51 +00:00
02ec0a7e62 add comment: tex_upload binds texture as a side effect
This was SVN commit r1154.
2004-09-19 11:40:42 +00:00
18e016578d fix tex_load return value check - Handle invalid <==> <= 0
This was SVN commit r1153.
2004-09-19 11:39:47 +00:00
167a077bc2 fix headers: ogl_tex.h is user-level texture stuff, tex.h is only the texture loader.
this came up due to header change - some unnecessary stuff isn't
included by default anymore.

This was SVN commit r1152.
2004-09-19 11:38:54 +00:00
7c269d7735 better encapsulation of header (=> less dependencies)
This was SVN commit r1151.
2004-09-19 11:36:26 +00:00
5a8dd803a7 fix for gcc: philip reports it doesn't have upper_bound (although it's part of STL). replaced with equal_range
This was SVN commit r1150.
2004-09-19 11:23:12 +00:00
e675dbca5f no longer delay load ogg dlls (new sound code is using openal ogg support); avoids warnings in the meantime
This was SVN commit r1149.
2004-09-18 12:51:14 +00:00
dbee9e74fd Fixed lack of termination when log messages exceed 512 chars
This was SVN commit r1148.
2004-09-17 23:13:38 +00:00
b1a5f53284 Testing system for the i18n code, to make sure I don't break anything. (Now on CVS to make it less lonely.)
This was SVN commit r1145.
2004-09-17 17:49:12 +00:00
ca862b8332 Minor adjustments to i18n code
This was SVN commit r1144.
2004-09-17 17:45:44 +00:00
8760a86c13 Unfinished utility for extracting to-be-translated strings from all the game's data files
This was SVN commit r1142.
2004-09-10 13:42:02 +00:00
03e3de50ed When I said "Now fixed", I was wrong. But it's fixed now.
This was SVN commit r1140.
2004-09-06 12:54:35 +00:00
2d153bac2d Increased paranoia, in case the i18n system crashes while translating the crash message
This was SVN commit r1139.
2004-09-06 11:39:27 +00:00
806dea648c Er... broke stuff. Now fixed.
This was SVN commit r1138.
2004-09-06 11:37:15 +00:00
e532b59ead Utilised the corrected CStr8/W conversion
This was SVN commit r1137.
2004-09-06 11:35:42 +00:00
a9d7f0dae8 Fixed minor bug when displaying text containing a "%". Used LOG_ONCE to avoid continuous error logging. Removed redundant Trim (Xeromyces always trims element text)
This was SVN commit r1136.
2004-09-06 11:34:46 +00:00
7008e5b53c Updated to handle Unicode strings
This was SVN commit r1135.
2004-09-06 11:28:30 +00:00
5df205084f Made JSString->wstring conversion slightly easier
This was SVN commit r1134.
2004-09-06 11:28:04 +00:00
13974087c3 Fixed memory leak
This was SVN commit r1133.
2004-09-06 11:18:47 +00:00
0dc2f34676 GCC whine avoidance: newlines at ends of files
This was SVN commit r1132.
2004-09-06 11:18:22 +00:00
f791e5f665 Altered the automatic CStr8/CStrW conversion -- it seems to work now
This was SVN commit r1131.
2004-09-06 11:15:43 +00:00
d373e7a559 Moved language selection into the .cfg file
This was SVN commit r1130.
2004-09-06 11:13:36 +00:00
Gee
5c2838f7cf Forgot to remove a temp log-output
This was SVN commit r1129.
2004-09-06 03:21:56 +00:00
Gee
071bb19282 no message
This was SVN commit r1128.
2004-09-06 03:05:36 +00:00
Gee
6e07632775 Changed a function that the GUI uses to Unicode.
This was SVN commit r1127.
2004-09-06 02:24:34 +00:00
Gee
da465ae1dc Made a little change only to make it compile, hopefully it won't do too much damage until Philip can correct this.
This was SVN commit r1126.
2004-09-06 02:22:38 +00:00