Commit Graph

4415 Commits

Author SHA1 Message Date
4496fcd2df Restore some old Atlas files
This was SVN commit r9558.
2011-05-27 21:48:23 +00:00
755802d0ce Fix build errors
This was SVN commit r9556.
2011-05-27 13:32:34 +00:00
1bf2598429 Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
34186dd017 refactor file interface. requires workspace update
- separate file_system_util into vfs functions (-> vfs/vfs_util) and
file_system (avoids ugly fs_util namespace prefix)
- get rid of non-portable O_BINARY_NP etc. flags
- use standard O_WRONLY etc. flags instead of LIO_WRITE; but avoid the
need for specifying O_CREAT|O_TRUNC
- only open files for aio when O_DIRECT is specified (which 0ad does
not) - avoids wasting time and security issues
- return file descriptor directly instead of via output param
- waio: safer FCB mechanism that avoids mixing descriptors between lowio
and aio

This was SVN commit r9550.
2011-05-25 10:39:13 +00:00
7600c3862b refactor gfx detection code (interface), allow exporting from DLL (required at work)
This was SVN commit r9546.
2011-05-24 14:17:47 +00:00
f1a1f023df reinstate aligned_allocator.h (required at work)
further fixes to preserve the last error while building error messages
somewhat more accurate NUMA factor computation

This was SVN commit r9545.
2011-05-23 14:10:45 +00:00
84030de9b7 Fix compile error with Boost 1.39 (ambiguous overloads)
This was SVN commit r9536.
2011-05-20 14:45:04 +00:00
1075e206f7 Fix some format string errors
This was SVN commit r9534.
2011-05-18 19:10:36 +00:00
6539456746 Fix format string
This was SVN commit r9524.
2011-05-15 19:52:46 +00:00
f4b55a9acf Fix non-PCH build
This was SVN commit r9523.
2011-05-15 19:51:33 +00:00
0ea42d3185 avoid stomping on the last error while dumping stack
refs #849

This was SVN commit r9519.
2011-05-15 00:00:01 +00:00
45d358dd9a add code to output both affected paths in case separators are being mixed
This was SVN commit r9516.
2011-05-14 20:25:32 +00:00
05688548d0 Fix a bogus Doxygen comment
This was SVN commit r9513.
2011-05-14 17:27:14 +00:00
a976045f0f Report filename in Collada warning messages.
Skip harmless warnings about missing materials in Collada files.

This was SVN commit r9512.
2011-05-14 16:43:08 +00:00
963960fafa no longer warn when SetFileValidData fails, as it does on all FAT volumes (boo)
fixes #849

This was SVN commit r9511.
2011-05-14 10:37:42 +00:00
edd8ef2bf2 Fix units in formation blocking construction and not moving out of the way (see #779).
Make non-movement-blocking buildings (e.g. farms) not require units to
move out of the way.

This was SVN commit r9510.
2011-05-13 20:32:41 +00:00
c41b7904d2 Fix burst of particles when starting to construct a building.
Fix crash when particle XML loading failed.

This was SVN commit r9509.
2011-05-13 19:36:56 +00:00
b741feafb1 Add global deepcopy() function in scripts, to do a structured clone of objects.
Remove an unused include.

This was SVN commit r9506.
2011-05-12 23:50:42 +00:00
1420a229ff Fix various position-related errors with garrisoned units.
Fix some formatting consistency.

This was SVN commit r9494.
2011-05-09 02:02:00 +00:00
452670738a fix StatusDescription (remove unnecessary and wrong cast)
This was SVN commit r9489.
2011-05-08 20:09:31 +00:00
9b7cdef124 ensure WHRT debug messages are always displayed (in case of compatibility trouble)
refs #709

This was SVN commit r9485.
2011-05-08 09:14:21 +00:00
7ed9a84252 avoid double-free when sounds are reclaimed and then freed.
fixes #833

This was SVN commit r9477.
2011-05-07 17:34:47 +00:00
b82913ea14 make explicit that both iterator debugging and _SECURE_SCL (which is less than iterator debugging) are disabled in release builds
This was SVN commit r9476.
2011-05-07 16:46:28 +00:00
46e5db4dc4 fix build with ICC
This was SVN commit r9475.
2011-05-07 15:47:20 +00:00
c49f4c677b Fix bogus error messages when errno=0
This was SVN commit r9472.
2011-05-07 00:14:43 +00:00
5bda00c230 Fix test
This was SVN commit r9471.
2011-05-07 00:14:17 +00:00
cd7abda9f1 Handle triple-click selections a bit more efficiently
This was SVN commit r9467.
2011-05-06 22:22:56 +00:00
b2bf04c5ae Reduce projectile decay time
This was SVN commit r9466.
2011-05-06 21:53:33 +00:00
e90470020b Try to make the pathfinder less likely to get stuck
This was SVN commit r9465.
2011-05-06 21:52:15 +00:00
f608b44d1d fix self-test and map load on Windows (avoid mixing dir separators).
add more specific error codes (used at work)

This was SVN commit r9462.
2011-05-06 18:45:30 +00:00
0a7aeb23f7 smbios fix
This was SVN commit r9458.
2011-05-06 14:54:46 +00:00
1da3cdb498 Fix build errors
This was SVN commit r9453.
2011-05-05 20:24:22 +00:00
a8c087d46b Missing files
This was SVN commit r9451.
2011-05-05 20:07:51 +00:00
45426ac21c Probably fix build error
This was SVN commit r9450.
2011-05-05 18:06:36 +00:00
a7aed9957d Build fix
This was SVN commit r9448.
2011-05-05 16:24:06 +00:00
5c76bc12fa refactor status code definitions: allow modules to define an array of them (more convenient+efficient).
merge ERR::NO_SYS, NOT_IMPLEMENTED into NOT_SUPPORTED
renderer: remove unnecessary ogl_shader include

This was SVN commit r9447.
2011-05-05 13:03:34 +00:00
fd561cb88b hotloading fix on Windows
refs #781

This was SVN commit r9446.
2011-05-05 10:50:47 +00:00
a741fb2f33 fix ChooseCacheSize - more simple, no longer relies on available-memory reporting (because Linux has a weird understanding of "available")
closes #611, refs #832

This was SVN commit r9445.
2011-05-05 09:53:07 +00:00
508f56d2dd Fixes bug in triple-click unit selection for units without a SelectionGroupName defined. In this case, triple-click will behave the same as double-click.
This was SVN commit r9444.
2011-05-05 02:06:53 +00:00
26de01cdd1 Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
Adds modifier hotkey to select units offscreen.
Fixes #826.

This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
dcec9c4ca9 gracefully handle the case where the file cache is full of data still referenced elsewhere.
fixes #832

This was SVN commit r9437.
2011-05-04 22:19:38 +00:00
fffcdbbf21 Balances random map resources.
Attempts to avoid "invalid argument" errors in typed arrays by forcing
them to integer (see #658).
Removes script preloading from map generator (VFS is thread-safe now)
Removes thread checking from ScriptInterface file loading functions.
Adjusts starting entities in civ data.

This was SVN commit r9435.
2011-05-04 21:24:25 +00:00
fa16181e84 Fix build error in tests.
Don't call wrealpath on the value returned by GetArg0, since it breaks
the tests and changes the semantics of that function.

This was SVN commit r9427.
2011-05-04 14:40:14 +00:00
b560ff5fb7 Fix warning from cccd6849a7
This was SVN commit r9426.
2011-05-04 14:18:16 +00:00
9719432ff9 fix memory leak (wasn't freeing the entire chain of SMBIOS structures)
This was SVN commit r9425.
2011-05-04 13:08:09 +00:00
a7152270f4 Path now goes to some trouble to prevent mixing / and \ slashes (causes trouble when hotloading, and some Windows APIs can't handle it, either)
WARNING: that means stuff like Path(nativeDataPath/"art/") is forbidden
and will raise errors on Windows when nativeDataPath contains \. always
use /"" to add a trailing slash. never embed "/" in OsPath component
strings (it's OK for VFS strings since they consistently use /).

wdir_watch, CmdLineArgs: avoid mixed separators
wutil: remove overzealous assertion (infinite recursion if an error
arose before we create a window)

refs #781

This was SVN commit r9424.
2011-05-04 12:16:51 +00:00
7523894760 ENSURE(0) -> DEBUG_WARN_ERR(ERR::LOGIC) (a bit smaller, and more descriptive)
This was SVN commit r9423.
2011-05-04 12:10:17 +00:00
9733affb05 Fix non-PCH build
This was SVN commit r9419.
2011-05-04 01:17:09 +00:00
178a700c16 Fix build
This was SVN commit r9412.
2011-05-03 15:58:25 +00:00
cce3bebe0c fix error propagation/avoid SetLastError pollution
This was SVN commit r9411.
2011-05-03 13:46:35 +00:00
cccd6849a7 cleanup (requires update-workspaces)
lib_errors.cpp: replace with status.cpp, adapt to needs at work
wutil: fix runtime warning reported via feedback box
config: merge CONFIG_PARANOIA and !CONFIG_FINAL into
CONFIG_ENABLE_CHECKS
add openmp, pointer_typedefs.h

This was SVN commit r9410.
2011-05-03 12:38:42 +00:00
333c62a490 Report errors in GL limit detection properly.
Report slightly more detailed RAM and CPU data.

This was SVN commit r9405.
2011-05-02 23:46:56 +00:00
674eaa1283 Latest version of user-report server code
This was SVN commit r9393.
2011-05-02 15:47:12 +00:00
88c44c7d73 smbios: add support for structures 34,35,36,39,41 (found on rather new BIOS)
This was SVN commit r9377.
2011-05-01 12:18:45 +00:00
b371686fb7 Rename class to prevent conflict between generated auto_ptr symbols in Atlas and engine
This was SVN commit r9371.
2011-04-30 21:08:53 +00:00
1636f062a3 make VFS thread-safe, per long-standing request by Philip
This was SVN commit r9369.
2011-04-30 15:57:43 +00:00
635c2a12e2 add error code for file not found. return error code from io::Load, warn and return from io::Store (both without triggering assertions).
remove out of date comment in io.cpp
fixes #811

This was SVN commit r9368.
2011-04-30 15:41:19 +00:00
3ac72813ef Relinquish CPU when running RMS scripts, to speed up loading on single-core machines
This was SVN commit r9366.
2011-04-30 15:18:11 +00:00
791ecee26b Build fixes
This was SVN commit r9365.
2011-04-30 13:55:55 +00:00
5ca66fc757 cleanup: move ADTs into lib/adts (separate files). fix definition of ASSERT
This was SVN commit r9364.
2011-04-30 13:35:36 +00:00
0720025073 cleanup
reduce dependency on PCH. move KiB constants to alignment, ARRAY_SIZE to
code_annotation.h.
move glext_funcs.h to external_libraries/glext_funcs.h, move part of
ogl.h to external_libraries/opengl.h
remove unused saturating arithmetic functions

This was SVN commit r9363.
2011-04-30 13:22:46 +00:00
4663ac0fe7 split debug_assert into ENSURE and ASSERT as discussed in a previous meeting.
the old debug_assert always ran and tested the expression, which slows
down release builds. wrapping them in #ifndef NDEBUG is clumsy. the new
ASSERT behaves like assert and ENSURE like the old debug_assert. Let's
change any time-critical but not-super-important ENSURE to ASSERT to
speed up release builds. (already done in bits.h and unique_range.h)

This was SVN commit r9362.
2011-04-30 13:01:45 +00:00
6c915291cc cleanup (requires update-workspaces):
major refactor of wfilesystem - remove gotos and workaround for FAT file
times
replace more round_up of constants with Align<>
remove old unused allocators (STL aligned, matrix, some shared_ptr)
move allocator utils into separate headers.
remove lockfree, wterminal
avoid testing __cplusplus

This was SVN commit r9361.
2011-04-30 12:34:28 +00:00
188c020ae0 Fix reading outside buffer, when terrain alpha maps are 8-bit.
Change alpha map composite texture to 8-bit to avoid wasting memory.
Warn about non-square alpha maps.

This was SVN commit r9360.
2011-04-30 11:46:23 +00:00
9bdb54bc76 fix failure to preallocate disk space on Windows by always rounding up the file size regardless of the io::Parameters
This was SVN commit r9358.
2011-04-30 09:13:10 +00:00
e292c55e94 Delete warning-prone unused unusable event recording code
This was SVN commit r9355.
2011-04-30 00:06:30 +00:00
f22e40b64c Fix warning
This was SVN commit r9354.
2011-04-29 23:55:47 +00:00
335e7db6be Fix build more
This was SVN commit r9353.
2011-04-29 23:30:29 +00:00
34ba390a0d build fix for pre-C++0x compilers.
archive_zip, stream: work around possibly missing support for
std/tr1::bind in GCC by defining a functor manually
also renamed RVREF to RVALUE_REF and ensured RVALUE can convert from
both lvalue and rvalue.
io: avoid dodgy constants and possible overflow by using blockSize=0 to
indicate "don't split"

This was SVN commit r9352.
2011-04-29 22:55:35 +00:00
1139124451 Fix some build errors and warnings
This was SVN commit r9351.
2011-04-29 20:38:13 +00:00
2374caac3e major refactor of file/io and alignment code. requires update-workspaces
. completely rewrite waio - use IOCP, add several hardcore
optimizations. now outperforms the
  AS SSD and ATTO benchmarks when writing
. refactor file interface - use LIO_READ instead of 'r', allow access to
file descriptor.
. completely rewrite the IO wrapper. now much more simple, less CPU
overhead, adds
  support for pre-issue/post-completion hooks and preallocation.
  io::Run defaults to simple synchronous IO; use io::Parameters to get
asynchronous.
. add alignment.h with constants and Align() function template (more
efficient than
  round_up for compile-time constants)
. add UniqueRange - similar to C++0x unique_ptr (emulated for C++03),
plus a
  built-in size. avoids expensive thread-safe reference counting in
shared_ptr.

cleanup:
- move fat_time functions into archive_zip
- remove no longer needed io_align and block_cache
- reduce dependencies in sysdep/compiler (move parts to
code_annotation.h)
- move IOCP into separate file (reused by waio)

This was SVN commit r9350.
2011-04-29 19:10:34 +00:00
d96fefd4a4 Fix linker errors with GCC 4.6, and some warnings.
This was SVN commit r9346.
2011-04-29 16:32:58 +00:00
8af82baf67 # Minor particle system fixes.
Support emitters that are fully running as soon as the game starts.
Fix particle clumping when moving from off-screen to on-screen, by
computing updates more incrementally.
Fix overzealous culling of models with particle emitters.
Add particles to renderer stats.

This was SVN commit r9345.
2011-04-29 12:26:31 +00:00
67ca7461cd Adds Skip method to SGUIMessage which works more or less like wxEvent.Skip: GUI objects can allow other event handlers to process an input event after they finish.
Allows hotkey handling of mousewheel events after minimap. Fixes #673.
Adds SendEvent to GUI objects, used in place of separate calls to
HandleMessage and ScriptEvent.

This was SVN commit r9340.
2011-04-28 20:42:11 +00:00
9d5539a215 fix runtime check error - see http://www.wildfiregames.com/forum/index.php?showtopic=14656&pid=218675&st=0&#entry218675
thanks to Yves for reporting this + suggesting the fix.

This was SVN commit r9339.
2011-04-28 17:13:55 +00:00
4e74798585 Be more robust to visibility checks outside the map. Fixes #765.
This was SVN commit r9333.
2011-04-27 21:03:08 +00:00
e4b530fb1a Clean up some GL state explicitly
This was SVN commit r9331.
2011-04-27 20:12:58 +00:00
a872e4a6ad Attempt to fix reported GL error
This was SVN commit r9327.
2011-04-27 09:41:28 +00:00
2d0c183afb Fix use of uninitialised variable, causing errors randomly when GL_ARB_fragment_program_shadow is missing
This was SVN commit r9310.
2011-04-23 18:51:47 +00:00
2d04d78db8 Disable apparently buggy shader mode on r300c drivers. Fixes #780.
This was SVN commit r9308.
2011-04-23 17:06:27 +00:00
5a773d4ca0 Be robust to null proxy URL strings. Should fix #778.
This was SVN commit r9299.
2011-04-22 16:05:00 +00:00
c82d619cc4 Make decals only rotate around the Y axis, to avoid buggy stretched appearance when rotated non-horizontally
This was SVN commit r9298.
2011-04-22 13:19:23 +00:00
91ad17c685 Fix entity ID association with animations. Fixes #790.
This was SVN commit r9286.
2011-04-20 00:04:05 +00:00
6d946cc58d Fix badly-named variable
This was SVN commit r9285.
2011-04-20 00:02:59 +00:00
b35d3a5e3d __cpuidex was added in VC2008 SP1, so don't use it if pre-SP1
This was SVN commit r9284.
2011-04-19 23:23:16 +00:00
7ec3266da5 Fix assertion failures when running RMS in debug mode
This was SVN commit r9282.
2011-04-18 17:10:57 +00:00
458cfbf48c Fix 64-bit build error
This was SVN commit r9279.
2011-04-16 22:57:00 +00:00
b4503bb61e Simplifies random map output, see #782.
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
481f570a0e CMapGeneratorWorker thread safety issue. Fixes #783.
VFS access moved to main thread, where random map scripts are preloaded
and stored prior to use by the worker thread.
Adds LoadGlobalScript to ScriptInterface, for evaluating script content
in the global scope.

This was SVN commit r9261.
2011-04-15 05:23:51 +00:00
f072b47dc1 Warn earlier about some non-thread-safe calls.
This was SVN commit r9252.
2011-04-14 14:28:24 +00:00
57e6980465 Fix 64-bit build. Avoid using variable-sized types in Atlas message interface.
This was SVN commit r9251.
2011-04-14 14:27:42 +00:00
bf53b6f3b5 This was SVN commit r9248. 2011-04-14 04:16:06 +00:00
ad6f305359 Integrates random maps with Atlas. Fixes #460.
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.

This was SVN commit r9247.
2011-04-14 04:01:59 +00:00
73add20727 Load original Pagella .otf font with hinting explicitly disabled, instead of loading via .ttf
This was SVN commit r9243.
2011-04-13 22:15:04 +00:00
5a8d291403 Remove old vertexshader renderpath option from Atlas
This was SVN commit r9236.
2011-04-13 18:28:27 +00:00
818b02b0fc Fixes a few error cases in the map generator.
This was SVN commit r9224.
2011-04-10 22:21:15 +00:00
942a45372c Random maps generated in their own thread, loading GUI is updated with progress.
Fixes some bugs in game loader error handling.

This was SVN commit r9220.
2011-04-10 05:31:18 +00:00
469d0fe5c5 Remove rmgen tool.
Log error description when sound engine fails (instead of cryptic
LibError code).

This was SVN commit r9219.
2011-04-10 00:54:15 +00:00
a3812af176 smbios: avoid warning when no information is returned (happens on 32-bit XP)
This was SVN commit r9218.
2011-04-09 17:09:48 +00:00
c59f7bcb8f Fix Clang warning ("operands of ? are integers of different signs")
This was SVN commit r9214.
2011-04-09 00:07:21 +00:00
bd0063607a Fix build in Clang
This was SVN commit r9213.
2011-04-09 00:05:37 +00:00
7a8aefae34 Fix release-mode warnings in unused code
This was SVN commit r9212.
2011-04-09 00:05:00 +00:00
d46a892a5d smbios: avoid displaying unknown maxError value; add enumerators for BIOS characteristics and extended characteristics
This was SVN commit r9207.
2011-04-08 07:10:31 +00:00
8f6fda9626 Deallocate expired projectiles properly
This was SVN commit r9205.
2011-04-08 00:11:27 +00:00
50e30ae8af Be more explicit about function types in font builder to fix crash
This was SVN commit r9201.
2011-04-07 19:59:34 +00:00
5b7dbe6bc9 smbios: more convenient interface that avoids having to check if the structures pointer is null (can still detect failure by checking whether all/guaranteed member pointers are zero)
This was SVN commit r9200.
2011-04-07 19:35:45 +00:00
b5c6868ac2 smbios SystemSlot fix: add missing field, avoid displaying unknown device/function numbers
This was SVN commit r9199.
2011-04-07 19:28:24 +00:00
aab98f90e0 Fix startup crash on non-Windows
This was SVN commit r9197.
2011-04-07 17:22:28 +00:00
e1b9083c41 Fix probable OS X build error
This was SVN commit r9196.
2011-04-07 17:18:32 +00:00
99aa427ffa make use of SMBIOS information to detect CPU frequency and memory size
smbios fixes: also ignore max value (used by Dell BIOS to report invalid
MemoryDevice bit width); fix incorrect error check that caused 0 to be
returned on all but the first call; add implicit conversion operator to
allow using size without appending .value

This was SVN commit r9195.
2011-04-07 17:06:00 +00:00
e5e9e38532 Fix GCC 4.6 "set but not used" warnings
This was SVN commit r9194.
2011-04-07 16:34:51 +00:00
2b138f47db Handle map loading errors in autostart and normal setup modes. Adds TODOs for Atlas and Replay modes. See #764.
Fixes loading screen 'title'.
Fixes broken autostart behavior for random maps and multiplayer games.

This was SVN commit r9193.
2011-04-07 02:32:16 +00:00
ed62b49a74 Renderer simplification: Remove now-unused texgen stream.
This was SVN commit r9190.
2011-04-06 22:09:58 +00:00
1866c2d3b7 Renderer simplification: Remove non-FBO shadow mode.
This was SVN commit r9189.
2011-04-06 22:08:51 +00:00
a1eb830f2c Renderer simplification: Remove old non-depth-texture shadows.
This was SVN commit r9188.
2011-04-06 22:08:07 +00:00
7339a346e3 Renderer simplification: Remove fixed-function shadowing. Remove now-unused diffuse-only model lighting mode.
This was SVN commit r9187.
2011-04-06 22:07:13 +00:00
8753f881ee Renderer simplification: Remove old vertexshader path.
This was SVN commit r9186.
2011-04-06 22:02:05 +00:00
06903af31f Fixes build warning in C/C++ preprocessor (moves initialization outside test expression)
This was SVN commit r9185.
2011-04-06 21:47:42 +00:00
a122f55bde Avoid hardcoding the actor entity template details.
This was SVN commit r9183.
2011-04-06 21:01:00 +00:00
df4b74ccf6 Render animationless skeletal meshes in their bind pose at their current position, instead of rendering at the world's origin.
This was SVN commit r9182.
2011-04-06 13:49:05 +00:00
3fb9d9e5f6 Fix tests
This was SVN commit r9178.
2011-04-06 00:53:35 +00:00
e9cc697c2b Animate particles in the default editor view
This was SVN commit r9177.
2011-04-06 00:22:07 +00:00
d03559f2c9 Add dust particles on under-construction buildings, varying based on number of active builders.
This was SVN commit r9175.
2011-04-06 00:11:40 +00:00
2fd4c62cbb Remove some unused variable declarations
This was SVN commit r9174.
2011-04-06 00:04:35 +00:00
29dd635d3b Fix decals and LOS texture in Actor Viewer, by slightly reducing use of globals.
Fix particles in Actor Viewer.
Expand terrain in Actor Viewer.
Change background to black so it blends with the LOS texture more
nicely.

This was SVN commit r9172.
2011-04-05 20:32:03 +00:00
329d044a9e 64-bit gcc warning fix
This was SVN commit r9171.
2011-04-05 19:49:04 +00:00
dcde67038f ICC compile fixes (VC's overload resolution is apparently quite different)
This was SVN commit r9169.
2011-04-05 17:45:47 +00:00
1c2e410b7d final smbios improvements.
add comments
add support for bit flags
use wrapper classes and SFINAE instead of flags to detect enums / sizes
/ handles
avoid potential truncation of byte sizes
avoid displaying numeric_limits::min values ("unknown")

This was SVN commit r9168.
2011-04-05 17:14:18 +00:00
d3ba9a24d3 Fix GCC build errors ("explicit template specialization cannot have a storage class",
"need 'typename' before 'static_assert_<...>::type' because
'static_assert_<...>' is a dependent scope").
Fixes #767.

This was SVN commit r9167.
2011-04-05 17:07:06 +00:00
3dbb29d665 smbios improvements: add specializations for bool/Handle (no longer requires a flag); omit empty/meaningless fields
convert remaining enumerators to ENUM, lowercase them to avoid conflicts
with macros, wrap them in struct to allow identical enumerator names

This was SVN commit r9165.
2011-04-05 09:52:57 +00:00
f35da41a0c smbios: minor fixes, add partial support for displaying enumerator names, move visitors to .cpp, use pragma pack regardless of compiler
This was SVN commit r9163.
2011-04-04 17:44:36 +00:00
68bc0a5651 smbios: add support for stringizing the structures
This was SVN commit r9162.
2011-04-04 16:50:02 +00:00
a2bad46f27 smbios fixes:
- memmove all bytes in the table, not just 8
- end pointer was off by 4
- add support for structures 8,10,22,26,27,28

This was SVN commit r9161.
2011-04-04 15:01:40 +00:00
6beb1ea89b Exclude FCollada tests from Unix releases, since they rely on non-free data file Eagle.DAE
This was SVN commit r9160.
2011-04-04 14:20:16 +00:00
1abbf8b64b Old changes to compress releases better
This was SVN commit r9159.
2011-04-04 14:17:39 +00:00
0ddf2b0f34 Fix build on VC2008
This was SVN commit r9157.
2011-04-03 21:41:17 +00:00
66807d40c1 windows build fix: use arb names/function pointers; +noncopyable/struct vs. class warning fix
This was SVN commit r9156.
2011-04-03 20:45:43 +00:00
3d21cf98f9 better aio error checking / avoid unnecessary repeated calls to aio_error (investigated on the occasion of the recent Linux aio trouble)
This was SVN commit r9155.
2011-04-03 20:07:55 +00:00
231387d2da linux compile fix (explicit instantiation must be at namespace scope), adjust end pointer to match 8 bytes removed in workaround
This was SVN commit r9153.
2011-04-03 19:29:16 +00:00
823e63a93b # Initial version of new particle system.
This was SVN commit r9151.
2011-04-03 19:15:15 +00:00
01a0825c94 disable aio on linux until the glibc aio implementation and/or kernel is fixed (see http://www.wildfiregames.com/forum/index.php?showtopic=14561&pid=217711&st=0&#entry217711)
This was SVN commit r9150.
2011-04-03 19:07:35 +00:00
253efdad57 Delete non-working particle system code
This was SVN commit r9147.
2011-04-03 18:49:48 +00:00
09413d940c Delete an obsolete particle system editor
This was SVN commit r9145.
2011-04-03 18:44:20 +00:00
2c72e1f364 (requires update-workspaces)
add initial SMBIOS implementation for retrieving system information
wacpi -> wfirmware (now also used to retrieve SMBIOS table)

This was SVN commit r9144.
2011-04-03 15:38:48 +00:00
1a072a3f37 Use a predictable RNG seed for random actor variations, so they are consistent between runs of the game.
This was SVN commit r9143.
2011-04-02 12:51:42 +00:00
97c934ad1c Apply unit shading colour in shader renderpath.
Don't adjust the shading colour of units in FoW (the shading comes from
the LOS texture instead).

This was SVN commit r9142.
2011-04-02 12:04:19 +00:00
012c47057a Optimise some matrix operations, based on patch from ortalo.
Fixes #750.

This was SVN commit r9141.
2011-04-01 18:33:47 +00:00
ce85f4e825 Fix minimap ignoring GUI z-ordering.
This was SVN commit r9139.
2011-04-01 17:58:33 +00:00
5b7a23f75c Make ResetCameraTarget more sensible if the camera was rotated.
This was SVN commit r9138.
2011-04-01 17:57:04 +00:00
6026330fce updated version of Aken that includes support for MSR and static validation (-> .c instead of .cpp)
closes #754 (please re-open if not)

This was SVN commit r9137.
2011-04-01 15:06:52 +00:00
d5b3201bfe noted while checking MSR prerequisites that the previous HasNehalem is inaccurate. PLATFORM_INFO is also supported by newer processors (e.g. Sandy Bridge), whereas UNCORE_* are tied to Nehalem and Westmere => split up HasNehalem into HasPlatformInfo and HasUncore. (the latter has been replaced by a "system agent" in newer designs)
refs #754

This was SVN commit r9136.
2011-03-31 21:30:42 +00:00
1014da1f88 Use pool allocator to avoid apparently expensive dynamic allocations when rendering terrain.
Add function to get pool usage, for debugging.

This was SVN commit r9132.
2011-03-30 21:42:35 +00:00
fb872e0bd5 fix: update all pool freelist initializations to reflect the new invariant (prevents null-pointer dereference crash)
This was SVN commit r9129.
2011-03-28 21:10:41 +00:00
c396997009 fixes from work: avoid potential 0-pointer dereference in freelist, also avoid branching in freelist functions via sentinel
wdll_main.h: avoid warning for DLLs using TLS
file_system_util.h: export functions

This was SVN commit r9128.
2011-03-28 12:28:29 +00:00
53f522d220 Fix warning
This was SVN commit r9124.
2011-03-26 20:38:42 +00:00
d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program.
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
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
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
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
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
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
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
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
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
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
9659ec298b Fix off-by-one error in date logging, and rearrange to standard format.
This was SVN commit r9065.
2011-03-15 20:29:29 +00:00
e70fae8d80 Stop using glMultiDrawElements since it's too buggy
This was SVN commit r9064.
2011-03-14 21:57:09 +00:00
099dbdb24a Fix use of uninitialised variable
This was SVN commit r9063.
2011-03-14 21:54:44 +00:00
5fa577ea25 Attempt to fix shadowAlphaFix to generate FBOs in a more widely supported format
This was SVN commit r9062.
2011-03-14 02:50:43 +00:00
612539f109 Don't bother creating shadow textures if shadows are disabled
This was SVN commit r9061.
2011-03-14 02:49:53 +00:00
8bb5f2e480 Add missed file
This was SVN commit r9057.
2011-03-13 19:44:06 +00:00
d24c93237c # Initial version of terrain decal textures.
Rejig CModel to support non-mesh-based props.
Avoid redundant recomputation for non-moving CRenderableObjects.

This was SVN commit r9055.
2011-03-13 19:22:05 +00:00
ba8163e248 # Explicitly triangulate terrain tiles.
Store blend splats as indexed triangles.
Remove unnecessary copy of vertex data.
Fixes #169.

This was SVN commit r9054.
2011-03-13 19:10:38 +00:00
fc2c54c39f # Optimise terrain renderer.
Batch patch splats by texture match.
Use VBOs for patch indices.
Fixes #722.

This was SVN commit r9053.
2011-03-13 19:06:33 +00:00
2f28b07356 Support storing index data in VBOs.
Use index VBOs in model renderers, for performance.
Be more explicit about static/dynamic VBOs.
Add VBO usage to renderer stats.
Clean up some obsolete unused code.

This was SVN commit r9052.
2011-03-13 18:58:09 +00:00
b70a0a5b5a Latest version of user-report server code
This was SVN commit r9051.
2011-03-12 02:36:20 +00:00
a0a245d0ec sync with work. add u8_from_larger, sys_IsDebuggerPresent, wdll_main.h;
robustify waio file mode and remove a safety check (since
OVERLAPPED.Internal is documented to be subject to change)

This was SVN commit r9050.
2011-03-11 16:29:27 +00:00
51b58328f7 Fix negative 'unlogged' time in profiler at start of game.
Remove redundant Reset call.

This was SVN commit r9047.
2011-03-08 16:58:07 +00:00
18f44bebbc Add workaround for missing tree shadows on certain graphics drivers
This was SVN commit r9042.
2011-03-07 00:34:03 +00:00
b4d9ab336b Simplify hiding of system cursor on non-Windows.
Fixes #683.

This was SVN commit r9038.
2011-03-06 00:48:26 +00:00
7d6cfe58de Fix non-PCH build
This was SVN commit r9037.
2011-03-06 00:01:23 +00:00
6f9da85d9f Improve performance of full state hash computation, by skipping script components that are known to have no data.
Switch to much quicker (and less comprehensive) per-turn hashing in
multiplayer games.

This was SVN commit r9036.
2011-03-05 22:30:32 +00:00
18cdbd9eab Increase tile-based pathfinder maximum search range, so it's at least enough to reach from one side of Acropolis to the other
This was SVN commit r9026.
2011-03-05 14:38:08 +00:00
d3929b6af1 Actually, delete the cpuid() inline asm entirely since it still causes various problems in various compilers
This was SVN commit r9024.
2011-03-05 14:11:57 +00:00
712a92caa1 Save PIC register in cpuid() to fix "can't find a register in class 'BREG'" error in some versions of GCC
This was SVN commit r9023.
2011-03-05 13:53:02 +00:00
18798c3f8d OS X build fix
This was SVN commit r9022.
2011-03-05 13:49:36 +00:00
e608d9269a Load entity templates for the AI via the progressive loader.
Display message while loading the map list for the setup screen.

This was SVN commit r9019.
2011-03-05 01:56:59 +00:00
2229c10e05 Delete rint/rintf emulation for Windows, since it got broken (the tests fail) and we don't use it any more
This was SVN commit r9015.
2011-03-04 23:16:04 +00:00
3a5ca7fdbc Improve camera restraints at edge of map to be independent of zoom, and to work on circular maps.
Fixes #573.

This was SVN commit r9011.
2011-03-04 20:02:05 +00:00
bec4c6437b Make non-combat units flee when under melee attack, and not attack enemies automatically.
Fixes #703.

This was SVN commit r9010.
2011-03-04 14:36:41 +00:00
2ef1b9a867 Make projectiles that miss their target continue until hitting the terrain.
Fixes #706.

This was SVN commit r9008.
2011-03-04 00:43:48 +00:00
6bcce22a88 Tell the profiler about a few more bits of code
This was SVN commit r9007.
2011-03-03 22:38:01 +00:00
58ae08522f Let local.cfg override the hardware-dependent defaults set by hwdetect
This was SVN commit r9005.
2011-03-03 01:49:49 +00:00
1c1564daaf Make profiler JSON output much more concise.
Right-align values in in-game profile viewer.
Add alternating row shading in profile viewer, to make it easier to
read.

This was SVN commit r9004.
2011-03-03 01:09:19 +00:00
16a4eb36dd Various minor optimisations.
Enable SpiderMonkey method JIT in Release mode.
Add Engine.ProfileStart/Engine.ProfileStop functions for scripts.
Fix AI to clone initial entity data and shared metadata.

This was SVN commit r9003.
2011-03-03 00:16:14 +00:00
8d2d4a8505 Fix profile parser
This was SVN commit r9002.
2011-03-03 00:14:23 +00:00
dbc6d27411 Optimise obstruction grid updates in the common case when terrain hasn't changed
This was SVN commit r9001.
2011-02-28 01:24:12 +00:00
794584ea11 Optimise tile-based pathfinder, particularly for large maps.
This was SVN commit r9000.
2011-02-28 00:35:53 +00:00
cb0e322a61 # Minor AI fixes.
Avoid script errors on Miletus.
Use pre-existing female citizens as workers.
Fix autostart.

This was SVN commit r8999.
2011-02-27 19:20:36 +00:00
d045258c29 Let exceptions in GUI script events triggered by script setters propagate out of the setter, so error messages aren't useless.
This was SVN commit r8997.
2011-02-27 17:57:32 +00:00
eb163c8d24 Improve reporting of extensions promoted into GL 1.2
This was SVN commit r8996.
2011-02-27 14:25:04 +00:00
407b1ef80f Bump hwdetect version, to identify reports that include recent bugfixes
This was SVN commit r8992.
2011-02-26 19:41:01 +00:00
bb562ce179 fixes:
avoid reporting a (not-present) third-level cache for Athlon X2 that
don't have one
add better documentation of cache information
ensure we're running on the same CPU while retrieving cache/TLB
descriptors
wgfx: always check all known graphics driver names (more robust in the
face of changing gfx_card strings), correct the intel driver name

This was SVN commit r8991.
2011-02-26 19:22:02 +00:00
567a698628 check all file names known to belong to a GPU's drivers instead of trying to rule out 32/64 bit variants
fixes #737

This was SVN commit r8990.
2011-02-26 17:10:09 +00:00
6d7c27edfe Fix occasionally rendering just terrain and no models when starting a game
This was SVN commit r8988.
2011-02-26 00:07:16 +00:00
92e84a9112 Fix keys like F11 triggering two events when sent from Atlas to the game engine
This was SVN commit r8987.
2011-02-25 23:53:09 +00:00
f0ea32cb8d Import user-report server side code
This was SVN commit r8986.
2011-02-25 19:46:01 +00:00
4e8c305c6e sync with work - export app_hooks_update; add boost replacement FileExists and FileSize; avoid conflict with stdint.h;
remove asm rintf implementation (sse is faster); avoid the need for an
external 64-bit asm file with vc2008/vc2010; allow arbitrarily long
command line args

This was SVN commit r8985.
2011-02-25 16:31:42 +00:00
d805ef356e FileExists -> VfsFileExists (see next commit)
scriptInterface: fix bool cast warning

This was SVN commit r8984.
2011-02-25 16:30:55 +00:00
77fe5c9e40 Disable shadows and fancy-water by default on some slower graphics devices.
See #623.

This was SVN commit r8983.
2011-02-25 02:00:57 +00:00
a903b4c9d3 Fix #684 (disable S3TC on R600 drivers).
Clean up hwdetect a tiny bit.

This was SVN commit r8982.
2011-02-25 01:31:00 +00:00
0378500bdc Fix #712 (remove S3TC warning).
Add timer to S3TC decoder so it's still easy to determine if it was
used.

This was SVN commit r8981.
2011-02-25 01:28:46 +00:00
f4f36af852 Block new buildings being placed on top of existing not-yet-started foundations. Fixes #740.
This was SVN commit r8980.
2011-02-24 21:49:24 +00:00
e16681f0e5 Fix destruction queue warnings when using some GUI features with time-warp enabled
This was SVN commit r8976.
2011-02-24 02:05:06 +00:00
f6c1d98c9a Fix #739 (test failures).
Use JSON in debug serializer output unless it fails due to e.g. cyclic
values, in which case use toSource.
Disable file stats code by default, since its output isn't used.

This was SVN commit r8975.
2011-02-24 00:32:38 +00:00
059a53dd37 Fix startup hang on OS X, caused by using timers before initialising them
This was SVN commit r8974.
2011-02-23 09:19:41 +00:00
6b783aebd6 Try to fix build errors
This was SVN commit r8973.
2011-02-22 21:50:26 +00:00
0c1e05d672 Fix typo
This was SVN commit r8972.
2011-02-22 20:15:59 +00:00
e370223d1d Fix register handle leak
This was SVN commit r8971.
2011-02-21 22:25:51 +00:00
abe07e096a Build fix
This was SVN commit r8970.
2011-02-21 22:22:49 +00:00
9bbda8b80b HTTP proxy discovery for Windows
This was SVN commit r8969.
2011-02-21 21:54:47 +00:00
25039d3aff Fix build errors with old glext.h.
Report full cache details, and lsb-release when available.

This was SVN commit r8968.
2011-02-21 18:56:23 +00:00
ee8b193cdb Fix profiler crash differently
This was SVN commit r8967.
2011-02-21 11:57:01 +00:00
a155809447 avoid crash due to null pointer in profiler (triggered by returning from the root node)
This was SVN commit r8966.
2011-02-21 09:41:11 +00:00
8f59d52697 sync with work; fix compile error due to lack of boost/serialization in 0ad svn
This was SVN commit r8965.
2011-02-21 09:23:51 +00:00
d75d9c3b75 Make the script profiler more useful, by giving the filename/line for anonymous functions.
Fix the turn-based profiler a bit.

This was SVN commit r8964.
2011-02-21 02:16:12 +00:00
807663cd54 Fix uninitialised value
This was SVN commit r8961.
2011-02-20 20:52:35 +00:00