1
0
forked from 0ad/0ad
Commit Graph

559 Commits

Author SHA1 Message Date
1a7d67a97f dyn_array: efficient expandable array that doesn't waste mem or relocate itself. TODO: self test and dox
file: expose block size constant; always round user transfers up
tex: transform() now receives what to change, not what to achieve.
tex*: encoding works with DynArray+VFS backend
GameSetup: free g_BuildingPlacer to avoid mem leak.
fixed some warnings+bugs.

This was SVN commit r2679.
2005-09-06 22:44:48 +00:00
9dc8a71b15 Added health properties to BaseEntity so they work properly for Entity as well (on units that don't directly specify them).
This was SVN commit r2677.
2005-09-06 19:30:41 +00:00
6f10e8c09c Updated building placement cursor to make the object glow read and not be placeable if trying to place in an invalid area.
Also a small fix: made the selection bandbox not appear when the view is
being rotated using left+right drag (it doesn't make sense to show it
then).

This was SVN commit r2674.
2005-09-06 08:25:41 +00:00
11de356225 Improved building placer to show the actor that will be placed instead of the original white lines.
This was SVN commit r2671.
2005-09-05 23:44:21 +00:00
65e90614f2 Added hitpoint bars above selected and mouseovered units.
This was SVN commit r2669.
2005-09-05 21:45:26 +00:00
1af9aa074e Added initial version of building placement cursor, which can be shown with the startPlacing(templateName) JS function.
Also activated depth test for selection outlines so they don't overlap
units.

This was SVN commit r2667.
2005-09-05 19:48:28 +00:00
50ea8c532c - PathPackage now does CHECK_ERR. adjusted callers appropriately
- mem.h: export mem_assign (needed to wrap a mem buffer)
- use stricmp in some file extension comparisons
- wposix: properly sets last-error code when opendir fails
- also: misc comments

This was SVN commit r2650.
2005-09-02 03:03:06 +00:00
21709a5a7a (as before, belonged in the previous batches)
This was SVN commit r2649.
2005-09-02 02:58:40 +00:00
ed5041a301 some infrastructure for self-tests: gets rid of boilerplate code.
squelch debug asserts during self-tests to avoid warning about intended
errors (passing invalid data into functions to test their error
reporting)

This was SVN commit r2646.
2005-09-02 02:47:25 +00:00
5d62c3f3f7 Atlas: Simple undo system
This was SVN commit r2627.
2005-08-20 15:44:50 +00:00
a10082d69b Minor fixes
This was SVN commit r2625.
2005-08-16 19:51:18 +00:00
b4ad393ee4 moved ps/X* to ps/XML/
premake: reflect 2 added and 1 removed source dir
add ps/Util - some helpful functions that were previously in main.cpp

This was SVN commit r2624.
2005-08-14 23:50:37 +00:00
70b44f6485 moved self-tests into their respective files (this makes checking if a file has one easier) and automatically calls them if #if PERFORM_SELF_TEST == 1 (allows global enable/disable of all tests and also per-file override).
This was SVN commit r2623.
2005-08-14 23:36:43 +00:00
dc027002c0 host of changes to accommodate Atlas:
- input.cpp allows feeding in events from the outside (will be used by
main.cpp and Atlas msg loop)
- most of main.cpp split into ps/GameSetup.*
- main.cpp is now a "controller" that drives the game via SDL events
(Atlas is another such controller that can override main.cpp). it calls
GameSetup functions to set up and processes messages.
- add functions to import AtlasUI.dll automatically

also, the usual refactoring ;)

This was SVN commit r2622.
2005-08-14 23:34:37 +00:00
4aa740bff5 - split up lib/res into file, graphics and sound.
- wposix.cpp: initial support for MEM_RESERVE and MEM_COMMIT semantics
in mmap
- cstr: removed no longer necessary serialization header
- xmlutils: wrap new() calls in nommgr/mmgr; allows tracking other
allocs in this file.
- add u64_from_u32
- various minor comments/improvements.

This was SVN commit r2604.
2005-08-12 17:06:53 +00:00
b63bc42245 TextureManager: stopped memory leaks
wsdl: create window at expected size, and retrieve correct mouse coords
CStr: not ISerializable (=> not virtual)
Game: less excessive complaining, since the original problem seems to be
fixed
Entity: fixed evaluation order
Others: minor comments/etc

This was SVN commit r2591.
2005-08-09 21:26:40 +00:00
52ebd6ba11 scripting-interface improvements
- strict param count checks
- use ScriptingHost::RunMemScript instead of copy+pasted code
- replace duplicated parameter access code with macros

StringBuffer: use pointer instead of reference to allow
compiler-generated copy ctor
singleton: fix whitespace

This was SVN commit r2586.
2005-08-09 16:02:15 +00:00
a69ac0dee9 - fix w4 warnings
- add convenience macros for config_db(CFG_GET_SYS_VAL)
- VFSUtil::EnumDirEnts now uses flags instead of bool recursive
- UNUSED() for params, UNUSED2 (<- need better name) for variables
- config.h defines must be tested with #if (always defined) -> allows
detecting misspellings thanks to compiler warnings
- replace debug_assert(0) with debug_warn (its sole purpose)
- replace ScriptingHost::ValueToInt et al with ToPrimitive
- use nommgr.h to disable both mmgr and VC debug heap

This was SVN commit r2585.
2005-08-09 15:55:44 +00:00
b3a9ed2886 New terrain properties stuff, gcc compatability and updated unix debugging stuff
This was SVN commit r2581.
2005-08-07 21:58:36 +00:00
a04abf2967 Fail more quietly while loading
This was SVN commit r2565.
2005-07-30 20:12:41 +00:00
c3d42c1025 Fixed mmap bug, and GUI memory leak.
This was SVN commit r2560.
2005-07-28 17:39:27 +00:00
524263577f Updated Errors.cpp
This was SVN commit r2516.
2005-07-22 19:21:19 +00:00
f715e6c226 ScriptableComplex.h: ScriptingHost already includes SpiderMonkey.h
scriptglue: additional refactoring
scriptinghost: remove useless GC function
SpiderMonkey.h: more dox

This was SVN commit r2497.
2005-07-20 04:53:58 +00:00
549150fe38 Atlas: simple camera control and terrain editing.
Terrain: added terrain-editing code to CTerrain, for better
encapsulation or something.
Console: simplified screen resizing.
Game/etc: removed some unnecessary header file inclusions.

This was SVN commit r2459.
2005-07-03 16:25:48 +00:00
2ea40a23a3 VS2005 compatibility fixes and warning adjustments:
Updated DLLs.
Added DirectX headers/libraries, since they're not in the platform SDK.
Fixed invalid STL iterator usage.
Disabled STL in stack trace, since it breaks.
Added comments for some reported warnings.
Corrected some apparent off-by-one errors.
Defined strlen_s to strnlen.
Probably broke pre-beta2 versions of VC2005.

This was SVN commit r2454.
2005-07-02 21:42:55 +00:00
f3b5e08030 CStr: VC2005 fix - mustn't dereference end()
snd: Only open device once

This was SVN commit r2452.
2005-07-01 22:53:03 +00:00
ec6b78b252 rename assert2 debug_assert; use instead of all plain assert(), since there are no longer any issues (e.g. can't use while handling an exception)
This was SVN commit r2447.
2005-06-28 04:06:25 +00:00
cf37e9cbe6 Atlas: Added a button. Reorganised game<->UI communication system.
main.cpp: Allowed correct operation when not calling Init/Shutdown.
Game.cpp: Stopped complaint when starting game with no GUI.

This was SVN commit r2446.
2005-06-27 23:04:34 +00:00
064dd5699d - read() and write() are now implemented as functions (avoids having to #undef them)
- HAVE_DEBUGALLOC renamed to HAVE_VC_DEBUG_ALLOC

This was SVN commit r2426.
2005-06-22 03:14:35 +00:00
f3951fbfae all JS-dependent code now includes scripting/SpiderMonkey.h instead of <js*.h> directly - see rationale in that header.
singleton: removed unnecessary headers

This was SVN commit r2425.
2005-06-22 02:23:46 +00:00
d4617cbd3e Minor warning-fixes and miscellaneous tidiness
This was SVN commit r2416.
2005-06-20 22:04:08 +00:00
7577d224a6 Terrain XML loading, plus mouse/JS portability and some misc stuff to mix it up
This was SVN commit r2412.
2005-06-20 15:14:36 +00:00
92d221f183 Interact.cpp: Use double instead of float for storing absolute times (since the precision is required).
Atlas: Nicer handling of menus.

This was SVN commit r2400.
2005-06-17 23:14:06 +00:00
471fd5d6f3 Unbroke more; plus some minor changes.
This was SVN commit r2398.
2005-06-17 01:28:35 +00:00
40b26227d7 singleton.h: use assert2 (avoid trouble in wdbg code)
lib.h: reorder error codes (more clear) and add a few

detect.cpp, gfx.h: move gfx_mem (amount of video memory) here from ogl

This was SVN commit r2391.
2005-06-16 21:46:33 +00:00
dd3c8f6fb5 Use the standard Singleton for CLogger, to fix problems with unordered shutdown
This was SVN commit r2383.
2005-06-13 19:31:48 +00:00
b657a1cbca Added CStr and some other things to precompiled.h, to reduce build times.
Altered CStr/UniDoubler's macros, to avoid polluting/conflicting/etc.
Fixed headers in non-PCH builds.
Used the _d version of vorbisfile*.lib in Debug builds.

This was SVN commit r2366.
2005-06-01 20:12:45 +00:00
982e051c54 Changed PSERROR to inherit from std::exception
This was SVN commit r2344.
2005-05-24 00:00:40 +00:00
aa027d20ec Fixed ScEd again - renamed the network system's CCommand to CNetCommand, since ScEd used that name first :-P
This was SVN commit r2337.
2005-05-23 02:39:07 +00:00
21149d9fd0 Renamed translate() to I18n::translate(), to minimise conflicts
This was SVN commit r2334.
2005-05-22 22:58:27 +00:00
0331883a86 Temporary fix for mouse input. Improved performance in player-colour model renderer. Also improved performance in lighting, at least in unoptimised builds.
This was SVN commit r2328.
2005-05-20 17:09:47 +00:00
f1e9bf6227 Fixed warnings
This was SVN commit r2319.
2005-05-18 21:19:56 +00:00
d0f7cb015c - Linux/GCC (as usual :P)
- Ported lockless code to gcc inline assembly
- A few new net messages (gather, attack, add waypoint)
- Support for new messages in network->entity order converter
- Implemented rudimentary JS interface for Interaction
- issueCommand JS API, connected to the network
- Removed Interaction stuff now replaced by JS
- And something in there should probably break VS builds :P

This was SVN commit r2316.
2005-05-18 05:32:09 +00:00
fd4eb91e93 debug_out -> debug_printf; MICROLOG moved to ps/Pyrogenesis.h
This was SVN commit r2285.
2005-05-11 18:56:30 +00:00
1ff0d112d2 revise loader return values - nicer interface now.
This was SVN commit r2281.
2005-05-11 04:39:21 +00:00
ab980c1a31 Updated map format, to store lighting information in XML. Also, vital whitespace consistency improvements.
This was SVN commit r2276.
2005-05-11 03:07:08 +00:00
bc5122fa08 UTF-8->CStrW conversion; used in saved console history.
This was SVN commit r2272.
2005-05-10 18:15:03 +00:00
MarkT
86dc351205 Projectile code and updates to some actors that can use it (celt_ijv and hele_iar)
This was SVN commit r2266.
2005-05-10 07:13:25 +00:00
229a6b7a16 Loader: reword comment
EntityHandles.cpp: 4096 -> MAX_HANDLES

This was SVN commit r2259.
2005-05-09 04:37:36 +00:00
01588f267f Corrected garbage collection problem
This was SVN commit r2255.
2005-05-09 03:26:04 +00:00
f8f94e02aa add high-level dox and updated some comments
This was SVN commit r2249.
2005-05-06 20:02:00 +00:00
daddeed4bb fix really stupid bug in ReadFileLines - was always setting first array element
This was SVN commit r2246.
2005-05-05 16:41:16 +00:00
1bcf156680 added macro that takes care of boilerplate "check for timeout and return progress" code.
This was SVN commit r2242.
2005-05-04 23:10:11 +00:00
05a2ec78d3 add default ctors for XMBElement and XMBElementList (required by ReadXML closure)
This was SVN commit r2234.
2005-05-03 21:39:51 +00:00
22ee082694 - more accurate progress calculation (avoids accumulating errors)
- revised time accounting allows updates during a task that's
interrupted
- cleaned up LDR_NonprogressiveLoad

This was SVN commit r2233.
2005-05-03 21:39:03 +00:00
1f1642bfe3 revise thunks to not free their MemFun_t if the registered function times out
This was SVN commit r2232.
2005-05-03 21:37:49 +00:00
f0e311440e all functions called via delay-load mechanism now return int (allows closures that can interrupt themselves when time is up)
This was SVN commit r2231.
2005-05-03 21:36:57 +00:00
f34cd1ee08 more revisions to comments to match dox
This was SVN commit r2229.
2005-05-03 16:57:56 +00:00
b8cb80898f split common error handling code into macro.
documented each function (contents from wiki)

This was SVN commit r2228.
2005-05-03 16:41:09 +00:00
c79a71ec4d This was SVN commit r2225. 2005-05-03 05:16:10 +00:00
ee9757b79b - add usage comment for each function
- remove unnecessary vfs_exists
- improve error handling
- <path> is already dir+name

This was SVN commit r2224.
2005-05-03 05:15:18 +00:00
03a3fd6091 update EnumDirEnts docs. disambiguate <path> parameter - it's dir+name
This was SVN commit r2220.
2005-05-03 05:03:27 +00:00
MarkT
c8cd52578a Put the extra animation event in the struct def, also adding Jan's VFS script wrapper.
This was SVN commit r2218.
2005-05-03 04:27:07 +00:00
87f4cc2592 This was SVN commit r2212. 2005-05-02 19:47:06 +00:00
MarkT
db168702df Jason's animation events. Also reworked entity-types system.
This was SVN commit r2209.
2005-05-01 19:09:13 +00:00
dc210f9f0e playercolor adjustments
This was SVN commit r2205.
2005-05-01 11:51:07 +00:00
64c7bbd91d Player color tweaks
This was SVN commit r2202.
2005-05-01 00:05:34 +00:00
889b81433a [Subtle hint to the autobuilder that it might want to upload the newest version...]
This was SVN commit r2192.
2005-04-29 04:46:14 +00:00
7327e942d6 replaced Ykkrosh clone with "Clausewitz". exercise for the reader: who's that? >:-)
This was SVN commit r2176.
2005-04-26 20:49:08 +00:00
MarkT
bcabe3aa53 Script integration work - valueOf() is no longer required most of the time; also property-change watches and enumeration over entities (but not yet other native objects), rudimentary beginnings of a global events system, and adjusted the status orb to update only on changes.
This was SVN commit r2157.
2005-04-22 07:12:55 +00:00
MarkT
2120576bc7 Gathering and unit training (engine-side); also other minor improvements
This was SVN commit r2132.
2005-04-15 04:23:33 +00:00
d2948937a0 Fixed prop player-colouring. Allowed per-object colours. (Coming soon: data to demonstrate it.)
This was SVN commit r2113.
2005-04-07 04:29:07 +00:00
6a0b5fa0ab ScEd: Added unit deletion. Made zoom less frustrating. Let >2 players work.
Fixed random actor props.

This was SVN commit r2109.
2005-04-03 05:02:00 +00:00
5e742f5615 Setup all the sample players in SP games [bug #52]
This was SVN commit r2099.
2005-03-31 05:14:17 +00:00
0eb78450c0 Maybe fixed GUI event-handler function things. Other minor changes and fixes.
This was SVN commit r2096.
2005-03-30 22:33:10 +00:00
MarkT
701fd17595 Sorry, SVN doesn't seem to be picking up modifications today.
This was SVN commit r2093.
2005-03-30 18:32:16 +00:00
MarkT
bb7a22f32a First draft of a GPG3-style profiler (including tracing into scripts, after a fashion)
This was SVN commit r2090.
2005-03-30 16:14:19 +00:00
8b12c84df7 ScEd: allowed creation of non-entity objects, pending total entitisation
This was SVN commit r2085.
2005-03-30 05:43:22 +00:00
22dd4dd67b Entities: Removed Tag attribute; it is taken from the filename instead. Made entity XML files be loaded on demand. Probably stopped crash when maps contain non-existent entities. Fixed a few bugs in entity definitions.
Maps: Stored non-entity objects in XML instead of PMP, for easier manual
editing. Updated existing maps to newest format, so that they can still
work. Added undocumented _rewriteMaps() JS function. Also renamed _mem
to vmem, and reclassified its undocumentedness as unintentional, since
it's reasonably useful.
Loader: added NonprogressiveLoad function, for ScEd/_rewriteMaps/etc
which don't care about progressiveness.
main.cpp: re-enabled vfs_display, since it doesn't crash now
Vector3D: stopped warning

This was SVN commit r2078.
2005-03-29 20:50:04 +00:00
MarkT
3c99f0f2eb Minor JavaScript updates
This was SVN commit r2073.
2005-03-28 22:13:47 +00:00
2fa430a4e6 - fix bug (wasn't setting mount_point of dir being mounted => crash while writing screenshot)
- add check for changing filters while enumerating dirents
- add path_component_valid
- change iterator to only return valid entries (removing that burden
from user code)

This was SVN commit r2067.
2005-03-27 17:27:49 +00:00
a1981970e5 new EnumDirEnts call; replaces previous implementation in BaseEntityCollection.cpp that didn't handle subdirectories
This was SVN commit r2057.
2005-03-27 01:44:41 +00:00
ba636ca96c wposix: fix for USE_MMGR: undef getcwd
singleton: switch to assert2
loader: simpler HaveTimeForNextTask check

This was SVN commit r2056.
2005-03-27 01:37:10 +00:00
020645d583 Hacked up ScEd a bit, to disable its actor editor and to let users place entities (rather than actors) on the map.
This was SVN commit r2039.
2005-03-22 23:31:30 +00:00
f19d8dafee improved update frequency and accuracy of progress bar (by splitting up more init functions).
also add thunk mechanism to ease binding to member functions;
finally, added instrumentation to measure how long functions really take

This was SVN commit r2038.
2005-03-22 21:00:56 +00:00
5b11dbb6b0 Corrected string conversion slightly
This was SVN commit r2034.
2005-03-22 12:09:11 +00:00
6d792365aa rough but functional loading progress bar support.
numerous TODOs remaining - initial update instead of only after
completing first job; fix GUI overdraw issue; decrease granularity
(currently only 3 updates)

This was SVN commit r2033.
2005-03-22 02:17:55 +00:00
5e3b0f06ec documented and revised after review by philip (thanks!) - progress is now calculated from estimated duration; next instead of current description is returned
This was SVN commit r2032.
2005-03-21 13:33:21 +00:00
77d3c5d0b5 initial loader implementation - provides a queue that is worked off from the main loop; a timeout ensures responsiveness.
this is the framework that will allow progress bar updates.

This was SVN commit r2027.
2005-03-20 14:32:43 +00:00
219509f00f Fixed another missing posix.h. Documented a little bit of main.cpp.
This was SVN commit r2016.
2005-03-18 23:04:29 +00:00
468657479c philip points out precompiled.h -> string_s.h includes posix.h - too heavy for the PCH
replaced that with posix_types.h, which now defines size_t.
this change exposed a lot of code that relied on posix.h being included
implicitly; fixed those as well.

This was SVN commit r2015.
2005-03-18 22:44:55 +00:00
475dfb2c78 Partial support for new actor format. Partialer support for missing actors without crashing.
This was SVN commit r2014.
2005-03-18 22:30:23 +00:00
308535d58d add instrumentation to see what's slow when starting a session
renderer: also move list of alpha maps here from InitResources

This was SVN commit r2007.
2005-03-18 22:02:20 +00:00
af0800fbdd uses 32 bit hash instead of 64 - faster (clears up long standing TODO)
This was SVN commit r2006.
2005-03-18 21:57:07 +00:00
2b33ba8ade security push: checked every strcpy / strncpy. converted most to strcpy_s; some are flagged as "safe" (e.g. if copying literal that's obviously OK)
This was SVN commit r1962.
2005-03-01 20:13:00 +00:00
da5816e971 Re-enabled VC's memory debugging by default (when not using USE_MMGR). Hopefully fixed the resulting memory leaks. Also fixed incompatibilities with VC2005.
This was SVN commit r1950.
2005-02-27 22:11:26 +00:00
e6c8cef293 types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
2005-02-26 15:13:15 +00:00
85a95e3e41 Fixed warnings. Made invalid-player-ID complaint less annoying.
This was SVN commit r1930.
2005-02-21 19:49:20 +00:00
7bcc12373b - Created JSMap
- Changed player colour JS interface: setColour(...) instead of a colour
property
- Introduced a network log and replaced most network LOG() calls with
NET_LOG()
- Moved to a slot-based system for Pre-Game and extended a lot of the JS
APIs to networking stuff
- A bit of cleanup in the low-level network code (Unix parts)
- Clients now keep track of all other connected clients on the server
(And exposes this info to JS)
- Split out GameAttributes to its own file
- Removed unused class AttributeMap
- Changed CJSObject to use T* pointers in JS_SetPrivate (needed to make
ToScript work with multiple inheritance)

This was SVN commit r1929.
2005-02-21 17:13:31 +00:00
3776f91aeb Stopped crash when restarting a game
This was SVN commit r1926.
2005-02-20 23:55:07 +00:00
03a6b6e804 Stopped ScEd crashing when loading maps. Avoided crashes from invalid animations. Moved game-specific code out of XMLWriter.
This was SVN commit r1920.
2005-02-11 12:57:19 +00:00
880634b598 Small changes to ScEd, to remove some hacky bits and to make it not crash with player-colours
This was SVN commit r1899.
2005-02-04 23:16:42 +00:00
5d9fe41fec NetServer onChat event and NetClient onDisconnect event added
This was SVN commit r1894.
2005-02-02 16:57:15 +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
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
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
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
NoMonkey
12bbe9cda1 This was SVN commit r1808. 2005-01-25 00:25:13 +00:00
NoMonkey
b2e50cfea9 This was SVN commit r1805. 2005-01-24 08:28:03 +00:00
NoMonkey
02cc4d9c8e This was SVN commit r1793. 2005-01-23 22:21:37 +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
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
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
e8121ca394 Also allow access to the last player ;-)
This was SVN commit r1765.
2005-01-23 12:54:14 +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
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
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
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
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
0a99e2a189 Another extremely important whitespace fix
This was SVN commit r1624.
2005-01-03 20:40:32 +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
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
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
d2855c4f9c Fixed GC crash.
This was SVN commit r1565.
2004-12-23 22:24:09 +00:00
659a9ea57a Initial (incomplete) tooltip code
This was SVN commit r1540.
2004-12-21 13:37:24 +00:00
46f5c61179 Linux/GCC/glibc Compat
This was SVN commit r1532.
2004-12-18 23:30:28 +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
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
855c00f6b8 Slightly tidied some small things
This was SVN commit r1510.
2004-12-16 00:47:12 +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
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
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
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
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
e2062ccee1 Faster parsing
This was SVN commit r1477.
2004-12-08 18:15:39 +00:00
2248b615ea NOP
This was SVN commit r1473.
2004-12-07 22:14:23 +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
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
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
fe54b3deeb Fixed minor warnings
This was SVN commit r1406.
2004-11-27 03:22:04 +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
7bf6d11d8c "*.<ext>" filter as per new vfs_next_dirent
This was SVN commit r1392.
2004-11-23 23:52:52 +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
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
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
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
fb09faf5be Parser bug-fix
This was SVN commit r1313.
2004-11-14 18:56:13 +00:00
64646cfbbf Some more verbose error reporting
This was SVN commit r1307.
2004-11-12 22:11:04 +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
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
5e42dad394 CStr alterations
This was SVN commit r1282.
2004-10-31 20:29:09 +00:00
MarkT
d33d2e4450 Added some support for user profiles
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
Gee
cdf7334d34 Added GetHeight()
This was SVN commit r1236.
2004-10-14 10:10:43 +00:00
442c6f315f Added 'const' to appropriate bits of Xeromyces
This was SVN commit r1226.
2004-10-07 20:49:35 +00:00
MarkT
6f10c954de Missing JSCollection*. Oops.
This was SVN commit r1224.
2004-10-07 20:09:11 +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
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
7c157c5f90 Avoided minor for-scoping complaints
This was SVN commit r1187.
2004-09-22 11:51:43 +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
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
dbee9e74fd Fixed lack of termination when log messages exceed 512 chars
This was SVN commit r1148.
2004-09-17 23:13:38 +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
Gee
6e07632775 Changed a function that the GUI uses to Unicode.
This was SVN commit r1127.
2004-09-06 02:24:34 +00:00
3a3a5b6c34 Added getFPS(), so the GUI can draw the FPS counter. Also added getLanguageID(), so it knows what language it's using
This was SVN commit r1122.
2004-09-05 11:28:59 +00:00
4da6db92d2 Fixed typo in complex mathematical equation (center = "top+bottom/2.f")
This was SVN commit r1117.
2004-09-04 18:30:12 +00:00
3ef7b1b67b Corrected JS_AddRoot usage (it wants a JSObject**/JSString**/jsval*/etc)
This was SVN commit r1116.
2004-09-04 14:43:23 +00:00
03ae01c44a Replaced all CStr16 with CStrW, because its name was too confusing
This was SVN commit r1109.
2004-09-03 14:08:12 +00:00