1
0
forked from 0ad/0ad
Commit Graph

5989 Commits

Author SHA1 Message Date
953fb41c82 # Basic in-game building placement with new simulation system
This was SVN commit r7285.
2010-01-24 17:24:35 +00:00
0d9c9d646b Updated entity template conversion script, to convert population costs and names and civs
This was SVN commit r7284.
2010-01-24 17:20:23 +00:00
707539ad69 Don't scroll the game view when the mouse is outside the window
This was SVN commit r7283.
2010-01-23 20:40:15 +00:00
68eafaee7f Windows build fix
This was SVN commit r7282.
2010-01-22 20:17:49 +00:00
4fed9b8242 # Added initial support for players and population counters in new simulation system, plus various infrastructure improvements.
Merge from 22b478ffed8d.
Pure scripted interface definitions.
Entity creation from scripts.
Improved messaging system.
Messages on entity deletion.
Basic player entities.
Player ownership.
Bug fixes.

This was SVN commit r7281.
2010-01-22 20:03:14 +00:00
33882ab698 wdll_ver: safely deal with DLLs that don't have version information (OpenAL32's soft_oal doesn't, and we've renamed it to OpenAL32 to override the Creative implementation, so the system detect code tries to retrieve its version)
snd_mgr: cleanup, initialize velocity

This was SVN commit r7280.
2010-01-22 14:22:09 +00:00
3e7c87c7b0 # Improved memory profiling on Linux
Try yet again to make the malloc overrides less unreliable, and simplify
a bit

This was SVN commit r7278.
2010-01-22 11:22:26 +00:00
2794795024 Fix old entity scripts with new GUI system
This was SVN commit r7277.
2010-01-15 16:47:08 +00:00
c8138208bf # Object creation in Atlas with new simulation system
Merge from 6e8efe8f706c

This was SVN commit r7276.
2010-01-14 20:36:29 +00:00
f5632af192 Fix Undo menu labelling in Atlas
This was SVN commit r7275.
2010-01-14 20:11:43 +00:00
58e9176ef0 Fix malloc overrides to work better with a certain combination of glibc and libopenal
This was SVN commit r7274.
2010-01-13 23:15:47 +00:00
43d5e122ab clean up, update to newer DDS file definitions, tolerate slightly incorrect values of linearSize that are written by Bob's MacOSX DDS converter
This was SVN commit r7271.
2010-01-11 20:53:12 +00:00
7e625d7b21 Fix build error, test-case bug
This was SVN commit r7270.
2010-01-10 19:44:56 +00:00
17718981cf Remove Crypto++ because it causes too much trouble. Replace with a custom MD5 implementation for simulation state hashing.
This was SVN commit r7269.
2010-01-10 19:29:27 +00:00
e8008edf1c Fix missing includes
This was SVN commit r7267.
2010-01-10 11:31:31 +00:00
f8559e8c99 fix: if waiting for successful cancellation of the IO fails, then m_ovl must remain valid as well (thanks to Philip for pointing this out)
This was SVN commit r7265.
2010-01-10 09:34:57 +00:00
8513d57151 fix: GetOverlappedResult on ReadDirectoryChangesW hangs on Vista unless hEvent is valid (instead wait with timeout)
fix: return an error when called before the first watch is registered
(fixes error propagation)

This was SVN commit r7264.
2010-01-09 23:54:46 +00:00
e4be0892f8 fix: atlas calls ReloadChangedFiles before InitVfs, so safely handle directory watch requests before then (by checking for invalid completion port handle)
fix: prevent a pending IO from writing into freed memory by waiting for
the CancelIo to complete

This was SVN commit r7263.
2010-01-09 22:32:27 +00:00
29c1f282ec fix: shared_ptr dtor was calling delete on m_data, not delete[]
fix: freeing DirWatchRequest while IO was in-flight caused memory
corruption. now CancelIO when destroying the request.

This was SVN commit r7262.
2010-01-09 20:06:32 +00:00
47420c363b Windows build fix
This was SVN commit r7260.
2010-01-09 19:45:35 +00:00
7c2e9027c2 # Rewrite of the game's simulation system
Giant merge from
http://svn.wildfiregames.com/hg-source/file/5fb522019d5e
Infrastructure is largely complete, gameplay is largely missing
Disabled by default; use command-line flag "-sim2"
(Second attempt at commit...)

This was SVN commit r7259.
2010-01-09 19:20:14 +00:00
3339aea2a7 Add tooltip support to wxJS
This was SVN commit r7258.
2010-01-07 19:38:05 +00:00
797c9e1644 Use a more thread-safe way of counting glibc memory allocations in the profiler
This was SVN commit r7257.
2010-01-07 19:20:40 +00:00
caf2f72901 Cut down on some gratuitous memory allocations in the GUI
This was SVN commit r7256.
2010-01-07 19:00:56 +00:00
8dca5f7320 Fix rtl_AllocateAligned on GCC. Add tests for it.
This was SVN commit r7255.
2010-01-07 18:52:29 +00:00
d0e741b261 Add shader compilation timers
This was SVN commit r7254.
2010-01-07 18:48:11 +00:00
a116670620 Remove unused wsdl field that doesn't exist in SDL
This was SVN commit r7253.
2010-01-07 18:41:28 +00:00
48f0c9b5d7 Set svn:eol-style=native
This was SVN commit r7252.
2010-01-07 17:42:56 +00:00
babab3124f Add ERROR_ASSOCIATE for reporting VFS errors
This was SVN commit r7251.
2010-01-06 20:18:07 +00:00
306c74ceeb Fix license indentation
This was SVN commit r7250.
2010-01-06 20:17:37 +00:00
6db3dd0f12 Fix isfinite, isinf
This was SVN commit r7248.
2010-01-05 22:12:13 +00:00
d1f6ea785a Linux build fixes
This was SVN commit r7247.
2010-01-05 20:55:07 +00:00
c8fed35c52 Remove -ffast-math. (Better to focus on correctness by default, and only sacrifice it for performance in limited profiler-indicated areas.)
This was SVN commit r7246.
2010-01-05 20:54:33 +00:00
c9a6af2134 Add tests for fpclassify functions (currently failing on Windows)
This was SVN commit r7245.
2010-01-05 20:29:58 +00:00
aafe575445 Fix buffer overflow in logger. Add tests for it. Make this kind of error harder to miss.
This was SVN commit r7244.
2010-01-05 19:55:09 +00:00
97db62c944 fix handling of non-CP1252 characters in paths
(added wide-character versions of posix opendir etc. - on Windows, we
must not convert to UTF8)

This was SVN commit r7243.
2010-01-05 19:44:30 +00:00
33ab686128 Fix scanf buffer size
This was SVN commit r7242.
2010-01-04 19:15:24 +00:00
b0dcf49893 fix a hack that broke after switching to _wsopen_s (which ensures the pmode parameter only has read/write bits set)
(see http://www.wildfiregames.com/forum/index.php?showtopic=12560&hl=)

This was SVN commit r7241.
2010-01-03 15:58:06 +00:00
936be062ac non-VC compile fix: map scanf_s to scanf etc.
This was SVN commit r7240.
2010-01-01 23:38:07 +00:00
03726c0b54 ICC build fixes
warning fixes
get rid of SAFE_WCSCPY and SAFE_STRCPY

This was SVN commit r7239.
2010-01-01 15:33:07 +00:00
5a53b3183a Remove old debug statement
This was SVN commit r7238.
2009-12-31 16:47:02 +00:00
5e0ae351db fix further 64-bit trouble
This was SVN commit r7237.
2009-12-30 20:47:55 +00:00
b443627571 64-bit build fix
This was SVN commit r7236.
2009-12-30 20:38:40 +00:00
c0662bcfd0 fix: OpenAL source suballocator wasn't thread-safe nor capable of detecting double-frees
(see http://www.wildfiregames.com/forum/index.php?showtopic=12774&hl=)

This was SVN commit r7235.
2009-12-30 16:42:47 +00:00
5f56ec86e9 fix waio error handling and update comments
This was SVN commit r7234.
2009-12-30 14:28:24 +00:00
8d94e1f0e3 Fix (but not perfectly) the functions for entity scripts to display messages in the GUI
This was SVN commit r7233.
2009-12-30 12:53:59 +00:00
3d2b3b44ec wildebeest
This was SVN commit r7232.
2009-12-30 07:08:26 +00:00
fe92d524d6 Fix JS_THREADSAFE redefinitions (it's defined by the build system now)
This was SVN commit r7231.
2009-12-28 17:07:29 +00:00
00409b9583 # Support latest version of SpiderMonkey
Add --with-spidermonkey-tip option to Premake

This was SVN commit r7230.
2009-12-28 16:45:42 +00:00
0765207641 Fix ScriptingHost with threadsafe debug JS builds
This was SVN commit r7228.
2009-12-28 14:50:20 +00:00