Commit Graph

2675 Commits

Author SHA1 Message Date
Matei 665030adcf Fixed some CStrW's in Technology.cpp for Linux compile.
This was SVN commit r4986.
2007-04-23 03:47:33 +00:00
janwas e8a0626248 # improvements to foundation code
(merged in from thesis project branch)

allocator: remember page-aligned size (prevent resize error)
config, sysdep, lib: add implementation of wcsdup for macosX
path_util: add path_package_copy and cleanup
file: add dir_exists, dir_create uses _mkdir (avoids mode_t param)

This was SVN commit r4984.
2007-04-22 16:43:54 +00:00
Matei 1fea26a0e9 # Update to technologies.
Made CTechnology inherit from CJSComplex, so that properties such as
resources can be added dynamically instead of being hardcoded in it.

Also removed some excessive debug output from GUI.

This was SVN commit r4980.
2007-04-22 01:09:50 +00:00
Ykkrosh 38a5e807ff # Fixed Atlas on Linux
Added call to XInitThreads, for required thread safety.
Fixed conversions between wchar_t and XMLCh strings. (Not tested much
yet.)
Fixed COLLADA too.

This was SVN commit r4964.
2007-03-20 01:06:34 +00:00
Ykkrosh b2978c42f6 # Linux fixes
This was SVN commit r4963.
2007-03-19 20:58:46 +00:00
Ykkrosh 5a92835788 # Minor change to COLLADA support
Prop points must be named "prop-*" to be recognised by the converter.

This was SVN commit r4962.
2007-03-19 16:12:53 +00:00
Ykkrosh d2935684ff Collada: Integrated skeleton XML with game. Added some tests. Fixed memory leak when loading ill-formed XML.
Added TestLogger, so tests can check the right log messages were
produced.

This was SVN commit r4960.
2007-03-16 23:32:10 +00:00
Ykkrosh a9feadc3ea # Improved COLLADA skeletal animation support.
Moved skeleton definitions into XML format, to support multiple
different structures. (Not quite finished yet.)
Added support for rescaled models in XSI.
Minor refactoring.

This was SVN commit r4959.
2007-03-16 18:00:58 +00:00
Ykkrosh 29f44d66ed # Bug fix
Fixes problem introduced in 8d0a7170f6, removes workaround from
faf8358b3c

This was SVN commit r4957.
2007-03-16 10:05:05 +00:00
Ykkrosh 781e630b2c # Incomplete improved support for XSI models/animations
This was SVN commit r4946.
2007-03-09 13:40:28 +00:00
Ykkrosh d7634868b4 # Minor COLLADA improvements.
Collada: Added support for Y_UP (in addition to Z_UP) for static
geometry, for XSI.
FCollada: Modified to fix
[http://www.feelingsoftware.com/bugzilla/show_bug.cgi?id=360 problem]
with exported functions.
Actor Editor: Added *.dae to mesh/animation selection dialogs.

This was SVN commit r4939.
2007-03-03 02:20:57 +00:00
Ykkrosh e2f1e48f53 Collada: Don't warn about unrecognised joints (since they're probably prop points). Get animation start/end times more reliably when possible.
This was SVN commit r4938.
2007-03-02 20:09:27 +00:00
Ykkrosh f1971f03d1 # Initial COLLADA prop support
This was SVN commit r4937.
2007-03-02 15:55:46 +00:00
Ykkrosh fa45d214b3 # Added support for COLLADA skeletal animations.
Moved COLLADA-loading code into separate class, since it now handles
both PMD and PSA.
Desingletonised CSkeletonAnimManager, moved into CGameView.
Made Atlas load its icons with buffered IO, for possible efficiency.

This was SVN commit r4934.
2007-03-01 18:52:53 +00:00
Ykkrosh ea29a1caeb # Updated COLLADA converter.
Now uses FCollada 3.02.

This was SVN commit r4933.
2007-03-01 00:24:34 +00:00
Ykkrosh fc111ecb08 # Minor optimisations and features.
Made CMatrix3D::Translate assume something sensible about the structure
of the matrix, so it doesn't have to do a matrix multiplication.
Added quaternion nlerp (but haven't used it anywhere).
Changed animation interpolation so it loops smoothly in the actor viewer
but (hopefully) doesn't interpolate dying units into a half-upright
pose.

This was SVN commit r4932.
2007-03-01 00:14:35 +00:00
Ykkrosh f4d1ad77c2 # Better error tolerance
Fail more nicely (no repeated error dialogs, no crashes) when unable to
create VBOs.

This was SVN commit r4931.
2007-02-28 20:09:19 +00:00
pyrolink a4c0ea9d07 #Cinematic changes
-Eliminated tracks, rotation is per node

This was SVN commit r4929.
2007-02-27 02:14:18 +00:00
Ykkrosh c2b119e721 # Linux fixes.
Disabled CONFIG_USE_MMGR by default, since it seems unnecessary and it
makes debug builds slow (extremely slow under Valgrind) due to symbol
lookups when allocating memory.
Fixed minor warnings and errors.

This was SVN commit r4927.
2007-02-25 21:11:57 +00:00
Ykkrosh 9ebe3b08f7 # Smoother unit rotation.
Added m_orientation_smoothed to entities, which follows m_orientation
but is limited to changing at a certain angular rate.

This was SVN commit r4901.
2007-02-11 22:04:54 +00:00
Ykkrosh ee48a33ec4 # More cinematic map updates.
Made female citizen walk to gather berries.
Fixed gather trigger effect.
Made entity collision-detection work a little better if you modify the
map while running the simulation.

This was SVN commit r4897.
2007-02-11 01:19:44 +00:00
Ykkrosh faeb0a5cb6 WaterManager: don't try rendering if the textures haven't been loaded (e.g. when using the Actor Viewer).
GameView: pushed near clipping plane out a bit (to get more precision),
rounded far plane to power of two for no real reason.

This was SVN commit r4896.
2007-02-10 22:07:20 +00:00
Ykkrosh 4883dd015c Changed default DepthTextureBits again. Should fix #180.
This was SVN commit r4893.
2007-02-10 20:53:48 +00:00
Ykkrosh 49f7f31298 Undid map changes.
Used default camera settings more consistently.

This was SVN commit r4892.
2007-02-10 19:37:33 +00:00
Ykkrosh 44be62092c # Fixed rendering of transparent objects.
Made transparency ordering give consistent results if two transparent
models are in the same position.
Removed transparency material from tree trunks, so they won't suffer
from transparency-ordering issues.

This was SVN commit r4889.
2007-02-10 18:26:57 +00:00
Matei e1ea1d23de # Animation bug fixes.
- Projectile speed and gravity adjusted to get nicer curves.
- Dying units conform to terrain.
- Cavalry melee attack range increased.

This was SVN commit r4887.
2007-02-10 17:39:20 +00:00
Ykkrosh bdbb2bcb16 # Updated unit animation code.
Added UnitAnimation class, to act as the interface between the entity
and actor. (Currently doesn't work very well, but it does make
animations loop smoothly and sometimes kind of makes them stay
synchronised.)
Fixed corpse animation - it now plays the final frame of the death
animation before turning static.
Fixed update/interpolate timings.
Added JS function saveProfileData.
Updated ffmpeg library.

This was SVN commit r4880.
2007-02-10 03:09:52 +00:00
Ykkrosh a734f9ccd7 EntityManager: Large speed improvement in Debug mode (~50x for projectile updates) by replacing std::vector<bool> with std::bitset.
This was SVN commit r4877.
2007-02-09 22:07:15 +00:00
Ykkrosh 5e3e78ca78 # Fixed some graphical and scenario editor issues.
Atlas: Changed video format to 640x480 and losslessly compressed. Added
most-recently-used files list. Stopped switching sidebar when selecting
tools, since it was getting annoying. Added Slow playback mode. Fixed
crash when resetting sim while projectiles exist.
Renderer: Added JS-accessible renderer.shadowMapSize to override the
size of shadow maps.
ShadowMap: Changed default depth texture bits to 24, since that seems to
go faster (see #180).
PolygonSortModelRenderer: Made more similar to other renderers, so that
the renderer.sortAllTransparent=true mode works better.
Projectile: Fixed update, so it interpolates smoothly.
Entgraph: Fixed promotion detection.

This was SVN commit r4876.
2007-02-09 17:04:55 +00:00
Matei a11c12f848 # Fixed a bug with entities disappearing when they die.
This was SVN commit r4873.
2007-02-08 05:38:53 +00:00
Ykkrosh 102b3925ac GCC compatibility
This was SVN commit r4872.
2007-02-07 14:02:09 +00:00
Ykkrosh af2e5854be (Forgot to commit file)
This was SVN commit r4858.
2007-02-04 15:58:23 +00:00
Ykkrosh 7130b389db Atlas: Disable selected tool before saving, so unit-placement previews don't get saved as real units.
Misc: Removed redundant code.

This was SVN commit r4857.
2007-02-04 14:56:38 +00:00
Ykkrosh 117f3dfe4a Rough cinematic/triggers in map.
Fixed some issues with triggers.
JS command execution in Atlas.

This was SVN commit r4829.
2007-02-02 02:17:15 +00:00
Ykkrosh 8d0a7170f6 # Slightly tidied up string code.
CStr: Indented comments more consistently. Made some parameters
pass-by-reference, made some others not. Removed some useless methods -
Length (use length or empty), GetSubstring (use substr), LCase/UCase
(use LowerCase/UpperCase). Removed operator[] bounds-checking because
VS2005 does that anyway.
Maybe fixed noncopyable warnings on VS2003.

This was SVN commit r4828.
2007-02-01 14:46:14 +00:00
janwas fb91d32d61 philip points out G++ will not support the restrict keyword at all.
This was SVN commit r4826.
2007-02-01 01:44:13 +00:00
janwas 27b6ffe2d6 # housekeeping
sorry, update-workspaces + rebuild is necessary (moved boost/utility
into PCH)

- ps/ : committed additional documentation on behalf of Joe.
- lib/ : HAVE_C99 - replace with specific e.g. HAVE_NPRINTF; intended to
help with MacOSX compat (by no longer requiring us to lie about
STDC_VERSION)
- NO_COPY_CTOR -> boost::noncopyable

This was SVN commit r4825.
2007-02-01 01:34:17 +00:00
Matei 1e195ac519 Changed task unit triggers to use unit ID's properly.
This was SVN commit r4823.
2007-01-30 03:50:28 +00:00
Matei 465c0a037b # Fixed some trigger bugs.
- Conditions were not properly converted to JavaScript (not read from
the XML file correctly either).
- Added an OrderFromTriggers function so that triggers can give orders
which ignore fog of war.
- Fixed some spelling mistakes in TriggerSpecs.xml (parameter vs.
parameters).
- Moved trigger update to CSimulation update, which is more correct.

This was SVN commit r4821.
2007-01-29 22:21:25 +00:00
Ykkrosh 41cf5c6139 CinemaTrack: Avoided crashing in certain cases.
dll_ver: Fixed invalid free when running with OpenGL 1.1 drivers on
Vista.
GameSetup: Fixed spaces between sentences in error message.

This was SVN commit r4820.
2007-01-29 17:46:28 +00:00
Ykkrosh 8ae237478d Fixed cinematics playback in Atlas
This was SVN commit r4817.
2007-01-28 15:51:28 +00:00
Ykkrosh b972965968 Found bug while asleep.
This was SVN commit r4816.
2007-01-27 12:38:12 +00:00
Ykkrosh adc8c64724 # General tidying.
Encryption: Deleted, just in case anyone was ever tempted to use it.
debug_warn: Removed redundant quotes around message.
oglCheck: Added error number to displayed messages, to help when
debugging errors.
Simulation: Fixed syntax confusion.
Entity: Preserve unit ID across entity-template changes (e.g. upgrades).
Atlas: Made some floating-point code less dodgy. Support number keys to
change player while placing units.

This was SVN commit r4814.
2007-01-27 02:36:33 +00:00
Ykkrosh 8a9ddae60b Oops, I broke GCC PCH a month ago. Fixed, and added a comment so I now know why it does what it does.
Also, updated the dependency checking so it rebuilds the PCH file when
included files change.

This was SVN commit r4813.
2007-01-26 21:16:49 +00:00
Ykkrosh 3573c4a4e3 # Optimisations for Linux
GCC: Don't export symbols from DSOs by default - see
http://gcc.gnu.org/wiki/Visibility

This was SVN commit r4812.
2007-01-26 18:26:45 +00:00
Matei 5e7baf3a43 # Bug fixes and cleanup of entity kill code.
Put all entity cleanup code in kill(), so the JS function Kill() can
just call kill(), and made the code more correct in both cases. Also
fixed a bug with auras (a unit kept around auras that had been deleted).
Also fixed up some notifier code that was causing crashes (although that
can still happen in some cases).

Fixes #176.

This was SVN commit r4810.
2007-01-25 07:00:31 +00:00
Ykkrosh ee3243ff92 # Fixes for simulation speed in scenario edtior. Various code cleanups.
Game, Simulation, etc: Separated 'update' and 'interpolate', and made
'update' return whether it's going fast enough (so callers can decide to
do more updates per render). Changed some time variables to 'double' so
they have enough precision in long games.
Atlas: Added "Fast" playback button. Made simulation sometimes go at
real-time speed, if it's just slightly too slow at rendering.
VertexBuffer: Removed some non-useful glGetError calls.
Entity: Commented out redundant Tick code. Fixed syntax error in
disabled code that confused the IDE.
Aura: Changed string code again, to simply use ASCII instead of UTF-16.
(SpiderMonkey seems to handle it just as efficiently, for small
strings.)
Misc: Some more minor header-file cleanup.
SVN log: Added feed link.

This was SVN commit r4807.
2007-01-24 20:17:28 +00:00
Ykkrosh 5c8250ddb8 # Added primitive memory-allocation counting
Profiler: now shows "mem allocs" for the previous frame (only in MSVC
Debug mode).
Aura: got rid of a couple of hundred allocations per frame.

This was SVN commit r4805.
2007-01-21 03:33:52 +00:00
Ykkrosh d618551fe8 Singleton: removed "cunning trick", because someone pointed out that it is very undefined behaviour and is completely unnecessary nowadays
This was SVN commit r4800.
2007-01-20 14:20:31 +00:00
nd3c3nt cfeda2cbab #fixed minor bug with soundgroups
This was SVN commit r4798.
2007-01-20 04:23:08 +00:00