Commit Graph

3684 Commits

Author SHA1 Message Date
Ykkrosh e2262b0525 Fixed references to animation files containing extraneous spaces.
Moved some animations out of "not used" since they are actually used.
Renamed "rich's_man" because the apostrophe messes with xargs.

This was SVN commit r4304.
2006-09-04 21:35:10 +00:00
Ykkrosh 245496e201 Fixed warnings/errors/leaks related to Xerces update
This was SVN commit r4303.
2006-09-04 20:59:21 +00:00
christoph e9fcf77ff1 Reordering animation folder
This was SVN commit r4298.
2006-09-04 19:13:11 +00:00
christoph a87c18aada Reordering animation folder
This was SVN commit r4297.
2006-09-04 19:02:23 +00:00
christoph c4c5f7d7e6 Reordering animation folder
This was SVN commit r4296.
2006-09-04 18:53:14 +00:00
dave b899ff6823 Premake need to be changed to create makefiles which work on OSX
updated the lua to handle os x project files

This was SVN commit r4293.
2006-09-04 16:33:47 +00:00
dave 3b41b5fbd1 Moved the include of cmath out of the #ifdef
This avoids stuff like

/usr/include/c++/4.0.0/cmath:85: error: template with C linkage
/usr/include/c++/4.0.0/cmath: In function 'float std::abs(float)':
/usr/include/c++/4.0.0/cmath:92: error: declaration of C function 'float
std::abs(float)' conflicts with
/usr/include/c++/4.0.0/cmath:88: error: previous declaration 'double
std::abs(double)' here

This was SVN commit r4291.
2006-09-03 02:17:57 +00:00
Ykkrosh 8e02ec84f9 Updated OpenAL to 1.1 (which no longer includes ALUT).
Changed player-id code a bit so the entity and actor and unit should
stay in sync more often. (The entity/actor/unit mixing still looks a bit
dodgy and unreliable, though.)
Simplified console help code.
Allowed init/shutdown to be done with the simulation/world/etc parts
disabled (so the actor viewer can load faster).

This was SVN commit r4289.
2006-09-02 21:20:25 +00:00
dave 12b060d34f isfinite etc.. is now properly defined as a macro
This was SVN commit r4288.
2006-09-02 19:41:26 +00:00
dave 0ffabbc5dc Mac compat ..
This was SVN commit r4287.
2006-09-02 17:21:49 +00:00
Mythos_Ruler 3ea971b87f This was SVN commit r4286. 2006-09-01 23:30:45 +00:00
dave 2bb1bde51e Mac gcc complains about mixing size_t, uint etc..
This was SVN commit r4285.
2006-09-01 06:59:29 +00:00
Mythos_Ruler e8633554a5 This was SVN commit r4284. 2006-09-01 06:07:38 +00:00
Mythos_Ruler 35627236af This was SVN commit r4283. 2006-09-01 06:07:05 +00:00
Mythos_Ruler 8f64ee6c9e This was SVN commit r4282. 2006-09-01 06:05:16 +00:00
Mythos_Ruler b1e3dbd1ca #Philip the One-Eye
This was SVN commit r4281.
2006-09-01 05:43:54 +00:00
Mythos_Ruler 856c4e38e2 This was SVN commit r4280. 2006-09-01 05:43:09 +00:00
Mythos_Ruler a8dacd1d17 This was SVN commit r4279. 2006-09-01 05:42:38 +00:00
Mythos_Ruler fe6d7c058a This was SVN commit r4278. 2006-09-01 05:41:51 +00:00
Mythos_Ruler 5ae400a8fd This was SVN commit r4277. 2006-09-01 05:41:27 +00:00
Mythos_Ruler 2896d607c3 This was SVN commit r4276. 2006-09-01 05:39:27 +00:00
Mythos_Ruler cbd76bb839 This was SVN commit r4275. 2006-09-01 05:38:52 +00:00
Mythos_Ruler 35bf56b348 #Spartan single player and multi-player shields
This was SVN commit r4274.
2006-09-01 05:37:31 +00:00
Matei f79af31e42 Units can no longer "track" enemies that are out of the player's LOS when performing a contact action (attack, gather, etc).
This was SVN commit r4272.
2006-09-01 00:24:26 +00:00
Matei 37e924ec4a Fixed up traits.vision.permanent (the default value was not set to false).
This was SVN commit r4271.
2006-09-01 00:23:55 +00:00
Matei 789c850049 # Updates to fog of war rendering.
This was SVN commit r4270.
2006-08-31 23:56:12 +00:00
Matei 4a45724ef2 Updated water shaders to support darkening when out of LOS.
This was SVN commit r4269.
2006-08-31 23:55:39 +00:00
Matei c4d478a690 Fixed a crash in renderTerritories when there were no Settlements.
This was SVN commit r4267.
2006-08-29 03:46:14 +00:00
Matei 973161ed1b Territory manager now ignores territory centres that have ENTF_DESTROYED, so it will work when you delete objects in Atlas.
This was SVN commit r4265.
2006-08-28 23:05:15 +00:00
Matei a55697e2e5 # Improved territory rendering.
- Territory boundaries are now offset slightly and drawn in player
colour, so you can see whose territory you're on the border of.
- Removed some duplication in the code by modifying a loop slightly.

This was SVN commit r4264.
2006-08-28 23:01:16 +00:00
Matei 059e48d152 Fixed a spelling error (TRAiN vs TRAIN).
This was SVN commit r4263.
2006-08-28 19:05:57 +00:00
Ykkrosh 35e91718c5 # Added tool for viewing models and animations outside the game.
Atlas: Added ActorViewer. Moved GL canvas into separate class for shared
use. Disabled message-handling callback while blocked on the game, and
stopped creating dialog boxes inside the game thread in order to avoid
deadlocks (hopefully). Support multiple Views (for independent sets of
camera/update/render code). Recalculate territory boundaries when
necessary. Changed default list of animations to match those currently
used by actors.
# Tidied up more code.
Moved some more #includes out of .h files, to minimise unnecessary
compilation.
MathUtil: Deleted unused/unuseful macros (M_PI (use PI instead), M_PI_2
(use PI/2), MAX3, ABS (use abs)).
ObjectManager: Removed some ScEd-specific things.
Unit: Moved creation out of UnitManager, so units can be created without
adding to the manager. Changed CStr8 to the more conventional CStr.
app_hooks: Removed warning for setting multiple times.
win: Restored SEH catcher.
GameSetup, GameView: Removed RenderNoCull, because it doesn't seem to do
what it says it does ("force renderer to load everything") since we're
loading-on-demand most stuff and it doesn't seem especially useful since
we'd prefer to minimise loading times (but feel free to correct me if
I'm wrong). (And because it crashes when things need to be initialised
in a different order, so it's easier to remove than to understand and
fix it.)
PatchRData, Renderer: Work sensibly when there's no game (hence no LOS
manager, water, etc).
LOSManager: Use entity position instead of actor position when possible.
TerritoryManager: Allow delayed recalculations (so Atlas can issue lots
of move+recalculate commands per frame).
Cinematic: Non-pointer wxTimer, so it doesn't leak and doesn't have to
be deleted manually.

This was SVN commit r4261.
2006-08-28 17:36:42 +00:00
Matei 5205944dce Added the concept of diplomatic stance in CPlayer.
This was SVN commit r4259.
2006-08-28 03:07:48 +00:00
Matei 1b4f2763d9 Script changes for diplomatic stances.
This was SVN commit r4258.
2006-08-28 03:07:07 +00:00
Ykkrosh ad5054205c # Optimised minimap drawing
Initially saved a little bit of time by changing it to use vertex
arrays, and then realised that disabling point-smoothing saved much more
time (from 70ms per frame on cantabrian_generated down to 2ms, which is
worth any quality loss)

This was SVN commit r4256.
2006-08-27 22:51:53 +00:00
janwas 6124ebd62c add missing file from sweng/"forward declare" commit
This was SVN commit r4254.
2006-08-27 12:17:27 +00:00
janwas c53269caac # fix for mouse handling on multimonitor systems
+ cleanup

This was SVN commit r4253.
2006-08-27 10:33:22 +00:00
janwas bc24974496 # sweng
forward declare SDL_event. remove SDL dependency of network code.
refs #140

This was SVN commit r4252.
2006-08-26 21:52:18 +00:00
janwas 4114d24d3e (pt2 - tortoiseSVN didn't want to do "recursive commit of dir deletion")
This was SVN commit r4250.
2006-08-26 20:26:17 +00:00
janwas 7d3d8fdbf3 # move ps/Network into top level project (and static lib).
This was SVN commit r4249.
2006-08-26 20:25:37 +00:00
janwas 855e9bce02 # macosx compat
.. by removing support for WAV. see rationale in source; in short, we
don't need it and it's not worth the minimal trouble of adding freealut
dependency.

entityhandles: remove old comment

This was SVN commit r4247.
2006-08-26 13:40:18 +00:00
Matei 9fc485c9a6 # Fixes to the line segment frustum test.
This was SVN commit r4245.
2006-08-25 19:31:01 +00:00
Ykkrosh 147d4f2bd3 # Fixed minor shadow bug
CBound operator+= updated the minimum value or the maximum value, but
never both. (I think the operator+=(CVector3D) has always been buggy
(because it assumes min<max, which isn't true of empty bounds), and I
propagated the error to operator+=(CBound) ages ago.)
Added test cases, and fixed.

This was SVN commit r4244.
2006-08-25 12:52:26 +00:00
pyrolink 50e5e9acd9 # Aura and territory rendering
-Auras now take additional parameters from XML, containing a tag for r,
g, b, and a.  No line thickness parameter yet.
-For territories, added function to frustum for determining if line
segment passes through the frustum.

This was SVN commit r4242.
2006-08-25 06:04:33 +00:00
Matei 6732af1ba9 # Updates to the order system, including shift-click queueing.
This was SVN commit r4240.
2006-08-25 04:24:06 +00:00
Matei 01b02d145d Script changes for adding isQueued parameter to issueCommand.
This was SVN commit r4239.
2006-08-25 04:23:27 +00:00
Ykkrosh e53242284f # Updates to unit-testing system.
Premake: Changed to use PCH when compiling tests.
CxxTest: Got rid of /Wp64 warnings. Changed TS_ASSERT_STR_EQUALS to
print both strings on failure.
win_internal: Added the bits that CxxTest::Win32Gui needs (because
Win32Gui is now compiled with PCH and uses our sysdep headers).
Disabled test_cache_policies, because it took long enough for me to read
its name.

This was SVN commit r4237.
2006-08-22 21:38:53 +00:00
dave bf95b26a80 int to GLint
This was SVN commit r4235.
2006-08-22 03:00:31 +00:00
pyrolink b62f53620f #Cinematic editor
This was SVN commit r4234.
2006-08-22 02:24:44 +00:00
Ykkrosh 6a7ee226f0 Restored Windows compatibility (and hopefully didn't break OS X compatibility).
Fixed copy-constructor-generation warnings in VS2003.

This was SVN commit r4232.
2006-08-21 21:27:12 +00:00