ff35050d37
This was SVN commit r2725.
2005-09-14 19:43:16 +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
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
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
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
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
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
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
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
471fd5d6f3
Unbroke more; plus some minor changes.
...
This was SVN commit r2398.
2005-06-17 01:28:35 +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
f61a5d1c25
Off-by-one bug in the CEntityList Serialize method; was storing the last entity twice
...
This was SVN commit r2320.
2005-05-18 22:03:02 +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
MarkT
da8d343cb4
Increased projectile gravity.
...
This was SVN commit r2270.
2005-05-10 12:32:16 +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
34352b77af
EntityManager.cpp: safety improvements
...
mmgr: consistent prefix naming
lockfree: split out lock free allocator
This was SVN commit r2260.
2005-05-09 04:41:35 +00:00
229a6b7a16
Loader: reword comment
...
EntityHandles.cpp: 4096 -> MAX_HANDLES
This was SVN commit r2259.
2005-05-09 04:37:36 +00:00
bcc4aea8dc
Maybe fixed nasty memory corruption bug.
...
This was SVN commit r2254.
2005-05-09 02:29:33 +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
db168702df
Jason's animation events. Also reworked entity-types system.
...
This was SVN commit r2209.
2005-05-01 19:09:13 +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
4c08a07052
Fixed warnings and bug. Updated binaries.
...
This was SVN commit r2136.
2005-04-15 22:40:15 +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
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
414960a654
Forcing update of EntityPredicate.h
...
This was SVN commit r2092.
2005-03-30 18:25:07 +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
827e06b8e4
Updated ScEd.
...
This was SVN commit r2083.
2005-03-30 02:06:00 +00:00
a1fe270ff4
Fixed bug that caused entities to have no bounding boxes. (Oops.)
...
This was SVN commit r2080.
2005-03-29 22:26:48 +00:00
249aaf436f
Allowed JS access to GUI object event handlers, via object.onPress etc.
...
Stopped crashes when ordering entities without bounding boxes.
This was SVN commit r2079.
2005-03-29 22:04:38 +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
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
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
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
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
e6c8cef293
types.h => lib/types.h (avoid name collision)
...
This was SVN commit r1935.
2005-02-26 15:13:15 +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
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
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
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
6fa79e0247
This was SVN commit r1791.
2005-01-23 21:58:06 +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
60afb0ee2d
This was SVN commit r1736.
2005-01-18 10:49:32 +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
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
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
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
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
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
445915942a
Fix to restore setInterval() to its former functioning glory.
...
This was SVN commit r1447.
2004-12-02 23:36:47 +00:00
4d83cba7e6
add required precompiled header include
...
This was SVN commit r1431.
2004-12-01 06:52:39 +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
30ad195c0b
Linux/GCC Compat
...
This was SVN commit r1393.
2004-11-23 23:56:10 +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
d30e10042f
Minor changes to sound-script interface.
...
This was SVN commit r1332.
2004-11-15 22:30:01 +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
3136791492
Linux/GCC Compat(tm)
...
This was SVN commit r1284.
2004-11-07 21:30:47 +00:00
MarkT
d33d2e4450
Added some support for user profiles
...
This was SVN commit r1270.
2004-10-23 14:39:28 +00:00
442c6f315f
Added 'const' to appropriate bits of Xeromyces
...
This was SVN commit r1226.
2004-10-07 20:49:35 +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
011666f393
Minor fixes for Linux/GCC
...
This was SVN commit r1201.
2004-09-26 21:21:34 +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
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
6e9c7dd532
Fixed minor type-conversion warnings
...
This was SVN commit r1026.
2004-08-20 14:03:49 +00:00
4d9c7684df
w00t! first batch of actual network support!
...
This was SVN commit r1006.
2004-08-16 15:19:17 +00:00
9cd4cab693
A few log categories
...
This was SVN commit r994.
2004-08-15 20:57:31 +00:00
972596878e
remove mods/official from pathname
...
This was SVN commit r968.
2004-08-11 20:17:13 +00:00
5f25030964
previous fix was incorrect; utf16 was new and not yet committed
...
This was SVN commit r917.
2004-08-05 15:07:05 +00:00
875ceeb9cf
fix breakage: utf16 -> utf16string and include header
...
or was something else intended? no other occurence of "utf16"
This was SVN commit r903.
2004-08-05 12:15:19 +00:00
b986ff832b
Some Linux wchar_t/jschar stuff.. JS uses UTF-16/UCS-2, so convert wchar strings before handing to JS unicode interfaces.
...
This was SVN commit r902.
2004-08-05 12:04:20 +00:00
MarkT
2b396ccb57
Minor improvements to some simulation code.
...
This was SVN commit r887.
2004-08-02 23:14:54 +00:00
09f47d6820
Core Classes Reorganization:
...
- g_Terrain and g_Camera totally eradicated as globals, is now m_Terrain
of CWorld and m_Camera of CGameView
- terrainMain.cpp is almost completely empty with functionality moved
into the relevant core classes
- Miscellaneous global functions moved into Core Classes (mostly
GameView)
This was SVN commit r865.
2004-07-31 15:57:18 +00:00
5f810002c7
Changed error handling in Xeromyces
...
This was SVN commit r845.
2004-07-29 16:17:21 +00:00
00420a8815
fix some minor warnings
...
This was SVN commit r834.
2004-07-28 15:07:54 +00:00
415662c4cd
First set of Core Classes changes! w00t :P
...
This was SVN commit r823.
2004-07-27 21:00:53 +00:00
fe1bee706b
Fixed loads of /W4 warnings, because it's easier than doing anything useful. Added some asserts to check potentially dangerous assumptions, implemented a few missing bits of code, adjusted some comments, etc.
...
This was SVN commit r814.
2004-07-24 14:04:40 +00:00
MarkT
befae8627d
Changed hotkey handling for groups and bookmarks; small pathfinding fixes.
...
This was SVN commit r809.
2004-07-23 10:56:52 +00:00
MarkT
6d8b9e33ef
Minor additions: Added hotkeys to GUI buttons, camera bookmarking (not sure if this system will stay), shoring up some JS error checking, moved a bunch of constants into the config file and added a new rotation mode.
...
This was SVN commit r804.
2004-07-22 16:18:12 +00:00
4a9262afb6
Fixed heap corruption, hopefully correctly
...
This was SVN commit r793.
2004-07-21 12:29:32 +00:00
MarkT
7fd55bae7f
Minor fix to timing code
...
This was SVN commit r786.
2004-07-20 21:12:28 +00:00
MarkT
194fdf9b4b
Unit selection and ordering, setTimeout, scheduler, fixed timestep code, various fixes and reinforcement of the JS<->Native code.
...
This was SVN commit r783.
2004-07-20 19:30:35 +00:00
1e40ed1543
More attempted error handling
...
This was SVN commit r769.
2004-07-17 17:09:33 +00:00
