1
0
forked from 0ad/0ad
Commit Graph

4071 Commits

Author SHA1 Message Date
ec69bccb2c # Tidied up some code.
- Made some classes not be singletons, since there's no reason why they
should be.
 - Made them non-global too (because globals have unclear lifetimes, and
make it harder to test things, etc). They're now owned by CGameView and
CWorld, and mostly accessed via g_Game or arguments (vaguely trying to
avoid the graphics code calling into the game code).
 - Moved CGameView implementation into pimpl, so the header file isn't
so heavy.
 - Changed a few pointers into references, to indicate that they're
never NULL.

This was SVN commit r4756.
2007-01-08 01:56:46 +00:00
8094125b18 Avoided "unknown pragma" warning in VS2003.
restrict: Changed documentation to note that it can be used on member
functions to restrict 'this', since that seems to work in GCC and MSVC
(though undocumented in the latter). Removed ICC-specific keyword
spelling because it accepts the GCC/MSVC spellings too.

This was SVN commit r4754.
2007-01-07 18:09:14 +00:00
785694a4af small convenience requested by philip: file_stats_dump is now disabled by default (use debug_filter_add("FILE_STATS") to reenable)
This was SVN commit r4753.
2007-01-07 17:35:26 +00:00
95f8aa126f # fixes for overzealous vc8 optimization and housekeeping
these are required by thesis and improve 0ad code.
- sysdep/win init/shutdown mechanism is now better documented and
survives clever vc8 optimization
- moved some extern declarations from win_internal into separate headers

main: remove debug_filter_add("LOADER") - was for my debugging
convenience

This was SVN commit r4752.
2007-01-07 16:50:36 +00:00
ecb83f12f4 added mining sounds from kit challis/ browncoat and mining.xml, updated building/ambient with new file paths
This was SVN commit r4751.
2007-01-07 07:04:26 +00:00
4877afd443 added audio file folders, building ambiance ogg's and xml's
This was SVN commit r4750.
2007-01-07 06:45:54 +00:00
3f8c636531 This was SVN commit r4749. 2007-01-06 23:14:18 +00:00
afe3aa860e This was SVN commit r4748. 2007-01-06 22:15:36 +00:00
b326054fba This was SVN commit r4747. 2007-01-06 22:11:05 +00:00
ff1f05b4a9 This was SVN commit r4746. 2007-01-06 22:04:07 +00:00
e035d781df Quintus Fabius Maximus texture, actor, and entity committed to the game. Amazing texture done by Brendan. :)
This was SVN commit r4745.
2007-01-06 21:52:50 +00:00
3c8dd6869c Fixed an upgrade bug.
This was SVN commit r4743.
2007-01-06 05:10:48 +00:00
d34ef783bf (Whoops, wrong version number)
This was SVN commit r4741.
2007-01-06 02:48:32 +00:00
ab94e73385 Added 'restrict' support for non-GCC compilers (partly to benefit from the optimisation, partly to make it more likely that bugs will be found if restrict is ever used incorrectly).
Renamed to 'RESTRICT' so it doesn't conflict with __declspec(restrict)
in MSVC's standard headers.

This was SVN commit r4740.
2007-01-06 01:33:13 +00:00
667ae032ef Fixed a bug in the XML (charge action should be in actions.attack.charge).
This was SVN commit r4739.
2007-01-05 21:40:04 +00:00
5aba6861ae Updated entity script to work with traits.promotion.entity.
This was SVN commit r4738.
2007-01-05 19:16:11 +00:00
Elpea
25e0338dad Added traits.promotion.entity to unit entities that gain ranks, so that we don't have to use file names to find unit's upper ranks.
This was SVN commit r4737.
2007-01-05 05:36:16 +00:00
2d4f5478de Added ICC-Linux PCH support in Premake. (It's much more like the MSVC approach than the GCC one.)
Passed --have-std to CxxTest so it always adds the same code before
including precompiled.h, so that the PCH is usable.

This was SVN commit r4736.
2007-01-04 03:22:23 +00:00
0bdc1c22c8 # Made the Atlas scenario editor partly work on Linux.
- Made the canvas get shown before it's used.
 - Added some bits of SDL initialisation so that SDL_GL_GetProcAddress
is happy.
SnapSplitterWindow: fixed virtual override.

This was SVN commit r4735.
2007-01-03 15:45:13 +00:00
fffc32f8ad Oops, bug. Fixed.
This was SVN commit r4734.
2007-01-02 18:55:24 +00:00
1926317975 # Linux/ICC fixes
- added "--icc" Premake flag, to disable PCH and set different warning
flags
 - added required headers
 - changed debug_warn to not generate constant-expression-in-conditional
warnings
 - changed FAM popup-warning into a log message, so it's not so
irritating
 - Atlas: pass around wxGLCanvas instead of wxGLContext, because the
context is sometimes just NULL

This was SVN commit r4733.
2007-01-02 18:11:00 +00:00
15e7bae0ba Extra fixes
This was SVN commit r4731.
2007-01-01 22:56:24 +00:00
ebfd7910cf fixes: (after testing on other machine)
- add newly added dirs to premake.lua
- self_test is in lowlevel project and thus doesn't have cxxtest include
path set => must not include self_test.h
- wposix: make each _CRTIMP declaration extern "C" (can't rely on
definition of _CRTIMP, nor that the header is wrapped in extern "C" {})

This was SVN commit r4730.
2007-01-01 22:54:42 +00:00
1df436f07f # GCC fixes
This was SVN commit r4729.
2007-01-01 21:55:38 +00:00
0bb0df5b2c # new year's cleanup (reduce dependencies, clean up headers)
- remove headers always included from PCH
- nommgr.h is only included ifdef REDEFINED_NEW (allows leaving out the
mmgr stuff)
- in lib/*.cpp, moved the corresponding include file to right behind the
PCH (catches headers that aren't compilable by themselves)
- byte_order no longer depends on SDL
- add debug_level (another means of filtering debug output; needed for
thesis)
- split posix stuff up into subdirs (lib/posix and sysdep/win/wposix).
makes including only some of the modules (e.g. sockets, time) much
easier.

This was SVN commit r4728.
2007-01-01 21:25:47 +00:00
2d1543b93b Created a sample unit which automatically starts gathering the nearest object, for use in cinematics. Auto-gatherer versions of other units can be created by copying temp_hele_infantry_javelinist_b_gatherer.xml and changing the parent to the appropriate unit.
This was SVN commit r4727.
2006-12-31 06:23:33 +00:00
arissa_nightblade
8929e27ace Revised values for XML files. Updated Excel file.
This was SVN commit r4726.
2006-12-29 05:42:23 +00:00
b5403bcfc7 # Conversion of skeleton animations from COLLADA
This was SVN commit r4725.
2006-12-26 22:43:09 +00:00
24f06de815 # Optimised conversion of COLLADA models
Duplicate vertices are only stored once (then indexed multiple times),
whereas the old version needlessly repeated data.

This was SVN commit r4723.
2006-12-25 23:42:53 +00:00
ba666313f1 This was SVN commit r4722. 2006-12-23 20:35:59 +00:00
679d6bd376 This was SVN commit r4721. 2006-12-23 20:19:54 +00:00
c0637279e6 # Fixed a crash on older graphics cards.
This was SVN commit r4720.
2006-12-21 17:17:14 +00:00
0462336cf2 Fixed compilation on Linux
This was SVN commit r4719.
2006-12-21 16:53:51 +00:00
844256fa0c Fixed compilation on VS2003
This was SVN commit r4717.
2006-12-21 15:37:45 +00:00
d672674bc6 # Order system refactoring.
This was SVN commit r4716.
2006-12-21 14:57:13 +00:00
805981519e Fixed unit costs (the tags were in the wrong place). Also set all costs in template_entity_full.xml to 0 so it's less confusing.
This was SVN commit r4713.
2006-12-20 17:36:17 +00:00
603401dc09 # Bug fixes.
- Fixed a crash that was happening in pathfinding on maps where some
tiles had invalid texture names (from earlier versions of the game).
- Releasing the mouse over the minimap while dragging a selection band
will no longer cause the view to move there. Unfortunately, the bandbox
still won't properly "release". The bandbox input routine should ideally
be placed at a higher priority than the GUI, separate from the other
Interact.cpp routines.

This was SVN commit r4711.
2006-12-20 05:41:54 +00:00
f6de818ea8 # Added support for automatically loading 3d models in the COLLADA format.
* CMeshManager: Changed to check for .pmd and .dae files and convert
and cache as appropriate.
 * CModelDef: Fixed misinterpreted doc comments in.
 * lib:
   * Fixed init/shutdown sequences to support multiple VFS-using tests
correctly.
   * Fixed most reported memory leaks from the new leak-reporting test
system.
   * Fixed error when trying to dump debug data about fonts after
unloading them.
 * Added sphere dae/pmd data for tests.
 * Added output buffering to DAE->PMD converter.
 * Added precompiled COLLADA converter DLLs.
 * Removed old redundant conversion script.

This was SVN commit r4709.
2006-12-20 03:22:24 +00:00
ab12d7303f Finished move of mods/_tests.
This was SVN commit r4708.
2006-12-20 03:12:01 +00:00
8b7d1fcfb3 * Moved command-line options list from system.cfg into readme.txt. Updated the list to reflect reality. Removed -novbo option because you can use the .cfg file instead.
* Changed log files to trigger standards mode in Firefox (to be
consistent with other browsers), by making it valid HTML5. Changed the
font and some spacing.
 * Made CLogger default to ignoring messages if it hasn't been
initialised yet, instead of crashing.
 * Added leak reporting to the unit tests.
 * Renamed mods/_tests to mods/_test.xero, since it's only used by
Xeromyces and the other tests use mods/_test.otherstuff instead.
 * Fixed Atlas compilation on Windows.
 * Moved Atlas's DLL-loading code into a separate class, so it can be
shared.

This was SVN commit r4707.
2006-12-20 03:09:21 +00:00
64d56aadf8 # fix to base32 (was interpreting length incorrectly)
This was SVN commit r4704.
2006-12-18 22:15:20 +00:00
arissa_nightblade
84260057f9 Upaded Excel file
This was SVN commit r4703.
2006-12-17 05:12:08 +00:00
e3e0d513b5 # minor fixes exposed by ICC 9.0 warnings
This was SVN commit r4701.
2006-12-17 00:49:09 +00:00
ad060405d6 Added entity graph image created using entgraph.
This was SVN commit r4700.
2006-12-16 16:23:37 +00:00
53ec2466d9 Fixed some missing parents in entity tree.
This was SVN commit r4699.
2006-12-16 16:22:47 +00:00
13f2e3ca0c Tried compiling with ICC9 on Linux, which raised various issues:
* Fixed some bugs with incorrect macro usage (SDL_BYTE_ORDER vs
SDL_BYTEORDER, {MSC,GCC}_VER vs {MSC,GCC}_VERSION, OS_WIN/OS_UNIX in
projects where they're not defined).
 * Removed some redundant declarations of g_Console.
 * Removed some unnecessary semicolons.
 * Removed some unused variables.
 * Added throw specification to operator new.

This was SVN commit r4698.
2006-12-16 01:01:15 +00:00
173c56140c # Fixed skeletal animation algorithm.
* Skinning is done in a way that works when there's more than one bone
influencing a vertex.
 * PMDs now store vertexes in world-space instead of bind-space. (The
loader converts the old-version PMDs so they still work.)
 * Moved SkinPoint, SkinNormal into CModelDef so it could use them when
loading the old PMDs.
 * Made the FastNormals approach non-optional, so the inverse-transpose
bone matrices could be removed. Changed the explanation of why it's a
valid approach.
 * Quaternion: Made GetInverse assume that the quaternions have unit
length (which they do when they're representing 3D rotations).
 * lib: Added support for DDS files that aren't a multiple of 4x4 (most
useful for 1x1, 2x2, etc that are still powers of two).
 * Actor Viewer: Added white terrain texture to the minimal test mod, so
shadows are visible. Changed default so walk/run animations don't move
the unit along the ground.
 * Removed some redundant repetition in doc comments.
 * Removed some unnecessary #includes.

This was SVN commit r4696.
2006-12-15 16:09:30 +00:00
arissa_nightblade
fc97a81743 This was SVN commit r4695. 2006-12-15 03:31:43 +00:00
arissa_nightblade
bfac9b3e47 This was SVN commit r4694. 2006-12-14 05:51:19 +00:00
arissa_nightblade
966d63107a # Implemented initial building resource costs.
Added wood and stone costs to all the structures.

This was SVN commit r4693.
2006-12-14 05:43:23 +00:00