1
0
forked from 0ad/0ad
Commit Graph

4593 Commits

Author SHA1 Message Date
08e37f1a71 Avoid potential aliasing violation in endian functions
This was SVN commit r10428.
2011-10-25 14:02:50 +00:00
a3c03815c0 Experimental quicksave/quickload feature
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
29e4f633f1 Add initial serialization test mode.
Reduce some dependencies on CSimulation2 to provide more flexibility.

This was SVN commit r10426.
2011-10-24 14:31:05 +00:00
0f3119e36a Fix deserialization of actor components
This was SVN commit r10425.
2011-10-24 12:24:04 +00:00
f4ed019c46 Avoid hypotf
This was SVN commit r10421.
2011-10-23 12:27:34 +00:00
bd73308d49 Avoid apparent bug in VirtualBox's GL implementation
This was SVN commit r10419.
2011-10-22 10:25:09 +00:00
d966c5e10b Fixes Atlas map saving to force PMP extension on all OSes. See #889.
Fixes Atlas map loading to more gracefully handle missing files. Atlas
should no longer crash if a map was not found in VFS. Fixes #986.

This was SVN commit r10416.
2011-10-20 23:45:27 +00:00
ff256528f2 sync with work. faster PopulationCount; avoid invalid param handler when debug string length exceeded; return error instead of dialog box when waio_Preallocate fails
This was SVN commit r10414.
2011-10-19 10:58:02 +00:00
8af8326563 replace old pool_allocator/RawPoolAllocator with ProxyAllocator that draws upon the new-style Arena (more efficient, avoids slow VirtualAlloc)
This was SVN commit r10410.
2011-10-16 10:37:21 +00:00
1c081135ad Adds territory map to AI GameState, based on patch from quantumstate. Fixes #969.
Updates testbot and Jubot to support basic build restrictions.

This was SVN commit r10408.
2011-10-16 02:55:58 +00:00
6c102ea712 add instrumentation to diagnose failed VM commit
This was SVN commit r10405.
2011-10-15 22:03:42 +00:00
3624f7c417 fix: pthread_self now returns a unique value in each thread (before, it was using the windows pseudo handle functionality)
This was SVN commit r10404.
2011-10-15 20:12:59 +00:00
f0df97d773 add support for retrieving all WMI class instances (required for detecting multiple graphics and sound cards)
fixes #998

This was SVN commit r10399.
2011-10-13 18:53:59 +00:00
0fa54bc56a fix compile error due to GCC restriction.
thanks to daniel.santos for reporting and alex for creating the
ticket/notifying me.
fixes #992

[heh, the amount of comments are proportional to the trouble caused by
this code :S ran into VC++ compile errors when __declspec came after
void* return type *sigh*]

This was SVN commit r10385.
2011-10-10 20:08:04 +00:00
8ac994e4e6 sync with work: add and use NOTHROW; export file_system functions; throw Status from File ctor; add WARN_THROW equivalents of WARN_RETURN
This was SVN commit r10384.
2011-10-10 10:04:36 +00:00
a106b9da0b apic: avoid warning message for ancient single-core, non-HT processors. fixes #985
wvm: improve diagnostics if allocation failed

This was SVN commit r10374.
2011-10-08 16:53:57 +00:00
39e5cb5dc9 proper fix for brain-dead Linux affinity API (that code was disabled in #547)
refs #985

This was SVN commit r10373.
2011-10-08 16:42:30 +00:00
0e39511b3a Attempts to fix random map OOS errors by avoiding parsing data to floats (uses CFixedVector3D instead). See #977.
Changes to rmgen API for consistency and support of 3D
position/rotation.

This was SVN commit r10326.
2011-09-26 21:36:33 +00:00
16f5016a1a sync with work: add compile-time BITS and CeilLog2 and optional IO instrumentation
This was SVN commit r10324.
2011-09-26 08:29:57 +00:00
0d708b31b4 avoid rare init-order bug when SRAT ACPI table is available AND APIC IDs are NOT
move APIC-related code to separate file, with its own initialization to
avoid circular dependency
fixes #976

This was SVN commit r10315.
2011-09-24 19:47:13 +00:00
7828544946 Attempts to fix ArchiveViewer build on OS X (use wxString::wc_str() to construct std::wstring).
This was SVN commit r10305.
2011-09-23 02:56:19 +00:00
9812ee2780 avoid error dialog when gamma upload fails twice (for reasons still unknown *sign*)
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=226211&st=50&#entry226211

This was SVN commit r10303.
2011-09-21 20:38:09 +00:00
08b4d96cf2 Moves Atlas UI to main thread while engine loop runs in new thread.
Fixes Atlas compatibility with OS X (wxOSX/Cocoa requires the UI to run
in the main thread). Fixes #500.
Fixes Windows shutdown to close COM library properly (and WMI).

This was SVN commit r10299.
2011-09-20 22:49:02 +00:00
80df13f47b add support for recursive mutex on windows; ensure h_mgr uses them (pthread doesnt guarantee default type is recursive)
This was SVN commit r10247.
2011-09-10 22:51:51 +00:00
78fe8e1e62 h_mgr: fix simple double-free warning triggered at shutdown when an object's child was freed AND the all objects were forcibly freed (complicated by the fact that the pool allocator overwrites freed storage, which made this appear to be a tag conflict).
fixes #860, #915, #920

This was SVN commit r10243.
2011-09-10 20:04:01 +00:00
c12d2ac0be This was SVN commit r10215. 2011-09-08 03:03:08 +00:00
9e2d97a9c0 Fixes actor viewer button (label didn't update after switching tools).
This was SVN commit r10214.
2011-09-08 03:00:56 +00:00
63c7d3d52f fix warning about missing registry key (happens on one system for unknown reasons)
see
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=225336&st=50&#entry225336

This was SVN commit r10202.
2011-09-07 19:15:20 +00:00
cb7a4f8b1a Hopefully fix replay mode
This was SVN commit r10175.
2011-09-02 23:47:26 +00:00
89532feab6 Fixes Atlas file open dialog on OS X (filters not shown by default in wxOSX 2.9).
This was SVN commit r10168.
2011-09-02 02:27:55 +00:00
90fdd26cf1 Sets default wxFileDialog filters in Atlas.
This was SVN commit r10159.
2011-09-01 04:47:45 +00:00
e8253249a2 Switches Atlas player panel to our custom ColourDialog for consistency.
This was SVN commit r10134.
2011-08-29 22:27:58 +00:00
fc7d303ee4 Adjusts Atlas sidebar and bottombar to look better on different platforms.
This was SVN commit r10133.
2011-08-29 22:12:20 +00:00
6366ad728f Fixes Atlas toolbar in wxOSX (only Realize() it after creation).
Fixes terrain preview not displaying first page in wxOSX.
Formats terrain page labels more nicely.
Adds a bunch of tooltips.

This was SVN commit r10131.
2011-08-29 03:50:29 +00:00
769a927446 Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9).
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X
(otherwise the canvas doesn't seem to update properly).

This was SVN commit r10129.
2011-08-28 21:10:45 +00:00
47e1e23721 Fixes bug on object panel (assert fail when map was loaded before the panel was displayed).
This was SVN commit r10123.
2011-08-28 05:57:09 +00:00
f2b61d2e56 Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error).
This was SVN commit r10118.
2011-08-28 00:28:06 +00:00
cd6ce56632 Fixes some Atlas button layouts with wxWidgets 2.9 (wxGridSizer seems preferable to wxBoxSizer for equally sized buttons).
This was SVN commit r10117.
2011-08-27 23:43:18 +00:00
8729d1115d Render territory borders in non-shader render path.
Add basic support for fixed-function implementations of shader API.

This was SVN commit r10106.
2011-08-27 14:31:24 +00:00
29dc9c3094 Fixes bug in Atlas player panel (AtIter definition must be checked before incrementing).
This was SVN commit r10102.
2011-08-26 22:58:55 +00:00
bb77e3a300 Changes player panel spin controls to use default style.
This was SVN commit r10099.
2011-08-26 22:11:30 +00:00
2d1fe050b9 Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6).
This was SVN commit r10095.
2011-08-26 01:56:14 +00:00
9a53cc1395 __SSE[2]__ didn't work on MSVC/ICC after all; introduce HAVE_SSE[2] instead
This was SVN commit r10089.
2011-08-24 09:23:44 +00:00
85336397a3 Don't render neutral territory borders on minimap.
This was SVN commit r10083.
2011-08-24 00:28:48 +00:00
13dc7a9210 Fix non-PCH build
This was SVN commit r10079.
2011-08-23 17:48:06 +00:00
e13aeee36c Report desktop display size (not just window size)
This was SVN commit r10065.
2011-08-22 22:34:59 +00:00
27e5581d27 Fixes Atlas player panel getting out of sync with simulation. Fixes #927.
Fixes object panel not being notified of map loading.
Fixes bug where opening a new map before using the player panel
prevented default player data being displayed for new players.
Fixes wxGTK 2.8 bug: wxChoicebook control doesn't update the choice
control when adding/removing pages.
Notifies player that deleting player in Atlas will delete all their
objects (and gives them the option).
Changes DeleteObject to DeleteObjects to support multiple selections.
Implements undo for map resize (experimental).
Removes annoying debug message from attempted undo of map settings.
Tweaks a few Atlas UI controls.

This was SVN commit r10064.
2011-08-22 21:45:39 +00:00
ed959b8da7 minor fixes: add missing arena.cpp; add required NONCOPYABLE annotation; fix UNUSED2 to work in the case of references.
This was SVN commit r10059.
2011-08-22 08:54:56 +00:00
6c859fc6bb add documentation on pointer types and RESTRICT as per yesterday's meeting
This was SVN commit r10053.
2011-08-21 15:09:09 +00:00
509f4387d7 Fix build
This was SVN commit r10052.
2011-08-21 13:10:44 +00:00
881d3cebf4 lay groundwork for more efficient and flexible allocators. add new sysdep/vm that provides access to additional features on Windows (large pages, autocommit). add Pool/Arena allocators that avoid overhead and support arbitrary storage (not just the expensive virtual memory allocator in DynArray)
This was SVN commit r10051.
2011-08-21 11:00:09 +00:00
3eb1ed0139 (actually remove)
This was SVN commit r10050.
2011-08-21 10:31:23 +00:00
c26a369762 remove Bucket allocator (superseded by upcoming Arena/Pool with expandable Storage policies)
This was SVN commit r10049.
2011-08-21 10:30:35 +00:00
730a89152c Fixes typecast performance warning in MSVC.
This was SVN commit r10045.
2011-08-21 00:09:28 +00:00
5406a68959 feature request by philip: instead of refusing to load textures larger than the OpenGL limit, ensure they have mipmaps (unless it's s3tc, which would be too expensive to recompress) and skip levels until it fits
This was SVN commit r10043.
2011-08-20 17:56:12 +00:00
36d897c694 # New menu background image
This was SVN commit r10042.
2011-08-20 17:17:53 +00:00
5f07107609 Fix build with wxWidgets 2.9
This was SVN commit r10037.
2011-08-18 23:38:11 +00:00
49af1880f8 Fix tests
This was SVN commit r10035.
2011-08-18 21:12:15 +00:00
308cb26dd4 # Health decay for buildings not in a civ center's territory.
This was SVN commit r10034.
2011-08-18 20:28:53 +00:00
6b26820090 Build fix
This was SVN commit r10033.
2011-08-18 11:16:52 +00:00
36c6318296 This was SVN commit r10031. 2011-08-18 03:28:32 +00:00
89c22993a4 Adds terrain fill (bucket) tool to Atlas.
This was SVN commit r10029.
2011-08-17 23:44:52 +00:00
8872bad668 AoEO BAR compatibility in AoE3Ed
This was SVN commit r10026.
2011-08-17 16:17:22 +00:00
e8f6be0bf3 Fix GCC build (only reference SIMD types when supported by the compiler (though this might not work in MSVC))
This was SVN commit r10025.
2011-08-17 13:41:25 +00:00
9f97610cb2 refactor: remove "wrapping" and "read" functionality for DynArray (in preparation for replacing it with template policies for more flexible Pool etc.)
This was SVN commit r10024.
2011-08-17 08:38:53 +00:00
7bd2f1c925 Temp fix for autobuild: VC2008 doesn't define hypotf.
This was SVN commit r10021.
2011-08-17 04:34:20 +00:00
b9df1d3451 Be less grossly inefficient when computing minimap territory texture
This was SVN commit r10019.
2011-08-16 23:39:16 +00:00
fab7bf4fcf Fixes manifest dependencies for Actor Editor. Fixes #924.
This was SVN commit r10018.
2011-08-16 22:08:47 +00:00
609f1643d5 Fix -Wconversion warnings in simulation code.
Cast to smaller integer types explicitly.
Generally avoid platform-dependent types (size_t) in simulation code.
Use float versions of math.h functions, not double.

This was SVN commit r10017.
2011-08-16 11:18:32 +00:00
18c48492ef Added cast to convert from unsigned to int
This was SVN commit r10012.
2011-08-16 02:01:11 +00:00
0f0ac2bcd5 Fixes #898
This was SVN commit r10011.
2011-08-16 01:01:39 +00:00
1b8471da1f Changes shore definition to distance on land (all water included) for better dock placement.
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.

This was SVN commit r10007.
2011-08-14 23:36:13 +00:00
132f9bd63b Fixes bug in Atlas random map generator UI.
This was SVN commit r10006.
2011-08-14 06:11:35 +00:00
7b27fcb716 Disables water rendering in the actor viewer.
This was SVN commit r10005.
2011-08-13 23:00:58 +00:00
68fe745eb7 Fix packaging scripts for 5-digit revision numbers
This was SVN commit r10001.
2011-08-11 18:16:00 +00:00
2726f6ed88 Changes GetFocus to return points above water.
Fixes camera following of boats.

This was SVN commit r9988.
2011-08-10 22:45:55 +00:00
d605e85ae5 Removes ColourTester utility (needs update-workspaces).
Adds busy cursor to Atlas map generator.

This was SVN commit r9987.
2011-08-10 22:23:35 +00:00
4a2adece07 Fixes class types for Atlas pathfinding overlay
This was SVN commit r9978.
2011-08-08 01:04:18 +00:00
b9bd7ff86e Fix signed/unsigned comparison warning
This was SVN commit r9972.
2011-08-06 12:31:48 +00:00
f378e2e651 Implements building restrictions (by terrain, territory, category, and distance). See #41. Fixes #804, #287.
Implements build limits. See #687.
Implements autorotation for dock placement.
Fixes unit spawning to consider terrain passability. See #893.
Adds new passability criteria based on distance from shore.
Updates build restrictions on some templates.
Changes unit spawning search to 4 tiles away from foundation.
Changes garrison/training spawn failure to nicer UI notification.

This was SVN commit r9970.
2011-08-06 08:11:05 +00:00
81c9a9b1f1 Fix build with old GCC
This was SVN commit r9964.
2011-08-04 21:36:57 +00:00
083e7a41fd fix typo
This was SVN commit r9962.
2011-08-04 17:27:14 +00:00
0748c5a75e cleanup and simplification of the really old h_mgr code.
replace array-of-pages data structure with demand-committed VM => allows
simple allocation of new resources without having to search for the
first free index. I suspect the cause of multiple reported bugs (refs
#860, #899, #915) was a race. Most issues are fixed, but the pool's
freelist also needs to be made thread-safe and lock-free. this has
performance and 64-bit portability implications, so I'll leave it for
later (Pool is due for some serious refactoring anyway).

please post a comment if this or similar issues persist.

This was SVN commit r9961.
2011-08-04 17:11:16 +00:00
22191bfcc6 Windows fix (smaller type conversion)
This was SVN commit r9960.
2011-08-04 15:31:01 +00:00
2d662a1228 Add WELL512 RNG
This was SVN commit r9955.
2011-08-02 22:58:10 +00:00
94e9a8b459 Fix hang with Boost 1.47
This was SVN commit r9954.
2011-08-02 21:07:58 +00:00
6aeb5c64de # Remove SoD inside territories.
Fix some serialisation issues.

This was SVN commit r9951.
2011-08-01 21:25:12 +00:00
9430de3d85 Support TerrainChanged messages in scripts, and report use of unsupported messages
This was SVN commit r9950.
2011-08-01 21:01:06 +00:00
6304797cbd pool - safely handle zero-sized allocations (fixes #909)
snd_mgr - remove no longer needed hacks for native OpenAL
implementations
test_wdbg_sym.h - belated commit of warning fix

This was SVN commit r9944.
2011-07-31 09:42:57 +00:00
e7ac0926a7 Replace console prefix-search behaviour with more standard history navigation, based on patch by Ross Bearman.
Fixes #906.

This was SVN commit r9939.
2011-07-30 23:06:09 +00:00
3cc1c7e24e Templates sorting utility. Closes #801.
This was SVN commit r9938.
2011-07-30 20:20:34 +00:00
04ec40259b Use player colours for territory borders in minimap
This was SVN commit r9932.
2011-07-30 12:07:27 +00:00
8fee3d8ef8 # New territory border rendering.
Add textured line overlay rendering.
Change terrain height calculations to be triangulation-dependent for
improved accuracy.
Add triangulation-dependent terrain normal function.
Support separate S/T wrap modes for textures.
Rename CVector2D_Maths since it no longer conflicts with simulation
CVector2D.
Coalesce freed chunks in vertex buffers, to avoid excessive
fragmentation.
Add some things to help debug vertex buffer allocation a little.

This was SVN commit r9929.
2011-07-30 00:56:45 +00:00
cdfeeab25f Fixes Atlas non-PCH build.
This was SVN commit r9911.
2011-07-24 21:50:58 +00:00
b2837e2878 Fix compatibility more with Boost 1.47
This was SVN commit r9907.
2011-07-24 11:59:57 +00:00
955f94976e # New dynamic territories design
This was SVN commit r9906.
2011-07-24 11:42:35 +00:00
78fd3a2ba2 Fix compatibility with Boost 1.47
This was SVN commit r9905.
2011-07-24 11:41:06 +00:00
813fed5b9e Adds GetCivData to map generator API (to replace the hardcoded starting entities in rmgen).
Adds some starting entities to unfinished civs.

This was SVN commit r9901.
2011-07-24 03:28:18 +00:00
153357f640 Replaces architecture-dependent cpuid function with inline GCC assembly. Should fix #670 by eliminating nasm dependency.
This was SVN commit r9891.
2011-07-21 01:44:29 +00:00
f9d7c1246d # Initial support for territories
This was SVN commit r9889.
2011-07-20 19:48:06 +00:00
15df4aa4be OS X fix: if os_cpu_ClockFrequency reports an unknown/invalid value, measure the frequency instead; also avoid reporting invalid freqs in system_info
This was SVN commit r9886.
2011-07-20 08:10:36 +00:00
ce42cd611a Update release packaging script for recent library changes
This was SVN commit r9884.
2011-07-19 17:30:49 +00:00
8da2640f5e Fixes no-PCH build
This was SVN commit r9883.
2011-07-19 09:00:15 +00:00
708e9cea05 Fix looping of non-streaming sounds
This was SVN commit r9877.
2011-07-18 17:56:17 +00:00
b738f27283 hopefully fix non-Windows build errors
This was SVN commit r9875.
2011-07-18 15:25:48 +00:00
ead45aa957 Report XML parse errors better in validator tool
This was SVN commit r9874.
2011-07-18 14:57:41 +00:00
c33246d603 Fix build errors
This was SVN commit r9872.
2011-07-18 11:10:13 +00:00
0d23e3f333 post-alpha sync with work.
debug stack trace fixes, remove more asm, change CONTINUE/OK scheme to
OK/ALL_COMPLETE, fix tests

This was SVN commit r9871.
2011-07-18 09:21:56 +00:00
2d9e473483 fix for non-contiguous APIC IDs within a single package (happens on recent Intel CPUs)
This was SVN commit r9870.
2011-07-18 08:08:06 +00:00
aeddb5fb48 avoid warning when running a second instance and Mahaf is enabled
This was SVN commit r9863.
2011-07-17 19:19:33 +00:00
a31ce6a3ce Fix "hides overloaded virtual function" warnings in Clang
This was SVN commit r9862.
2011-07-17 17:30:07 +00:00
be3eb579d4 fix another cast runtime error
This was SVN commit r9861.
2011-07-17 14:48:23 +00:00
ea7f65818a Avoid release-mode-only warning
This was SVN commit r9857.
2011-07-17 01:26:04 +00:00
2f0bd8d8b0 Upgrade to SpiderMonkey 1.8.5 (fixes #734)
This was SVN commit r9852.
2011-07-16 23:24:14 +00:00
364f76c5ff Fix rare use of uninitialised values
This was SVN commit r9847.
2011-07-16 19:52:48 +00:00
dd054c8d97 acpi: fix cast error (caught by runtime check)
x86_x64: simplify MSC version check

This was SVN commit r9846.
2011-07-16 17:27:07 +00:00
8eb7af4ac9 Be a bit more robust to build environment changes.
Reduce some module dependencies.
Clean up some unused instantiations.

This was SVN commit r9827.
2011-07-15 13:22:48 +00:00
ca42649c5b Fix MSVC warning
This was SVN commit r9820.
2011-07-13 19:28:31 +00:00
f28ae0d427 Disable SDL's DGA mouse support by default, to fix Linux fullscreen mouse sensitivity problems
This was SVN commit r9819.
2011-07-13 17:40:12 +00:00
7f74693052 Disable culling of transparent objects in shadows/reflections, to fix trees
This was SVN commit r9818.
2011-07-13 13:51:40 +00:00
b08e142193 Graphics optimisations and features from eihrul.
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721, based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434).
Reduce shadow swimming effects.

This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
bb33a259b6 Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring)
This was SVN commit r9797.
2011-07-10 21:00:21 +00:00
20ebb2b829 Fix incorrect string type in log message on non-Windows
This was SVN commit r9790.
2011-07-09 18:41:58 +00:00
a4637c25d0 Fix no-PCH builds
This was SVN commit r9786.
2011-07-08 15:07:08 +00:00
6371afbc76 Remove the rarely-used source code option from the Windows installer. See #855.
This was SVN commit r9777.
2011-07-07 20:11:47 +00:00
b6d04004b6 Avoid errors when using planes in formations, by not allowing them to join formations
This was SVN commit r9776.
2011-07-07 17:05:22 +00:00
899f5105b9 Fix glwprintf errors on OS X with non-ASCII strings, by setting LC_CTYPE to UTF-8
This was SVN commit r9768.
2011-07-06 21:19:59 +00:00
1bc2db56ea Stops unit following when other object selected. Fixes #775
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
315dfbff5d Fix use of outdated cached transform when computing bounding boxes.
Should fix #867.

This was SVN commit r9761.
2011-07-05 00:12:00 +00:00
528b833db0 Fix assertion failure in replay mode
This was SVN commit r9757.
2011-07-04 15:17:46 +00:00
f01097b23c Avoid crash when pressing 'h' while multiplayer host game setup screen is loading
This was SVN commit r9753.
2011-07-03 18:36:43 +00:00
6ba00117e0 Fixes bug in Atlas player editor: saving team as "None" had no effect
This was SVN commit r9721.
2011-06-29 00:57:02 +00:00
996a32125c Add per-player LOS-reveal flag.
Reveal LOS for Gaia and AI players (fixes #879).
Use player_id_t slightly more consistently in interfaces.

This was SVN commit r9720.
2011-06-28 23:24:42 +00:00
293adad0ba Fix #829 - Stuck units bug
This was SVN commit r9713.
2011-06-28 07:27:03 +00:00
a8fdcfde59 Fixes broken autostart for random maps with AI
This was SVN commit r9699.
2011-06-27 23:27:25 +00:00
31832cd9ae Initialise minimap and LOS textures properly
This was SVN commit r9673.
2011-06-26 21:47:07 +00:00
3f51747440 Fix uninitialised value
This was SVN commit r9672.
2011-06-26 21:45:58 +00:00
df2e499efc Post code review version - previous commit was pre code review version.
This was SVN commit r9666.
2011-06-26 07:47:03 +00:00
2aedf48304 #788 Eliminate delay in path finding (and therefore moving)
This was SVN commit r9665.
2011-06-26 07:03:08 +00:00
5bc125a91f Changes terrain data returned by CMapGenerator to typed arrays, instead of an array of objects (this greatly reduces the size of the serialized data)
This was SVN commit r9664.
2011-06-26 02:56:54 +00:00
33e8ac6fa5 Applies Kenny's patch for CInput pasting behavior (fixes #640)
Simplifies some clipboard hotkeys

This was SVN commit r9658.
2011-06-25 00:04:41 +00:00
92fcb737cd Attempt minor improvements to stances code (see #865).
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595).

This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
195c7a00e9 Adds player settings shortcut to Atlas map panel. Fixes #874
Tweaks some control positions and layouts for consistency

This was SVN commit r9649.
2011-06-23 22:38:26 +00:00
492e49da38 add support for selection and deletion of entire words in text controls (ctrl+backspace/delete/left/right) based on patch by Chakakhan/kenny (thanks!)
also refactored wclipboard
closes #511

This was SVN commit r9646.
2011-06-23 10:12:43 +00:00
abdc846a65 Adds getInt to AtlasObject
Uses this instead of wxAtoi for consistency, and adds brief comment
about why wxAtof should be avoided

This was SVN commit r9643.
2011-06-21 02:56:49 +00:00
ef4df42895 add support for .dylib on OS X based on patch by Yves (thanks!)
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14173&pid=220828&st=0&#entry220828

This was SVN commit r9642.
2011-06-20 20:06:51 +00:00
10481ca174 Avoid potentially dangerous locale-dependent atof functions
This was SVN commit r9639.
2011-06-19 19:51:53 +00:00
9965c1ef1b Remove label that is no longer labelling anything
This was SVN commit r9636.
2011-06-19 14:55:43 +00:00
db5e483266 Fix typo in comment
This was SVN commit r9635.
2011-06-19 14:18:07 +00:00
74f849ad0b Adds message when profiler snapshot is first saved (Shift+F11)
This was SVN commit r9633.
2011-06-17 23:40:13 +00:00
71a6775b92 Stances draft, refs #865
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
3be43ede41 Adds rotation to starting camera (currently unused)
This was SVN commit r9623.
2011-06-16 21:21:33 +00:00
9e486cd6e3 Fixes bug in Atlas camera control (clear button didn't erase the setting)
This was SVN commit r9620.
2011-06-14 01:03:35 +00:00
3e4d74480d Adds AI control to Atlas player panel
Adds camera control to Atlas player panel
Changes map reader to handle per-player starting camera position. See
#55
Adds entity name filter to Atlas object panel
Fixes bug in Atlas map settings (caused crash when object panel was not
loaded)

This was SVN commit r9617.
2011-06-13 23:32:41 +00:00
0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
23f1072a2e Adds player editor to Atlas scenario editor. See #91
Fixes object panel so the list of players updates correctly.
Atlas map settings are now observable and shared between various panels.
Fixes panels for maps missing settings (caused JSON error)
Changes map reader so that entities with invalid players cause a warning
but are not added to the game. That prevents further errors. Fixes #869
Uses map size choices from simulation/data/map_sizes.json instead of
multiple locations. Fixes #787
Prepares Atlas map settings for undo/redo support

This was SVN commit r9608.
2011-06-09 23:45:12 +00:00
266977bc78 Attempt to fix manifest problems in autobuild.
This was SVN commit r9607.
2011-06-09 23:16:27 +00:00
2c58b07223 # Add experimental fighter planes.
This was SVN commit r9605.
2011-06-09 19:44:40 +00:00
1357000401 Fix #805 more so it doesn't ignore the second click on non-double-clickable buttons.
This was SVN commit r9604.
2011-06-09 17:30:34 +00:00
8720b4a220 Fix Atlas saving game type under wrong property name.
This was SVN commit r9599.
2011-06-09 16:39:31 +00:00
24cca252e3 Ranged units always face their targets when attacking. fixes #831
This was SVN commit r9595.
2011-06-06 22:08:26 +00:00
43d817bc22 --
This was SVN commit r9593.
2011-06-06 19:39:19 +00:00
9906a86a2e Support double-click on unit group buttons. patch by Merolum. fixes #805.
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
6feb143e61 OS X compile fix
This was SVN commit r9582.
2011-05-30 23:06:16 +00:00
ef74ad7f7b OS X compile fix (hopefully): add definition for O_DIRECT
This was SVN commit r9581.
2011-05-30 21:49:33 +00:00
034881d30c sync with work. simplify wnuma, refactor+fix topology (bugs: APIC IDs array didn't correspond to OS processor number; couldn't handle noncontiguous APIC ID field values)
This was SVN commit r9580.
2011-05-30 13:00:20 +00:00
f25407e7fb Fix typo
This was SVN commit r9579.
2011-05-30 11:51:14 +00:00
ce647cf8e3 Add a manifest hack to fix building in VC2008+, when loading DLLs built in VC2005
This was SVN commit r9576.
2011-05-29 21:13:21 +00:00
59124006c8 Work around problem with quote keys in Windows on an Apple machine
This was SVN commit r9575.
2011-05-29 21:12:09 +00:00
c2677b4bb0 Upgrade game and build system to ENet 1.3
This was SVN commit r9574.
2011-05-29 20:57:28 +00:00
e3d87b0375 remove no longer necessary lowlevel wsock implementation (superseded by enet) since the delay load hook isn't compatible with a DLL packaging of enet.
-> cstr serialization uses lib/byte_order.h instead of htons; removed
hostname/IP from system_info (Philip agrees its utility is negligible)

This was SVN commit r9572.
2011-05-29 19:59:51 +00:00
acb48663d7 Windows fixes
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
6bdafee6a0 Update Atlas sidebar buttons slightly
This was SVN commit r9569.
2011-05-29 16:36:15 +00:00
fa7855f3d9 Delete now-unused wxJavaScript library
This was SVN commit r9568.
2011-05-29 15:46:07 +00:00
a81f180dd6 Remove Atlas UI scripting support
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
dc2035efc9 Move Atlas map settings from JS to C++.
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
1618aa9c36 Add missing file for actor viewer
This was SVN commit r9565.
2011-05-29 14:57:54 +00:00
07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
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