1
0
forked from 0ad/0ad
Commit Graph

3123 Commits

Author SHA1 Message Date
5228800b73 # Fixed Linux build
Use noncopyable instead of boost::noncopyable. (But maybe this should be
changed to the NONCOPYABLE macro instead?)
Use boost::filesystem::wpath::file_string instead of
external_file_string, since the latter varies between std::string on
Linux and std::wstring on Windows.
Use wcstombs instead of wcstombs_s.
Use rtl_AllocateAligned instead of _mm_malloc.

This was SVN commit r6574.
2009-01-02 21:19:41 +00:00
b7585c1cd4 Attempt to fix some startup problem
This was SVN commit r6572.
2009-01-02 02:35:22 +00:00
702450526b # Added some tools to automatically build the game from the source code
Various scripts and stuff that run on the build server

This was SVN commit r6571.
2009-01-01 23:00:46 +00:00
1b5adf3cb1 Autobuilder startup service code (basically just VC2008's default service project plus four lines of code in startupserviceWinService.h)
This was SVN commit r6569.
2009-01-01 22:45:56 +00:00
dax
40cfae7f81 NMT_REMOVE_MESSAGE network message added so that an entity can be removed during a multiplayer game (compilation error fix)
This was SVN commit r6543.
2008-12-21 19:56:50 +00:00
dax
fe645d8fc9 NMT_REMOVE_MESSAGE network message added so that an entity can be removed during a multiplayer game
This was SVN commit r6542.
2008-12-20 18:09:16 +00:00
16ccae10cd # fix warnings
more icc11 fixes - mostly type conversion and noncopyable (now made a
macro)

This was SVN commit r6536.
2008-12-17 16:32:46 +00:00
387722d41e # code cleanup/fixes
improvements from work:
- no longer export classes; instead inline functions where it makes
sense (e.g. the scope timers) or export the member functions directly
- fix icc11 warnings
- add some comments

This was SVN commit r6531.
2008-12-16 21:13:04 +00:00
3da952a036 add missing DLL
move svn_revision stuff to build/svn_revision

This was SVN commit r6529.
2008-12-08 07:34:20 +00:00
12e59fd850 # groundwork for embedding svn revision number into the EXE for debugging
add svnversion from official svn cmdline client distro and its
dependencies
add a horrible batch file that reads its output and writes it to a text
file as a quoted string
(see http://www.wildfiregames.com/forum/index.php?showtopic=12104&hl=)

This was SVN commit r6528.
2008-12-07 22:21:10 +00:00
2bfa84aef5 Changes to public SVN log's HTML output format, from last weekend
This was SVN commit r6525.
2008-11-28 22:30:50 +00:00
cc2f2e46c8 Adding the m_base check.
This was SVN commit r6522.
2008-11-25 00:03:24 +00:00
5341322d03 # fix some sound-related problems
clamp gain to 1.0, refactor code a bit

This was SVN commit r6517.
2008-11-23 20:29:12 +00:00
63e18ed07b #Players list in the Multiplayer menu is now working.
This was SVN commit r6510.
2008-11-22 22:44:02 +00:00
0cea78e462 crash fix in void CEntity::UpdateXZOrientation()
This was SVN commit r6506.
2008-11-22 18:14:51 +00:00
213743b73d # improve robustness of simulation and EntityManager code
also const-correctness fixes in EntityFormation
+build

This was SVN commit r6502.
2008-11-22 16:50:03 +00:00
d6469ea112 Testing SVN logger again...
This was SVN commit r6499.
2008-11-22 15:09:24 +00:00
62444bf359 Testing SVN logger again...
This was SVN commit r6498.
2008-11-22 15:08:27 +00:00
a2ae80239a # Updated public SVN logger
Mostly just changes to work in the new server location

This was SVN commit r6497.
2008-11-22 15:05:41 +00:00
f7d5711623 additions from work:
add shared_ptr wrapper for numa_allocator and page_aligned_alloc
(removing previous code from shared_ptr.cpp)
pch: add TR1 array
wposix: add setenv
wtime: add strptime

This was SVN commit r6486.
2008-11-20 16:35:30 +00:00
166c38dd0b Fixing crash bug:
Function call failed: return value was -100020 (Invalid function
argument), Location: snd_mgr.cpp:1696 (snd_set_gain)

This was SVN commit r6484.
2008-11-16 19:54:43 +00:00
6267e13760 IsEntityRefd now checks the entity pointer as well (avoids null pointer dereference in some cases - encountered during MP game).
Simulation.cpp: hoist retrieval of simulation pointer out of loop

This was SVN commit r6482.
2008-11-15 22:38:04 +00:00
cb257dd020 Null pointer fix.
This was SVN commit r6481.
2008-11-15 20:08:41 +00:00
1f065ffb02 fix gcc compile error
This was SVN commit r6461.
2008-11-03 07:46:30 +00:00
c0a5dde4bf jan's modifications
This was SVN commit r6431.
2008-10-18 18:42:23 +00:00
becab2d479 fix: alpha map texture wasn't initialized, which caused crash if multiplayer -> host -> continue -> cancel
thanks to anton for noticing and reporting the problem :)

also: fix hardcoded paths in rmgen to point to mods/public

This was SVN commit r6429.
2008-10-18 17:58:04 +00:00
cfc4f47105 This was SVN commit r6422. 2008-10-13 21:06:15 +00:00
841293ee0a minor improvements from work
This was SVN commit r6419.
2008-10-13 15:08:30 +00:00
dba26306e0 Fixed Actor Editor to allow selection of files from within mods/[not 'public']/... without it giving a silly relative path
This was SVN commit r6416.
2008-10-05 21:00:37 +00:00
34b418e0c1 slight improvement, use ARCH_X86_X64 instead of ARCH_IA32||ARCH_AMD64
This was SVN commit r6411.
2008-09-27 10:23:05 +00:00
aea2368300 fixes to stack trace code under x64 (from work):
- displaying symbol values requires stack pointer, not frame pointer
- update debug_IsPointerBogus
- skip-n-frames code changed to skip-all-frames-up-to-func (more
reliable in the face of inlining)

debug.cpp: cleanup

This was SVN commit r6410.
2008-09-27 10:05:11 +00:00
164f250e5b This was SVN commit r6406. 2008-09-20 18:37:22 +00:00
0f559024db file: for unicode Open function, convert input to UTF8 and delegate to char* version (avoids hacky assignment to m_pathname, and also necessary because _wfopen isn't portable)
secure_crt.cpp: provide implementation of _wfopen_s

SoundGroup: fix: all attributes now have default values in case the XML
file leaves out some fields

This was SVN commit r6405.
2008-09-20 17:42:43 +00:00
c3a42633fa fix stupidly incorrect calculation of smoothed frequency and timer resolution (fixes observed dependence of sim rate on framerate, see http://www.wildfiregames.com/forum/index.php?showtopic=1671)
also improved filtering of the frame delta times.
while at it, improved interface of whrt backends to avoid leaking
implementation details.

This was SVN commit r6401.
2008-09-19 17:56:05 +00:00
33ca85cb4c add additional instrumentation to vsrc_latch to diagnose sound bug (see http://www.wildfiregames.com/forum/index.php?showtopic=11999)
This was SVN commit r6400.
2008-09-18 18:28:14 +00:00
0d79703fb0 wdbg_heap: disable leak reporting to make debug mode bearable
wdbg_sym: numerous fixes and improvements
- all values are (also) displayed in hex form
- more correct calculation of symbol addresses (workaround for apparent
PDB bug)

This was SVN commit r6399.
2008-09-18 18:06:48 +00:00
982156e3f5 Don't redefine UNUSED
This was SVN commit r6398.
2008-09-18 17:09:36 +00:00
7d0cfb9535 quick fix: replace all instances of mods/official with mods/public
(actorEditor isn't using VFS yet and has hardcoded paths)

This was SVN commit r6395.
2008-09-18 11:46:14 +00:00
40a7da782e warning fixes
GameSetup.cpp: add support for new internal/public mod layout

This was SVN commit r6393.
2008-09-18 11:31:12 +00:00
c4654fd8fa bits: avoid sign conversion warning
debug: cleanup
ogl_tex, tex: use full-width types to avoid truncation warnings
wdbg_sym.cpp: skip __suppress and __profile symbols; add additional hex
display for floats; cleanup
wdll_ver.cpp: cppdoc+cleanup (remove non-reentrant C interface, replace
with std::string)
sysdep: add cppdoc

everything else: flag parameters are now consistently size_t instead of
int (avoids warnings, allows slightly better code on x64)

This was SVN commit r6392.
2008-09-18 11:27:55 +00:00
2c6a2c1572 Fixed some string type conversion problems for GCC
This was SVN commit r6384.
2008-09-17 15:55:04 +00:00
4132549c2c 64-bit fixes (the parts of lib/ in use at work are now fully operational in 64-bit mode)
- x86_x64.cpp: fix: test ARCH_AMD64 instead of ARCH_IA32 because both
are defined on x64
- manifest.cpp: fix processor architecture
- wdbg_heap.cpp: only enable on ia32
- winit, wstartup: take (lack of) name mangling into account

compiler.h: add STRINGIZE and DECORATED_NAME for use by winit
dir_watch: fix: smart pointers were never actually released due to a
remaining reference

This was SVN commit r6375.
2008-09-16 17:46:45 +00:00
4425489c12 Added automatic "root" prop-point to meshes from the Collada converter.
Fixed reported actor name in prop-not-found error messages.

This was SVN commit r6352.
2008-09-09 22:30:14 +00:00
4d8f41f3aa Minor Collada-converter bug fixes
This was SVN commit r6342.
2008-09-07 23:11:29 +00:00
2624069993 replace most BIT macros with a Bit() template for better 64-bit safety
test_bits: add tests for all routines in bits.h
hpet: add safety check
unit.h, bits.h, DOMEvent.h: change T(~0) to ~T(0) (required when T is
64-bit)

This was SVN commit r6335.
2008-09-06 21:15:53 +00:00
c15cbe12d4 now load files from "public" mod unless onlyPublicFiles is on cmdline (see http://www.wildfiregames.com/forum/index.php?s=&showtopic=11983)
instead of checking if the public mod exists, remove the windows-only
wfilesystem assert and another in file_system_posix so that the 'error'
is gracefully handled.

This was SVN commit r6334.
2008-09-06 21:12:36 +00:00
a6499ff319 fix: ensure directory is populated despite multiple Attach operations
refactor: move populate logic to separate file; VfsDirectory now only
provides the realDirectory storage, while Attach() responsibility is
moved to vfs_populate.

This was SVN commit r6333.
2008-09-06 21:09:58 +00:00
7b9351bf5c Fixed bug in Collada XML fixer
This was SVN commit r6329.
2008-08-24 22:32:15 +00:00
b0f3116f5a Nearly-complete updates to the Collada converter, to work with the latest release of FCollada
This was SVN commit r6328.
2008-08-24 22:22:25 +00:00
dave
d8bb8bddd8 Cleaned up and incorporated appropriate headers so it compiles
This was SVN commit r6325.
2008-08-11 09:57:42 +00:00
09f97a3422 Some fixes for OS X:
- Find enet properly
- Type conversion of size_t's in JS

This was SVN commit r6324.
2008-08-11 04:18:10 +00:00
14ec3a3026 minor fixes:
whrt: output timer implementation info, fix assert ( 1/(x-epsilon) < 1/x
+ epsilon )
wsdl: fix slightly incorrect gamma values (first and last are now
exactly 0 and 1)

This was SVN commit r6321.
2008-08-10 11:02:25 +00:00
a3b7e8c08c needed unicode at work:
debug: reinstate wchar_t version of debug_printf
  file, waio: add hack to allow creating File_Posix with unicode path
wposix: no longer include some rarely-used stuff to avoid conflict with
3rd party libraries
precompiled: bring boost::bind into global namespace (present in TR1)

dir_watch: needed directory watching with unicode paths and larger
buffers at work, so I completely overhauled and documented this

timer: add ToSeconds

SocketBase: fix to ensure correct match despite ::bind's conflict with
boost::bind

This was SVN commit r6319.
2008-08-09 19:22:13 +00:00
5d35f6bfe0 Increase turn length to 300ms to work better with lag.
This was SVN commit r6318.
2008-08-08 05:57:10 +00:00
98dd1a1bb4 Refactored "generic" order to just call it "contact action", and added support for intercepting targets if performing a contact action while moving.
This was SVN commit r6290.
2008-07-29 08:22:56 +00:00
0e8b7c5bc7 Removed some long commented out code.. no point keeping it there since it's in SVN.
This was SVN commit r6289.
2008-07-29 07:01:23 +00:00
435ac684e3 Fixed an bug where double-clicking on the minimap, or dragging the view and them leaving the minimap window, did not clear the "clicking" flag and caused further mouse motion to move the view around.
This was SVN commit r6288.
2008-07-29 06:56:38 +00:00
d0c6805725 Fixed bug that was causing population to go negative. It was due to a unit being killed by multiple enemies in the same frame, which led to multiple calls of the death event handler. The fix is twofold: First, kill() only calls the event handler the first time the unit is killed. Second, damage() (in JS), which apart from killing things also loots them, makes sure that the unit is not already being destroyed. This latter fix is to ensure that we don't get a huge amount of loot by simply attacking a low-HP unit with many soldiers simultaneously, so they kill it in the same frame.
This was SVN commit r6276.
2008-07-24 05:50:45 +00:00
75a9b2f357 Made stance-setting work with multiplayer.
This was SVN commit r6274.
2008-07-24 05:25:14 +00:00
fa7ce687f0 fix error handling - ensure SoundGroup doesn't crash when sound loading fails (previously it was only handling the case where loading failed due to sound being disabled)
This was SVN commit r6269.
2008-07-23 05:39:54 +00:00
aebe9a7936 Added active field to players to check whether the player is a human or CPU.
This was SVN commit r6267.
2008-07-23 05:21:57 +00:00
9f909073b4 fixes from work
- file: prevent error when closing a file twice (e.g. close and dtor)
- file_system_posix: export from DLL
- path_util: add some unicode versions of functions
- ia32: robustify, prevent hook reentry due to failure in disassembly,
gracefully handle breakpoints that overwrite code
- wdbg_heap: fix wdbg_heap_Validate

This was SVN commit r6264.
2008-07-21 20:43:37 +00:00
b979033385 Stopped CLogger outputting error messages with debug_printf while in test cases that are intentionally triggering errors.
This was SVN commit r6259.
2008-07-19 19:02:27 +00:00
e063542a5f fix memory leak in leak detection code :P
This was SVN commit r6257.
2008-07-19 18:35:33 +00:00
6eb29f76d3 Already existed as a property.
This was SVN commit r6256.
2008-07-19 02:43:35 +00:00
a3fb9051b6 Fix MSVC build errors and warnings
This was SVN commit r6254.
2008-07-19 00:58:34 +00:00
8f6d3a75a5 (Missed from previous commit)
This was SVN commit r6253.
2008-07-19 00:40:08 +00:00
0f9294ce17 Fixed some strict aliasing warnings
This was SVN commit r6252.
2008-07-19 00:36:42 +00:00
fbc3d22720 Use GCC's std::tr1::unordered_* classes instead of the now-deprecated __gnu_cxx::hash_* when possible
This was SVN commit r6250.
2008-07-19 00:20:54 +00:00
0b32d1b674 Fix warning about static_assert being a future (TR1) keyword
This was SVN commit r6249.
2008-07-19 00:13:53 +00:00
afae8e6c7d Adding the getName() method to be used from JS scripts.
This was SVN commit r6248.
2008-07-18 23:55:13 +00:00
5fcd1601a1 Fixed multi-line comment warning
This was SVN commit r6247.
2008-07-18 23:52:29 +00:00
6d92213077 Fixed "it=it=map.begin()" typo
This was SVN commit r6246.
2008-07-18 23:51:44 +00:00
4e539a652f Fixed one set of annoying DCDT warnings
This was SVN commit r6245.
2008-07-18 23:49:51 +00:00
8f46070b2e Reverting a change from #6239 because of the compilation error.
This was SVN commit r6244.
2008-07-18 23:00:04 +00:00
fe6370aff8 more dehydra. disabled lockfree module (not in use).
This was SVN commit r6240.
2008-07-17 17:00:00 +00:00
8e86d29301 dehydra fixes (mostly copy-ctor warnings)
This was SVN commit r6239.
2008-07-17 14:23:51 +00:00
0cbb38bfd9 Fixed 3+ player games. The problem was the FinalizeSlots method in GameAttributes, which confused player and slot IDs by deleting nonexistent slots/players from the array. Since this doesn't seem particularly useful (and is even undesirable for scenarios where some players *want* to be the last slot and to leave others empty), I commented it out rather than having the code incur the extra complexity of supporting renumberings.
This was SVN commit r6228.
2008-07-14 06:40:05 +00:00
4027a8f11b dehydra-inspired fix: get rid of all using namespace std (potentially confusing / pollutes namespace).
Long iterator type names are better expressed via typedefs, anyway :)
(or 'auto' keyword of upcoming C++09)

This was SVN commit r6226.
2008-07-13 21:22:03 +00:00
9025056ffd Made rally point setting net-safe.
This was SVN commit r6225.
2008-07-13 17:37:45 +00:00
36b18f646f Added shouldRun parameter to order(ORDER_GENERIC) calls from scripts.
This was SVN commit r6224.
2008-07-13 16:31:03 +00:00
e4966f6f1b Added running support to GENERIC orders through a field that can be sent across the network (previous implementation used to be by setting properties on the entity itself).
This was SVN commit r6223.
2008-07-13 06:24:50 +00:00
d5fedc7c76 Fixing some multiplayer issues:
a) Run commands were not being sent accross properly because the JS just
directly set flags on the entity. Note: The current fix has the
side-effect of making it no longer possible to double-rightclick a
target to charge, run-gather, etc. That will be fixed in a later commit.
b) EntityLists were serialized in a format that made it impossible to
deserialize a zero-length list.

This was SVN commit r6221.
2008-07-13 05:56:27 +00:00
7af5e039a7 Adding IsGameRunning() function
This was SVN commit r6218.
2008-07-12 21:27:38 +00:00
f6ac13c15a Networking fixes - it now more or less works over ENet!
This was SVN commit r6216.
2008-07-12 19:08:38 +00:00
3c411dd174 large batch of Dehydra static code analysis fixes
(mostly passing arguments by const reference and checking LibError
return codes)

This was SVN commit r6214.
2008-07-12 10:45:11 +00:00
875260f60a Minor fixes for OSX: stub for debug_set_thread_name, changed name for os_cpu_CallByEachCPU and changed header path for os-sysdeps
This was SVN commit r6207.
2008-07-06 19:52:55 +00:00
3be2bfa7ac OSX implementation of rtl_AllocateAligned
This was SVN commit r6206.
2008-07-06 19:49:27 +00:00
1de82c5efe add cppdoc (and fix a warning in ogl_shader)
This was SVN commit r6204.
2008-07-05 18:46:12 +00:00
ab7cd7a5fa avoid two warnings:
- recompiled enet without /GL and /LTCG because the game's release mode
doesn't include those, either (due to their heavy compile-time impact)
- wdbg_heap: wrap all allocation-hook logic in #ifndef NDEBUG to avoid
unreferenced local function warnings

This was SVN commit r6201.
2008-07-05 09:41:23 +00:00
e14d5be529 timing-related fix (only occurs with certain timer resolutions due to incorrect arithmetic)
frequency_filter wasn't dealing correctly with resolution = 0
.. which was happening due to incorrect cpu_i64FromDouble macros

This was SVN commit r6200.
2008-07-05 08:27:33 +00:00
ea75498bab This was SVN commit r6199. 2008-07-05 01:14:23 +00:00
aaccb15c0a another 64-bit fix, we're now getting there :D
(the change is inside #if !GCC_VERSION so it can't break GCC)

adding specializations for (un)signed long sounds good, it's just that
x64 MSC still treats size_t as distinct but not ssize_t. removing the
latter makes it build on win32 and win64.

This was SVN commit r6198.
2008-07-04 19:25:52 +00:00
11b308c347 fix detection of amd64 on VC and avoid 64-bit warning
This was SVN commit r6197.
2008-07-04 19:10:09 +00:00
5b757e536f fix: avoid reentering allocation hook if an error is raised within memory allocators
This was SVN commit r6196.
2008-07-04 18:02:54 +00:00
b46f8b9ed8 This was SVN commit r6195. 2008-07-04 16:03:20 +00:00
0ee1c9d2c4 This was SVN commit r6194. 2008-07-04 16:02:58 +00:00
6bf3e238e5 GCC fixes
This was SVN commit r6193.
2008-07-04 11:17:24 +00:00
984f3d2180 GCC fixes
This was SVN commit r6192.
2008-07-04 11:16:30 +00:00
b9c939402b GCC fixes
This was SVN commit r6191.
2008-07-04 11:15:47 +00:00