Commit Graph

3653 Commits

Author SHA1 Message Date
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
5205944dce Added the concept of diplomatic stance in CPlayer.
This was SVN commit r4259.
2006-08-28 03:07:48 +00:00
1b4f2763d9 Script changes for diplomatic stances.
This was SVN commit r4258.
2006-08-28 03:07:07 +00:00
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
6124ebd62c add missing file from sweng/"forward declare" commit
This was SVN commit r4254.
2006-08-27 12:17:27 +00:00
c53269caac # fix for mouse handling on multimonitor systems
+ cleanup

This was SVN commit r4253.
2006-08-27 10:33:22 +00:00
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
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
7d3d8fdbf3 # move ps/Network into top level project (and static lib).
This was SVN commit r4249.
2006-08-26 20:25:37 +00:00
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
9fc485c9a6 # Fixes to the line segment frustum test.
This was SVN commit r4245.
2006-08-25 19:31:01 +00:00
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
6732af1ba9 # Updates to the order system, including shift-click queueing.
This was SVN commit r4240.
2006-08-25 04:24:06 +00:00
01b02d145d Script changes for adding isQueued parameter to issueCommand.
This was SVN commit r4239.
2006-08-25 04:23:27 +00:00
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
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
dave
98697b4676 Mac OS X Compat
LightEnv - has byte order marks
Texture - conv from int to GLint wasn't allowed
JSConversion - to use isfinite you need the std:: namespace
	(this is temporary... atm I don't know why you can't call isfinite)
ScriptableComplex - when implementing methods it did not like default
values (they were removed from the cpp file)
timer.h - simple change

This was SVN commit r4231.
2006-08-19 20:24:49 +00:00
dave
a20db60354 Variable type change from uint to size_t when calling functions in vfs
This was SVN commit r4230.
2006-08-19 20:01:26 +00:00
dave
1a8568cf24 Added the -i flag for nasm ... now it won't crap out
This was SVN commit r4228.
2006-08-19 16:32:30 +00:00
e2add58410 # Improved pathfinder precision.
Added code to requestLowLevelPath that modifies the final waypoint to
use exactly the coordinates where the player clicked, instead of the
rounded-to-nearest-tile coordinates from the A* pathfinder. A more
complete fix required eventually might be to make the A* engine itself
aware of fractional locations within a tile but for now this seemed like
a simple thing to do.

Also fixed a bug that was causing the final step of the path not to be
added: the code was adding an ORDER_PATH_END_MARKER but no
ORDER_GOTO_NOPATHING for the final point. The ORDER_PATH_END_MARKER
doesn't seem to do anything useful here so the unit never went that last
step.

Also fixed a bug with "pass-through-allies" that was causing units to
avoid allies anyway: although the pathfinder assumed you could pass
through allies, when you actually bumped into one while executing a goto
instruction, the collision test used did not check for
pass-through-allies so you ended up avoiding allies anyway. This might
not be too horrible if it works in practice (since the avoidance was
done using simple local work, not a full repath) but I've removed it for
now since it might cause problems with formations, when avoidance will
not be trivial.

This was SVN commit r4226.
2006-08-17 21:09:46 +00:00
802e099e35 # mac compat
tricky issue with isfinite: <cmath> also stomps on that (C99) macro,
instead of only C89 libc. fix: include math.h instead. rationale is
documented.

This was SVN commit r4224.
2006-08-12 16:42:50 +00:00
Dnas
afd3589f33 minor nit-picky fix to the right side of the helmet
This was SVN commit r4223.
2006-08-11 21:34:28 +00:00
479deec3c2 This was SVN commit r4222. 2006-08-11 20:35:27 +00:00
eb3b5abd9b #Completed a series of commits for the Roman helmets and other knick knacks!
This was SVN commit r4221.
2006-08-11 20:13:46 +00:00
f082b0a939 This was SVN commit r4220. 2006-08-11 20:12:54 +00:00
6473d68a1c A nice commit of new grasses, shields, and helmets
This was SVN commit r4219.
2006-08-10 22:47:30 +00:00
50fe377f8c This was SVN commit r4218. 2006-08-10 22:44:59 +00:00
0ba281e702 This was SVN commit r4217. 2006-08-10 22:44:24 +00:00
4dbed4678e This was SVN commit r4216. 2006-08-10 22:44:06 +00:00
e93fbeb83d This was SVN commit r4215. 2006-08-10 22:43:46 +00:00
3f7e88931e This was SVN commit r4214. 2006-08-10 22:43:22 +00:00
5786328996 This was SVN commit r4213. 2006-08-09 16:45:35 +00:00
e9226e48a6 This was SVN commit r4212. 2006-08-09 16:45:10 +00:00
9fda86622c This was SVN commit r4211. 2006-08-09 15:14:45 +00:00
964b79e11c #New Roman Elite Triarius unit.
This was SVN commit r4210.
2006-08-09 15:14:27 +00:00
b6aa68b677 Reorganized some building placement code.
This was SVN commit r4208.
2006-08-08 16:00:47 +00:00
2ff3001b08 # Updated Cantabrian Highlands RMS to add territories.
This was SVN commit r4207.
2006-08-08 04:15:09 +00:00
fce69aaa7f # - Housekeeping
# - Territory restriction rules for buildings.

This was SVN commit r4206.
2006-08-08 03:45:13 +00:00
235ad34669 Converted many entity property names to CamelCase and added TerritoryRestriction property for buildings. Also moved building-related stuff (foundation, socket and territoryRestriction) inside traits.creation.
This was SVN commit r4205.
2006-08-08 03:44:15 +00:00
d789c92bd0 Modified CSimulation's random number generator to use the Boost small_int and uniform_01 distributions for better portability.
This was SVN commit r4203.
2006-08-07 20:38:23 +00:00
3e20982866 #New Roman helmet meshes by Wijitmaker.
This was SVN commit r4202.
2006-08-07 04:16:25 +00:00
48e80bdfbc Fixed deunicodification of actor strings - need to be converted from CStr to std::wstring when passed to Atlas
This was SVN commit r4200.
2006-08-06 18:41:07 +00:00
1dd2196d30 This was SVN commit r4199. 2006-08-05 09:33:39 +00:00
6620322603 This was SVN commit r4198. 2006-08-05 09:30:18 +00:00
399e26a9c5 # macosx compat
This was SVN commit r4196.
2006-08-04 09:30:43 +00:00
93b2c6ad1b #A series of commits for the Roman Triarius.
This was SVN commit r4195.
2006-08-04 01:26:50 +00:00
bd474e39d2 This was SVN commit r4194. 2006-08-04 01:25:51 +00:00