a04abf2967
Fail more quietly while loading
...
This was SVN commit r2565.
2005-07-30 20:12:41 +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
e84b8bd017
Fixed regression caused by not understanding my code
...
This was SVN commit r2457.
2005-07-03 01:37:49 +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
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
d4617cbd3e
Minor warning-fixes and miscellaneous tidiness
...
This was SVN commit r2416.
2005-06-20 22:04:08 +00:00
32772dbf71
So, ScEd updated to comply with terrain XML's (and it seems to work fine too!)
...
This was SVN commit r2414.
2005-06-20 17:34:17 +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
e583af307f
Updated autobuilder to update ps.pdb.
...
Animation files with filename="" are now ignored.
This was SVN commit r2368.
2005-06-02 18:04:20 +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
MarkT
d6c4bf3302
Changes to actor speed specifications.
...
This was SVN commit r2350.
2005-05-27 00:38:30 +00:00
26b1cf5556
Random animations.
...
This was SVN commit r2330.
2005-05-21 01:40:32 +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
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
7054957514
Minimap: Corrected orientation. Also cleaned up a bit, and fixed some inefficiencies.
...
Camera: Corrected code that wasn't doing what it looked like it was
doing, and was crashing JS "new Camera".
This was SVN commit r2302.
2005-05-13 01:15:53 +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
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
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
bcc4aea8dc
Maybe fixed nasty memory corruption bug.
...
This was SVN commit r2254.
2005-05-09 02:29:33 +00:00
0a5461db73
Recompiled ScEd.
...
This was SVN commit r2252.
2005-05-07 00:17:05 +00:00
410c73cb46
made UnpackMap interruptible (since it takes up to 1900 ms).
...
root cause is slow automatic mipmap gen; philip is working on DDS mipmap
loader that allows them to be baked in.
This was SVN commit r2243.
2005-05-04 23:12:46 +00:00
462321f425
More efficient actor-loading. Less fatal response to errors.
...
This was SVN commit r2239.
2005-05-04 21:12:57 +00:00
e2791463a1
heavily revised.
...
ReadXML is now a closure that interrupts itself periodically (so
progress is updated). also split that monster into several sub-functions
and gave better variable names
This was SVN commit r2235.
2005-05-03 21:42:09 +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
MarkT
f50b7c6776
Props no longer play walk anims when their parent is idle.
...
This was SVN commit r2219.
2005-05-03 04:48:12 +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
MarkT
db168702df
Jason's animation events. Also reworked entity-types system.
...
This was SVN commit r2209.
2005-05-01 19:09:13 +00:00
780b6e266b
Changed actor colour syntax. Made the Actor Editor edit colours.
...
This was SVN commit r2189.
2005-04-28 20:44:22 +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
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
2073733761
Fixed support for extra-new actor format. Updated binaries.
...
This was SVN commit r2050.
2005-03-26 00:22:42 +00:00
c11465cfbf
Updated actor references to use filenames instead of names, to allow more efficient loading. Added backward-compatible file support to the Actor Editor.
...
This was SVN commit r2049.
2005-03-25 23:04:36 +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
5460b8982e
Various small fixes and minimal improvements
...
This was SVN commit r2035.
2005-03-22 13:54:37 +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
afcf7453a3
Random actors, now with fewer missing files
...
This was SVN commit r2022.
2005-03-19 19:10:52 +00:00
9e8d3d6518
Mostly complete support for random actors
...
This was SVN commit r2021.
2005-03-22 17:09:36 +00:00
79da4bf050
On-demand loading of actors (sort of)
...
This was SVN commit r2017.
2005-03-19 11:55:27 +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
e6c8cef293
types.h => lib/types.h (avoid name collision)
...
This was SVN commit r1935.
2005-02-26 15:13:15 +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
3b1395d80b
Optimised game-loading, by not reading terrain textures or calculating bounding boxes when not necessary; maps load about twenty seconds faster (at least in Debug mode). Also fixed possible minor bug (FLT_MIN vs -FLT_MAX) and other trivial things.
...
This was SVN commit r1917.
2005-02-09 23:19:48 +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
NoMonkey
704907db97
Player colors now recognize gaia as player 0 and allow for 8 regular player colors.
...
This was SVN commit r1865.
2005-01-29 18:20:16 +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
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
d29833e4ed
mouse_x/y => g_mouse_x/y
...
This was SVN commit r1767.
2005-01-23 17:35:36 +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
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
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
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
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
618c6cbbe7
Avoid flickering when zooming at near-zero speeds
...
This was SVN commit r1639.
2005-01-04 22:16:03 +00:00
855e1a7f81
Small ScEd updates
...
This was SVN commit r1601.
2004-12-30 23:01:09 +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
46f5c61179
Linux/GCC/glibc Compat
...
This was SVN commit r1532.
2004-12-18 23:30:28 +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
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
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
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
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
4d83cba7e6
add required precompiled header include
...
This was SVN commit r1431.
2004-12-01 06:52:39 +00:00
30ad195c0b
Linux/GCC Compat
...
This was SVN commit r1393.
2004-11-23 23:56:10 +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
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
f257c67967
Updated to fix compile errors caued by missing CVertexProgram
...
This was SVN commit r1299.
2004-11-08 22:15: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
3136791492
Linux/GCC Compat(tm)
...
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
Calefaction
955ddcf9a1
More programmable pipeline updates
...
This was SVN commit r1280.
2004-10-30 21:57:46 +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
Calefaction
7947293015
Initial programmable pipeline push
...
This was SVN commit r1272.
2004-10-23 18:13:54 +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
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
b1c269b72e
Complete materials checkin
...
This was SVN commit r1197.
2004-09-24 03:52:03 +00:00
