1
0
forked from 0ad/0ad
Commit Graph

7717 Commits

Author SHA1 Message Date
8b11b73226 Tweak OGRE preprocessor to fit in our code, and fix bug with #define inside #ifdef.
This was SVN commit r9122.
2011-03-26 20:09:54 +00:00
d1241cd6e9 Import original OgreGLSLProcessor from OGRE 1.7.2
This was SVN commit r9121.
2011-03-26 20:07:57 +00:00
6e98a886ed broken rope bridge eyecandy object added
This was SVN commit r9120.
2011-03-26 09:32:03 +00:00
e08c5e22a0 Added unit icon to Iberian siege ram
This was SVN commit r9119.
2011-03-25 01:00:16 +00:00
2a822eb4d4 Added Iberian siege ram unit
This was SVN commit r9118.
2011-03-25 00:46:02 +00:00
afbfca17ce Fix silhouettes being displayed for some models that always stick into the ground
This was SVN commit r9117.
2011-03-24 23:54:08 +00:00
1eb5eeb225 minor fixes from integration with working copy at work.
This was SVN commit r9116.
2011-03-24 09:05:06 +00:00
9193ba56f9 Build fixes and whatnot
This was SVN commit r9115.
2011-03-23 21:15:22 +00:00
4a2b47689b kennel.png portrait width to 256px
This was SVN commit r9114.
2011-03-23 20:32:14 +00:00
0b8e3b3adf Fixes rounding error on Latium map, would break with odd number of players. Fixes #761.
This was SVN commit r9113.
2011-03-23 20:25:46 +00:00
8f658ee81d Change remaining scenarios with "rome" civ. Fixes #758.
This was SVN commit r9112.
2011-03-23 20:16:10 +00:00
1f7e8d7194 per discussion with Philip, remove STL_HASH_MAP etc. because they're ugly, rarely used and superseded by boost::unordered*
This was SVN commit r9111.
2011-03-23 16:56:27 +00:00
588bfa11bf remove unnecessary utf8 includes
This was SVN commit r9110.
2011-03-23 16:32:44 +00:00
0999ba0941 refactoring:
- simplify sys_get_executable_name interface - return OsPath directly,
rename to sys_ExecutablePathname
- add validation of path components in GetDirectoryEntries
- replace multiple calls to GetModuleFileNameW with
sys_ExecutablePathname
- lift nearly all MAX_PATH limitations (required at work)

This was SVN commit r9109.
2011-03-23 16:14:47 +00:00
64a02932e3 refactor headers: path_util -> path, native_path -> os_path, remove where unnecessary
This was SVN commit r9108.
2011-03-23 14:43:35 +00:00
dcd192cb60 refactor path interface:
- use wrapper class instead of std::wstring (reduces mixing of
strings/paths; allows safe+easy join via operator/ and convenient
case-insensitive comparison via operator==, avoids NativePathFromString,
similar to boost::filesystem)
- NativePath -> OsPath
- add hash and To/FromJSVal for Path
- add TS_ASSERT_PATH_EQUALS
- replace _wfopen_s with sys_OpenFile
- remove obsolete SortFiles/Directories

This was SVN commit r9107.
2011-03-23 13:36:20 +00:00
e39fb7d0de This was SVN commit r9106. 2011-03-23 09:04:59 +00:00
8851028832 Moved face textures from Internal to Public.
This was SVN commit r9105.
2011-03-23 08:59:23 +00:00
f618605477 Changes default random map sizes.
Tweaks random map resources.
Adds support for circular maps to rmgen library.
Various fixes in map generator.
On Miletus map, change player 2 civ, as Romans are not fully implemented
(fixes #758)

This was SVN commit r9104.
2011-03-23 08:12:04 +00:00
575e3b0a69 Don't enable JITs when they can interfere with profiling.
Fix dangerous trailing slashes.

This was SVN commit r9103.
2011-03-23 00:36:34 +00:00
e825a98671 Fix flag filtering of transparent models
This was SVN commit r9102.
2011-03-22 23:09:38 +00:00
c4cd85bb98 Build fixes
This was SVN commit r9100.
2011-03-22 18:46:39 +00:00
5565b9e898 Fixes bugs in Latium map script. Changes default environment settings for random maps, adds environment setters
This was SVN commit r9099.
2011-03-22 08:19:19 +00:00
3050551eae Move data for non-implemented civs to internal
This was SVN commit r9098.
2011-03-22 02:53:53 +00:00
46c54ef62c Fixes missing texture in Neareastern Badlands random map
This was SVN commit r9097.
2011-03-22 02:04:58 +00:00
0e0ed94926 Implements random map system, fixes #6.
Includes default library "rmgen" w/ API based on rmgen tool.
Modifies rmgen scripts Cantabrian Highlands, Neareastern Badlands, and
Latium.
Old map support dropped from MapReader.
Fixes a few bugs in existing game setup and initialization scripts.

This was SVN commit r9096.
2011-03-22 01:34:45 +00:00
23ebe32b4c Moving old random scripts to avoid conflicts
This was SVN commit r9095.
2011-03-22 01:33:17 +00:00
c0a105432e Use path types and conversions more consistently.
This was SVN commit r9094.
2011-03-21 22:59:00 +00:00
5b7ea2371f Fix some line endings.
This was SVN commit r9093.
2011-03-21 22:47:02 +00:00
83271ec816 Fix build errors.
Fix VFS root directory failing IsDirectory, which breaks the search for
textures.xml.
Fix incompatible change to loose cache name determination.

This was SVN commit r9092.
2011-03-21 21:06:08 +00:00
c3405e6f50 path improvements/fixes:
- replace more std::wstring with Native or VfsPath; wstring_from_utf8 ->
NativePathFromString
- replace sequences of Join(Path(), Basename+extension) with
ChangeExtension in wsdl, CacheLoader
- add Path::IsDirectory to replace .empty() / path_is_dir_sep(.back()).
also changed behavior to reflect the fact that "" is the VFS root
_directory_
- Path::Join now allows 2 identical path types (e.g. VfsPath) or one
char* literal (prevents inadvertently introducing non-safe characters).
to convert from wstring or wchar_t, use an explicit ctor (e.g.
VfsPath(wchar_t_string))

This was SVN commit r9091.
2011-03-21 19:54:08 +00:00
6d25329412 # towards locale-independent pathnames on Linux
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14541&st=0&p=217250&#entry217250
and 2011-03-19 meeting

This was SVN commit r9090.
2011-03-21 17:53:13 +00:00
1da78409f9 New icon for celtic kennel
This was SVN commit r9089.
2011-03-21 11:57:49 +00:00
9a22dc1351 warning fixes
This was SVN commit r9088.
2011-03-21 11:55:49 +00:00
cec05f02ea fix insidious OpenAL issue: the spec doesn't guarantee 0 isn't a valid source name => we need to use an out-of-band mechanism for specifying whether the source is valid.
refs #557

This was SVN commit r9087.
2011-03-20 16:40:36 +00:00
2392eb6720 Skip reporting caches that were initialised but never filled in
This was SVN commit r9086.
2011-03-19 15:17:14 +00:00
44e1a863e1 Fix cache detection assertion failure
This was SVN commit r9085.
2011-03-19 15:16:14 +00:00
0af8cdc54a Fix likely cache table typos, based on Intel Software Developer's Manual.
This was SVN commit r9084.
2011-03-19 15:03:25 +00:00
fb499ff0d0 further refactoring of new cache detect code
- add invariant - level/type are always valid, numEntries indicates
whether the cache is actually present and not disabled
- handle pseudo-descriptors 0xF0 and F1 (avoids warning)

This was SVN commit r9083.
2011-03-19 12:48:56 +00:00
4ae8cfe858 Converted remaining old scenarios to the latest format (version 5). Support will soon be dropped from MapReader.
This was SVN commit r9082.
2011-03-19 00:04:55 +00:00
89b7b6b52d Avoid divide-by-zero on AMDs with missing caches
This was SVN commit r9081.
2011-03-18 19:48:54 +00:00
25524dc99f Fix tests
This was SVN commit r9080.
2011-03-18 19:35:31 +00:00
22a651bb86 Fix assertion failure when no L3 cache.
Fix typo.

This was SVN commit r9078.
2011-03-18 18:42:10 +00:00
ecbd0ae31b Fix Windows build.
Improve compatibility with GL1.3.

This was SVN commit r9077.
2011-03-18 18:07:18 +00:00
d805e764c5 # Render unit silhouettes when behind buildings.
Fixes #144.
Start using stencil buffer.
Simplify materials a little.

This was SVN commit r9076.
2011-03-18 16:57:54 +00:00
d49994a0b4 Explicitly clamp gl_FrontColor, for llvmpipe compatibility
This was SVN commit r9075.
2011-03-18 16:55:51 +00:00
5b91e2d7ab move cache detection into separate file.
add support for CPUID.2 cache descriptors (many Bothans died to bring us
this information)
simplify the API - use one structure to describe cache and TLB; only one
accessor for both.

HWDetect: version change, since dtlbs and itlbs are no longer
distinguished

fixes #752

This was SVN commit r9074.
2011-03-18 16:44:03 +00:00
875fce5e63 This was SVN commit r9073. 2011-03-17 07:52:01 +00:00
f73aff7016 Fixed parent code.
This was SVN commit r9072.
2011-03-17 07:50:03 +00:00
b6cc8e9cf6 The Big Iberian Move™.
This was SVN commit r9071.
2011-03-17 07:31:58 +00:00