1
0
forked from 0ad/0ad
Commit Graph

1624 Commits

Author SHA1 Message Date
f093b53459 Fixed problems in texture converter's DDS output, and in the game's DDS input.
This was SVN commit r1862.
2005-01-29 17:18:14 +00:00
4ed4a7e16d Fix for the crash when a client connects, as well as some minor additions to client/server code
This was SVN commit r1861.
2005-01-29 16:51:13 +00:00
41e2f48daf add reference to required .lib files to fix linker errors reported by stu
This was SVN commit r1860.
2005-01-29 16:43:46 +00:00
60ee5acd2b Made invalid-attempt-to-get-player errors less subtle. Word-wrapping in assert2 dialog box.
This was SVN commit r1857.
2005-01-29 00:11:50 +00:00
e372bd3f5a Fixed probable mistyping. Removed apparently-unnecessary ScEd code.
This was SVN commit r1855.
2005-01-28 22:19:09 +00:00
10e1ce7511 Texture converter executable (plus some others to launch it with specific settings)
This was SVN commit r1854.
2005-01-28 22:16:50 +00:00
4c6713b582 again hooked up 0ad exception handler (pending cleanup of the exception code)
This was SVN commit r1852.
2005-01-28 19:11:30 +00:00
60dbb779eb Texture converter source, plus modified DevIL.
This was SVN commit r1851.
2005-01-28 19:05:33 +00:00
f25f6a2d70 wdbg: fix crash when exiting abnormally (alt+f4) - was erasing elements from container while iterating through it
win internal files: slight changes while looking through

This was SVN commit r1850.
2005-01-28 18:16:51 +00:00
39389b7bb2 Proper blending for player-colours
This was SVN commit r1847.
2005-01-28 15:38:49 +00:00
b48ede5438 Accept DDS files with mipmaps
This was SVN commit r1846.
2005-01-28 15:37:01 +00:00
b704c7b0e4 endian.h renamed (conflict with linux system header)
This was SVN commit r1844.
2005-01-27 20:00:47 +00:00
38d6f81d71 add/update win-specific code+header file comment
This was SVN commit r1841.
2005-01-27 16:18:22 +00:00
f55107c114 sysdep: inline vsprintf2 definition (no need for printf.h)
win.cpp: remove hWnd (not needed for clipboard code) and TSC reference
(a temporary hack)

This was SVN commit r1840.
2005-01-27 15:50:11 +00:00
09985eaa7e split thread/mutex/sem defs out of wposix to wpthread (reduce default dependencies)
waio: add include guard; include from waio.cpp

This was SVN commit r1839.
2005-01-27 15:46:02 +00:00
f3a61e4f69 wsdl: add prototypes for VC endian swap routines (avoid warning)
endian.*: split out of lib.* to reduce default dependencies
tex,zip: now include endian.h

This was SVN commit r1838.
2005-01-27 15:40:23 +00:00
faff797cd6 include SDL or lib/input.h where needed (since lib.h no longer pulls it in)
input.h now includes SDL (no more macro hackery to avoid the dependency)

This was SVN commit r1837.
2005-01-27 15:31:06 +00:00
f6c95b259d include exception handler code only if EXCEPTION_HACK_0AD is required. (since some PS-specific code leaked into wdbg.cpp, have to disable that until i get around to cleaning it up)
This was SVN commit r1836.
2005-01-27 15:22:47 +00:00
NoMonkey
d7b3d6b0c7 Added a new material, "player_trans.xml" which will give a model player color. So now if you want a player to be colored, just add this material!
This was SVN commit r1830.
2005-01-27 02:52:26 +00:00
969ed22f97 - provide for 1-byte ints (debug info is weird; dunno why it's stored as such, but they exist)
- if tag != SymTagDataType, don't dump the symbol (to be safe). this is
unexpected, but Philip reports it triggered.
- assert dialog is resizeable (grr, have to do that manually)

This was SVN commit r1828.
2005-01-26 16:25:56 +00:00
bc1c05b7db wrap operator new call site in nommgr.h / mmgr.h
This was SVN commit r1827.
2005-01-26 16:22:08 +00:00
c756aff9c5 wposix: AllocConsole wrapper is now a standard function call (before, a direct jump saved a few bytes but was unsafe - not smart)
This was SVN commit r1825.
2005-01-26 01:06:48 +00:00
3e82535375 wdll: fixed operator_new (discussed at meeting) issue - turns out that was a bad idea. unless mmgr.h is included, operator_new isn't defined, so it's taken to be a function => it was never getting called in wdll
defining operator_new in a global file is a bad idea-  if we forget
that, hard-to-track errors result
so, no more operator new; instead, #include "nommgr.h" before local
operator new definitions and #include "mmgr.h" again afterwards

This was SVN commit r1824.
2005-01-26 01:05:22 +00:00
2d1ba66dc8 mmgr.cpp: uses assert2 when something fails (so you get a pretty stack trace
mmgr.h: remove everything if !defined(USE_MMGR); move dox to end of file
debug.h: fix stupid n00b bug in assert2 (expr wasn't in "()" )

This was SVN commit r1822.
2005-01-26 00:33:45 +00:00
NoMonkey
ed27392768 Made the minimap display the player colors and represent their positions correctly.
This was SVN commit r1821.
2005-01-26 00:19:17 +00:00
e7dcbfd19e further cleanup; stack trace + dialog part done for now; will clean up exception part later (discussed with philip)
This was SVN commit r1820.
2005-01-25 23:55:49 +00:00
c12c6a0e4d main: remove __try (non-portable). wdbg exception handler will cover it. if that needs to be debugged, add __try in win.cpp around call to main()
This was SVN commit r1817.
2005-01-25 18:56:43 +00:00
711bff0d3a lib.h: moved assert2 to sysdep/debug.h
mmgr: remove wdbg calls (was prototype); use sysdep/debug interface
wdbg: no longer call it dbghelp63.h; should be installed normally in
compiler dir
win_internal.h: fix inevitable MS screwups in new dbghelp.h (*sigh*)

This was SVN commit r1816.
2005-01-25 18:54:48 +00:00
0d80a05aec wdbg: much improved dbghelp stack dump, thanks to availability of new dox. should succeed with user-defined types - voodoo programming no more. benefits are reaped when using assert2 in code (recommended!) or an exception is raised.
also made "program error" dialog a bit nicer - it's now attached to
desktop and resizeable.

This was SVN commit r1814.
2005-01-25 18:42:42 +00:00
cb74250a51 - moved assert2 to sysdep/debug.h
- sysdep/debug.h includes platform-specific version, so they can define
debug_break
- no longer a debug_break wrapper that calls to specific versions (so
that the debugger breaks in the target function directly)
- unix-specific stuff is only debug ATM; call it udbg instead of unix.*

This was SVN commit r1813.
2005-01-25 18:27:00 +00:00
c73a3fe2c4 platform-specific debug header (included from sysdep/debug) is responsible for defining debug_break, or mapping it to the implementation function (result: if can be defined as a macro (e.g. on win32 or ia32), debugger breaks directly at the target location, instead of one function lower)
This was SVN commit r1812.
2005-01-25 17:58:15 +00:00
NoMonkey
8192c5b1c5 This was SVN commit r1810. 2005-01-25 03:27:38 +00:00
NoMonkey
f96b676fc9 This was SVN commit r1809. 2005-01-25 03:12:04 +00:00
NoMonkey
12bbe9cda1 This was SVN commit r1808. 2005-01-25 00:25:13 +00:00
36c5db05cd Added includes for non-pch build
This was SVN commit r1807.
2005-01-24 23:08:30 +00:00
NoMonkey
b2e50cfea9 This was SVN commit r1805. 2005-01-24 08:28:03 +00:00
NoMonkey
bdafae6453 This was SVN commit r1804. 2005-01-24 06:33:20 +00:00
NoMonkey
761dfde0c5 This was SVN commit r1803. 2005-01-24 06:14:13 +00:00
NoMonkey
85ed304a25 This was SVN commit r1798. 2005-01-23 23:04:00 +00:00
13bcff918e Let Testing/Release builds be built
This was SVN commit r1797.
2005-01-23 22:42:37 +00:00
NoMonkey
ce63d90bd7 This was SVN commit r1796. 2005-01-23 22:40:30 +00:00
NoMonkey
3851e7b9d9 This was SVN commit r1795. 2005-01-23 22:38:13 +00:00
41a924665b Added CEntity::SetPlayer (from John)
This was SVN commit r1794.
2005-01-23 22:32:10 +00:00
NoMonkey
02cc4d9c8e This was SVN commit r1793. 2005-01-23 22:21:37 +00:00
225446d648 Alternative player-colour rendering, which probably works with lights
This was SVN commit r1792.
2005-01-23 22:02:36 +00:00
NoMonkey
6fa79e0247 This was SVN commit r1791. 2005-01-23 21:58:06 +00:00
NoMonkey
19fd48b1d5 This was SVN commit r1790. 2005-01-23 21:56:47 +00:00
NoMonkey
2af3b77d7e This was SVN commit r1789. 2005-01-23 21:56:00 +00:00
6ca71568f5 vfs, ps/game.cpp: lint
dbghelp_funcs: no longer needed, since we load dbghelp statically

This was SVN commit r1788.
2005-01-23 19:49:45 +00:00
699b38e350 config: remove HAVE_DEBUGALLOC
Xeromyces.cpp,xmlutils,XercesErrorHandler.cpp: use nommgr.h

This was SVN commit r1787.
2005-01-23 18:25:28 +00:00
8c7df579bc precompiled: hook up mmgr (needs to be included in all files)
tex: lint fixes

unifont: split out glvprintf

This was SVN commit r1786.
2005-01-23 18:23:29 +00:00
4d25441c2a split out of wposix (less dependencies)
SDL_*: $id string

This was SVN commit r1785.
2005-01-23 18:21:20 +00:00
cca00f9555 memory tracker work-in-progress. detects memory leaks, overruns, and all sorts of goodies.
This was SVN commit r1784.
2005-01-23 18:19:28 +00:00
e4bcd210d3 win_internal: move VC debug heaps here to avoid conflicts with mmgr
vfs: lint fixes

mem: remove h_add_ref from mem_get_ptr (was a hack, breaks some code)

This was SVN commit r1783.
2005-01-23 18:17:46 +00:00
4facc59833 new init seg
This was SVN commit r1782.
2005-01-23 18:09:55 +00:00
9cadcd875d lint fixes; no longer dynamically load dbghelp (can always distribute required version)
work in progress: cleaning up debug info, add functions for mmgr to
query caller

This was SVN commit r1781.
2005-01-23 18:07:34 +00:00
4e454b31f0 lint fixes; more armor-plating for SDL_SetVideoMode
This was SVN commit r1780.
2005-01-23 18:05:33 +00:00
9e3ae3bdf2 further lint fixes
new init seg, group "C" called before libc init

better critsec impl, doesn't break if called after shutdown

This was SVN commit r1779.
2005-01-23 18:04:34 +00:00
468fb35ab5 waio.h: moved some signal handler defs here from wposix
This was SVN commit r1778.
2005-01-23 18:04:02 +00:00
9b7af0ce08 safer mutex impl; split some parts out into waio (signal defs, only used in aiocb) and wposix_types
This was SVN commit r1777.
2005-01-23 17:57:52 +00:00
bc52269989 lint fixes; changed wtime init order
This was SVN commit r1776.
2005-01-23 17:56:00 +00:00
85fd8a0f0e stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

also KB -> KiB, MB -> MiB

This was SVN commit r1775.
2005-01-23 17:54:20 +00:00
44ffb32169 fix include path (relative to lib)
This was SVN commit r1774.
2005-01-23 17:50:07 +00:00
e332d876f8 stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

This was SVN commit r1773.
2005-01-23 17:48:32 +00:00
a43205148b stomped various lint warnings:
- /* */ -> //
- clarified expressions
- add casts
- func() -> func(void)
- signed/unsigned

This was SVN commit r1772.
2005-01-23 17:45:25 +00:00
4360c501d8 mouse_x/y => g_mouse_x/y
This was SVN commit r1771.
2005-01-23 17:42:28 +00:00
fbc212ea5d mouse_x/y => g_mouse_x/y
This was SVN commit r1770.
2005-01-23 17:41:01 +00:00
d7bf0b7fbe use of new made suitable for mmgr's macro
This was SVN commit r1769.
2005-01-23 17:37:45 +00:00
ad16ecfb36 fix bug: was assigning char to pointer, instead of writing to *pointer
This was SVN commit r1768.
2005-01-23 17:36:57 +00:00
d29833e4ed mouse_x/y => g_mouse_x/y
This was SVN commit r1767.
2005-01-23 17:35:36 +00:00
e8121ca394 Also allow access to the last player ;-)
This was SVN commit r1765.
2005-01-23 12:54:14 +00:00
NoMonkey
0df00e5b16 This was SVN commit r1761. 2005-01-23 08:28:56 +00:00
NoMonkey
d9f1a06b34 This was SVN commit r1760. 2005-01-23 08:22:52 +00:00
NoMonkey
674433a51a This was SVN commit r1759. 2005-01-23 07:54:17 +00:00
6dcac374e7 Oops, forgot to add the PS_MAX_PLAYERS constant
This was SVN commit r1757.
2005-01-23 04:14:49 +00:00
bcf89936c1 Fixed a few memory leaks as well as the CPlayer/SColour crash-on-exit bug
This was SVN commit r1756.
2005-01-23 01:36:47 +00:00
113d89e148 Possible texture environment code for single-pass player-colour rendering
This was SVN commit r1754.
2005-01-22 21:25:27 +00:00
71e3b4e289 Allow clipboard pasting into input boxes (with the same hotkeys as the console - insert or ctrl+v)
This was SVN commit r1752.
2005-01-22 18:46:03 +00:00
e717aaf997 Fixed warnings
This was SVN commit r1751.
2005-01-22 18:38:58 +00:00
ae38aee3d2 Revamped CNetClient/CNetServer JS Interface and new CGameAttributes
implementation (moving towards a merger of CGameAttribs into CGame).

This was SVN commit r1746.
2005-01-19 22:32:25 +00:00
a410c2852c Updated ScEd's handling of players (though in a rather nasty way, since it doesn't actually have a CGame, and so it has no CPlayers, and so there are loads of HACK comments everywhere)
This was SVN commit r1740.
2005-01-18 12:45:56 +00:00
MarkT
9a2979edec This was SVN commit r1738. 2005-01-18 10:57:17 +00:00
MarkT
1b961ec163 This was SVN commit r1737. 2005-01-18 10:52:22 +00:00
MarkT
60afb0ee2d This was SVN commit r1736. 2005-01-18 10:49:32 +00:00
MarkT
20ce33094f This was SVN commit r1735. 2005-01-18 10:49:06 +00:00
MarkT
6b64327a19 This was SVN commit r1734. 2005-01-18 10:48:51 +00:00
MarkT
25fdbfd931 Fixes for two pathfinding bugs (neither of which were actually pathfinding bugs), added player objects (details in TM)
This was SVN commit r1733.
2005-01-18 00:46:18 +00:00
4b5aff926d Fixed compilation errors
This was SVN commit r1731.
2005-01-17 10:20:47 +00:00
2077698156 New JavaScript interface for the network client, plus some linux/gcc/misc fixes
This was SVN commit r1730.
2005-01-17 04:52:02 +00:00
1c044ac229 Primitive entity player-selection in ScEd
This was SVN commit r1727.
2005-01-16 23:09:41 +00:00
551bef482a Prevented crash when loading non-existent maps
This was SVN commit r1721.
2005-01-15 17:20:51 +00:00
38b30e5eb4 Corrected ICC errors and some warnings. Removed some unnecessarily verbose logging. Did minor things.
This was SVN commit r1718.
2005-01-13 00:17:31 +00:00
4720a00f98 Made ScEd output entities into an XML file.
Added CStrW::utf8() (used by XMLWriter).

This was SVN commit r1716.
2005-01-12 14:31:47 +00:00
fc4a34d768 Nicer XML-writing system
This was SVN commit r1711.
2005-01-11 20:15:39 +00:00
15fcf8f054 Neatened some debug messages. Changed main.cpp so ScEd can use it. Fixed minor inconsistencies and warnings.
This was SVN commit r1708.
2005-01-11 16:58:16 +00:00
16a3ee4a4b Fixed fix, to correct precedence (as warned about by the friendly compiler ;-) )
This was SVN commit r1707.
2005-01-11 16:40:01 +00:00
629e5999e0 vfs: fixed an apparently untested "quick change" to an assert that was triggering. boo!
This was SVN commit r1704.
2005-01-10 22:51:08 +00:00
a571688b1d Minor auto-builder fix
This was SVN commit r1702.
2005-01-10 22:21:56 +00:00
75c714b8df Made ScEd compile more pleasantly
This was SVN commit r1700.
2005-01-10 22:13:18 +00:00
2ad77b16db Optimised a couple of functions to save ~1.5 secs when loading ScEd
This was SVN commit r1699.
2005-01-10 22:05:38 +00:00
3ae57e7b0d Inverted my accidental inversion of logic
This was SVN commit r1697.
2005-01-10 21:07:24 +00:00
fba99c3414 vfs: fix mounting archive contents - now relative to mount point as it should.
added flags to vfs_mount that enable looking for archives and mounting
subdirectories (previously always done, but slow)
main: uses above flags when mounting

This was SVN commit r1695.
2005-01-10 18:44:41 +00:00
e632c0ff1d zip: fix overrun when reading uncompressed data: truncate to output buffer size
vfs: fix archive file add routine: wasn't starting at mount point,
didn't handle files in archive root dir correctly

tex: add tex_is_known_fmt

lib: add ERR_TIMED_OUT

This was SVN commit r1693.
2005-01-10 13:42:10 +00:00
56949e6fc4 lib: add big endian readers; add VC intrinsic bswap routines
tex: improve flip / bgr convert (now generalized "transforms"); add
support for transforming image before encoding

wsdl: add SDL_ShowCursor, minimize when tasking out

main: WriteScreenshot improved, fixes flipped screenshots

This was SVN commit r1689.
2005-01-09 14:23:59 +00:00
d56ae48aa1 Made the archive builder guess its location more correctly
This was SVN commit r1674.
2005-01-08 18:32:21 +00:00
37d2d83a9d Adjusted things to work with the new top-down orientation
This was SVN commit r1668.
2005-01-07 14:10:14 +00:00
8633123520 default orientation is now top-down to match Photoshop DDS plugin (thanks, Philip!)
This was SVN commit r1667.
2005-01-07 13:48:49 +00:00
974292c5b7 forgot to add yesterday :/
I/O plugin for libjpg that reads from memory

This was SVN commit r1661.
2005-01-07 11:13:20 +00:00
dd3a0dd657 tex:
- complete+document+fix texture orientation code
- add JPG codec
- file extension check bugfix: now case-insensitive
also some general cleanup.

This was SVN commit r1660.
2005-01-07 02:00:14 +00:00
c5de965814 wsdl:
- add SDL_WaitEvent
- fixed evil bug due to incorrect interpretation of
PIXELFORMATDESCRIPTOR.cColorBits (destabilized ATI drivers)
- remove ps/ dependency in "screenshot" key hook
- fix bug in gamma functions
- remove asm trampolines, replace with plain inline calls (efficiency <
safety)
- SDL thread calls implemented in terms of POSIX functions

This was SVN commit r1659.
2005-01-07 01:25:10 +00:00
f503a1f4e7 handle.h: include guard
vfs: path_append and exact-case handling bugfixes

wtime: added FILETIME->time_t conversion; small improvements

This was SVN commit r1658.
2005-01-07 01:16:43 +00:00
e6a12f76e2 aio: check for NULL aiocb* params; made aio_h get/set static; various small improvements
mem: explicit mem_shutdown call - try to avoid exit order problems

unifont: remove logger calls (dependency on ps/)

This was SVN commit r1657.
2005-01-07 01:13:48 +00:00
577c23d936 cursor: remove dependency on CVFSFile (all lib/res files must not depend on ps/, so that they can be reused in other projects)
wposix:
- FILETIME->time_t conversion for *stat
- improve opendir/readdir etc.; add readdir_stat_np
- add pthread_join and pthread_cancel
- add portable sem_* semaphore functions (alternative to SDL semaphores)

file: use readdir_stat_np instead of reading non-portable struct dirent
fields

This was SVN commit r1656.
2005-01-07 01:10:00 +00:00
090ea2301a wdbg: temporarily removed LOCALIZED_TEXT so this works in another project. must find long-term solution: lib/ must not be dependent on ps/!
sysdep.h: add pick_dir
sysdep/win/win.cpp: .. and its win32 implementation

This was SVN commit r1655.
2005-01-07 00:59:52 +00:00
39783e6a17 lib.h: corrected 2 casts:
- problem when using CHECK_ERR with functions returning a Handle
- incorrect sign conversion when passing non-ascii (> 0x80) chars to
FOURCC

precompiled.h: include lib/types.h

This was SVN commit r1654.
2005-01-07 00:55:53 +00:00
2077d4fd1d timer.cpp: start FPS value = 60 => faster convergence
timer.h: TIMER uses debug_out

main/input: moved game_ticks to input.cpp (only used if input.cpp is
included)

This was SVN commit r1653.
2005-01-07 00:52:05 +00:00
f7e82dbc16 add ps/Errors.h and/or lib/types.h headers (shouldn't rely on precompiled.h to pull those in).
also prepended ps/ to make location clear.

This was SVN commit r1652.
2005-01-07 00:47:44 +00:00
dbfc576458 Fixed a bug in the autobuilder that occurs when tools (such as the autobuilder) are updated.
This was SVN commit r1642.
2005-01-05 19:46:31 +00:00
ff34bf40b1 Automated build system code (mainly for backup purposes - it won't work on anyone else's machine without a few bits of reconfiguration)
This was SVN commit r1641.
2005-01-05 19:38:45 +00:00
618c6cbbe7 Avoid flickering when zooming at near-zero speeds
This was SVN commit r1639.
2005-01-04 22:16:03 +00:00
bb8e24ec60 Corrected spelling
This was SVN commit r1637.
2005-01-04 22:07:17 +00:00
0de796c5ea Send Load event to GUI objects after (instead of while) loading the rest of the engine
This was SVN commit r1635.
2005-01-04 21:51:23 +00:00
a61a961edd Don't display blank tooltips
This was SVN commit r1634.
2005-01-04 21:37:51 +00:00
31f0e62c83 Changed the add_color GUI sprite effect to use alpha=0 by default
This was SVN commit r1625.
2005-01-03 22:23:27 +00:00
0a99e2a189 Another extremely important whitespace fix
This was SVN commit r1624.
2005-01-03 20:40:32 +00:00
cff12c4127 Extremely important whitespace fix
This was SVN commit r1623.
2005-01-03 20:34:38 +00:00
a84351441e Fixed invalid GL commands (as complained about by 82845G drivers)
This was SVN commit r1612.
2005-01-02 00:26:48 +00:00
f791239396 Fix for strange machine with no audio
This was SVN commit r1611.
2005-01-02 00:05:33 +00:00
43271f7618 Ctrl+home, ctrl+end go to top/bottom of console
This was SVN commit r1609.
2005-01-01 18:12:23 +00:00
15bb170328 SessionStart event sent to GUI objects upon starting a game
This was SVN commit r1608.
2005-01-01 17:30:55 +00:00
fcd1adcea3 Removed my earlier 'fix' (related to a bug when adding new files to a directory that was previously archived) which was completely rubbish, and replaced it with one that is hopefully less stupid (and actually fixes the problem)
This was SVN commit r1605.
2005-01-01 13:43:43 +00:00
f9c51d8ec7 Replaced - with _ in GUI
This was SVN commit r1604.
2005-01-01 12:06:17 +00:00
1c2acfed8c CInput textcolor
This was SVN commit r1602.
2004-12-31 12:20:22 +00:00
855e1a7f81 Small ScEd updates
This was SVN commit r1601.
2004-12-30 23:01:09 +00:00
e533f5c7fc Executable version of archive-builder
This was SVN commit r1600.
2004-12-30 18:08:09 +00:00
170c511c58 Mostly complete archive-builder
This was SVN commit r1599.
2004-12-30 17:42:22 +00:00
7efc7a7903 Fixed memory leak
This was SVN commit r1598.
2004-12-30 17:27:53 +00:00
ed55ad4d82 Put crashlog into ScEd.
This was SVN commit r1590.
2004-12-28 20:53:54 +00:00
94f89e130b Let ScEd open maps with non-VFS filenames. Probably stopped leaking memory.
This was SVN commit r1588.
2004-12-28 16:17:17 +00:00
9e2413acab Allowed \\ in tooltip text. Fixed tooltips.
This was SVN commit r1587.
2004-12-28 13:13:27 +00:00
aab60e9ab8 Unbroke text-alignment buffer-zones. Allowed \n in tooltip text.
This was SVN commit r1585.
2004-12-28 12:38:45 +00:00
156ff7cf56 Minimal text-alignment ability in Text GUI objects
This was SVN commit r1584.
2004-12-28 12:17:04 +00:00
f4fe8c8543 Sky colour, plus skycolor config value
This was SVN commit r1583.
2004-12-28 11:16:05 +00:00
05c4ec0365 Alterations to ScEd, so that it almost works (except for saving/loading maps). Change the bottom of premake.lua if you want to build it.
This was SVN commit r1580.
2004-12-27 23:27:26 +00:00
bfd7d10383 Incomplete (but hopefully working) archive builder. And some festive snow: * * *
This was SVN commit r1579.
2004-12-25 15:38:05 +00:00
7e004f07d3 Report zero-sized images as errors.
This was SVN commit r1566.
2004-12-23 23:14:47 +00:00
d2855c4f9c Fixed GC crash.
This was SVN commit r1565.
2004-12-23 22:24:09 +00:00
0382cdd9b1 More tooltip updates. Made the main menu buttons and the in-game resource counters use them.
Fixed space/tab inconsistencies in (though not between) GUI XML files.

This was SVN commit r1554.
2004-12-23 13:56:34 +00:00
28c7a682b8 Fixed annoying crash when SpiderMonkey's GC ran.
Minor tooltip updates.

This was SVN commit r1542.
2004-12-21 18:41:58 +00:00
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
91d39f9a29 Allowed colour strings in XML files to contain negative values.
Updated GUI sprite effects to allow subtraction with add-color, and to
increase multiply-color's upper limit to allow 4x brightness.

This was SVN commit r1538.
2004-12-19 20:09:23 +00:00
4560c79667 'stretched:' sprites
This was SVN commit r1537.
2004-12-19 14:44:55 +00:00
849f50a500 Grayscale effects for GUI sprites
This was SVN commit r1536.
2004-12-19 12:20:04 +00:00
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +00:00
c9d89e964b Moved g_Gui.TickObjects to the main render loop and update the scheduler when no game is running
This was SVN commit r1531.
2004-12-18 23:25:58 +00:00
bb2de67c31 fixed incorrect handling of extra fields
(zip archives with extended file attributes failed to load)

improved z_extract_cdfh/z_enum_files.

This was SVN commit r1527.
2004-12-18 14:45:04 +00:00
b291fafadb Replace '_' with '-' when passing names through the GUI JS interface (so that object.cell_id is equivalent to object["cell-id"])
This was SVN commit r1526.
2004-12-18 14:24:50 +00:00
ba0ebd6644 Renamed icon-size/icon-id to cell-size/cell-id, and allowed cell-id to be used in <icon>s.
Added <effect>s to sprites/images - currently multiply-color and
add-color, though they're far from perfect.

This was SVN commit r1525.
2004-12-18 13:32:00 +00:00
5bb24a387f fix dir_cancel_watch issue: fail silently if watch=0 (happens if directory mounted only from archive, i.e. there's no real directory to watch)
This was SVN commit r1524.
2004-12-18 03:45:12 +00:00
8a1c3c550e Fixed bug which made XMBs' filenames contain 00000000 for the size, when built with VC2005. (Nasty confusing 64-bit variables...)
Also made it insensitive to rounded-down-to-nearest-2-seconds timestamps
in zip files.

This was SVN commit r1521.
2004-12-17 19:47:21 +00:00
6526301cfe GUI icon-sheets
This was SVN commit r1519.
2004-12-17 16:20:08 +00:00
8f4f8e240f Fixed things that use a colour rather than a texture (e.g. the progress bars). Also fixed the completely broken 'caching' system that recalculated everything every single frame. Also made it give linker errors if I ever make that mistake again.
This was SVN commit r1518.
2004-12-17 00:05:37 +00:00
d8ae8a524c Fixed something that looked like a potential bug
This was SVN commit r1515.
2004-12-16 15:15:24 +00:00
465ceff912 More leak fixes
This was SVN commit r1514.
2004-12-16 12:41:54 +00:00
b534e640ca Resource leak fixes
This was SVN commit r1513.
2004-12-16 12:01:47 +00:00
MarkT
da4c42ef58 Fix for misinterpretation of data types in XML
This was SVN commit r1512.
2004-12-16 09:41:41 +00:00
851a30215f add h_add_ref; add leak report (currently disabled, since all textures are leaked)
This was SVN commit r1511.
2004-12-16 01:17:50 +00:00
855c00f6b8 Slightly tidied some small things
This was SVN commit r1510.
2004-12-16 00:47:12 +00:00
c19f3608a5 Initial changes to GUI sprite code. (There shouldn't be any visible effects - if there are, they're bugs)
This was SVN commit r1507.
2004-12-15 21:24:46 +00:00
11f3b3c575 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 r1505.
2004-12-15 14:26:21 +00:00
6539cfc935 Playlist now uses VFS.
This was SVN commit r1504.
2004-12-15 14:25:09 +00:00
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