Commit Graph

3685 Commits

Author SHA1 Message Date
434248167b Fix warnings in tests
This was SVN commit r7535.
2010-05-10 09:52:35 +00:00
afe29fdadf Fix errors and inconsistencies in entity template XML files
This was SVN commit r7532.
2010-05-09 21:46:41 +00:00
ba7d237d9a Fix triggering of "buffer too small" error during some stack dumps.
Remove dlopen's debug_assert, for POSIX compatibility and because it
causes very ugly problems when dumping the stack if the Collada DLL is
missing.

This was SVN commit r7530.
2010-05-09 19:52:13 +00:00
037770a2a3 Fix use of 'undefined' sound group on death.
Warn about implicit script/native type conversions.

This was SVN commit r7527.
2010-05-09 13:56:06 +00:00
f339837afd Try to fix potential problems when right-clicking minimap
This was SVN commit r7521.
2010-05-09 00:53:25 +00:00
3c75dba1b8 Clean up some svn:executable flags
This was SVN commit r7518.
2010-05-08 23:17:08 +00:00
e2fd560983 work around sound-related deadlock and assert on exit (due to OS X's broken OpenAL implementation)
refs #297

This was SVN commit r7516.
2010-05-08 19:11:28 +00:00
4ea28cf809 OS X Atlas build fix. Fix wcsdup emulation. Remove seemingly unneeded compile flag (closes #424).
This was SVN commit r7513.
2010-05-07 23:09:36 +00:00
4981af4a57 OS X build/warning/test fixes
This was SVN commit r7512.
2010-05-07 20:55:23 +00:00
c611bf6613 Fix RingBuf tests to not miss bugs. Fix RingBuf iterator bugs.
This was SVN commit r7511.
2010-05-07 20:24:42 +00:00
e144ef03a2 Windows build warning fix
This was SVN commit r7510.
2010-05-07 19:33:14 +00:00
dccb4643fb Update unix-build tarball: exclude some unneeded files; include files needed for tests. Fixes #489, #490.
This was SVN commit r7509.
2010-05-07 18:41:25 +00:00
dc53d739b8 Make tests clean up after themselves
This was SVN commit r7508.
2010-05-07 17:50:38 +00:00
93c30810c8 Fix tests. Tidy up some old files.
This was SVN commit r7507.
2010-05-07 16:32:33 +00:00
40f2cfd809 Skip component script tests when the mods/public/ directory is unavailable (see #490).
Report errors ealier when test data directories are missing.

This was SVN commit r7506.
2010-05-07 15:59:23 +00:00
d0599f4c7a Share component template scripts to save some memory.
This was SVN commit r7504.
2010-05-07 00:24:22 +00:00
fe53bce3b1 Rewrite the clone-object-between-JS-contexts code (for GUI<->simulation interface) to be more efficient.
Delete unnecessary unused incomplete profiler scripting support.
Clean up some JSAPI code to use newer features.
Display simulation script functions in the profiler.

This was SVN commit r7503.
2010-05-05 22:36:35 +00:00
3238cd8bc0 Fix assertion failure when using console.
Fix console breaking GL cursor position.

This was SVN commit r7502.
2010-05-03 22:09:18 +00:00
c34392053f # Add a demo map with all units on it.
Support XML-only maps with simple flat terrain.

This was SVN commit r7501.
2010-05-03 19:13:58 +00:00
04018773fd Fix fixed overflow when pathfinding across smallish maps
This was SVN commit r7500.
2010-05-03 19:12:42 +00:00
646c218b2e Reduce the likelihood of units getting stuck when walking
This was SVN commit r7499.
2010-05-03 16:46:14 +00:00
ef602c3dfd fixes/improvements from work
- improved form of noncopyable that avoids inheritance warnings
- PCH updates to allow more restrictive MINIMAL_PCH
sound/SoundGroup.cpp: fix copy-paste error

This was SVN commit r7498.
2010-05-03 12:27:39 +00:00
f33706bf8b Switch everything to 15.16-bit precision fixeds, to allow more accurate unit vectors and angles.
This was SVN commit r7497.
2010-05-02 20:32:37 +00:00
ab45b4c787 Overflow checking in CFixed. Patch by JubJub (see #420).
This was SVN commit r7496.
2010-05-02 20:16:53 +00:00
d485ecafdc Optimise pathfinder tile storage a bit (improves speed by maybe 10%).
Increase the maximum search tile limit (reduces worst-case speed by
lots).

This was SVN commit r7495.
2010-05-02 20:14:09 +00:00
3972134de9 minor fixes
This was SVN commit r7494.
2010-05-01 18:43:05 +00:00
9864da20fc vfs: disable error dialog if file not found
SoundGroup.cpp: add proper error reporting if snd_open fails

This was SVN commit r7493.
2010-05-01 18:36:24 +00:00
e140aa7baf Avoid running the old simulation code in the background when it's not needed.
Optimise GUI updates to only occur when necessary.
Switch to more peaceful music after starting the game.

This was SVN commit r7492.
2010-05-01 16:20:58 +00:00
49574953b8 Make JS sound objects only self-destruct when fading to 0
This was SVN commit r7491.
2010-05-01 16:10:02 +00:00
4fe991074f Expose Footprint::GetShape and TemplateManager::FindAllTemplates to scripts.
Make CSimContext accessible to all component code, so they don't all
have to save their own copies of it.

This was SVN commit r7490.
2010-05-01 09:48:39 +00:00
c5f8ca32a2 64-bit compat in BMP code
This was SVN commit r7489.
2010-05-01 09:45:58 +00:00
8d08a15edb Hide cursor when taking big screenshots
This was SVN commit r7488.
2010-05-01 09:45:27 +00:00
1b51cf7ad5 Fix obstruction shapes for some buildings
This was SVN commit r7487.
2010-05-01 09:44:28 +00:00
cfae58928f # New unit movement system, which does a far better job of approaching targets and avoiding obstacles.
Add short-range vertex-based pathfinder.
Integrate new pathfinder into unit motion code.
Change obstruction system to get rid of circles, and differentiate
structures from units.
Make PositionChanged messages synchronous.
Try to prevent some accidental float->int conversions.

This was SVN commit r7484.
2010-04-29 23:36:05 +00:00
5daac34ef9 Support startup scripts in map files, for testing.
Support CDATA sections when writing XML.

This was SVN commit r7483.
2010-04-29 23:22:18 +00:00
08720c9a58 Convert minimap data in entity templates
This was SVN commit r7481.
2010-04-23 18:37:37 +00:00
f4ad5906c9 # Display units on the minimap
This was SVN commit r7480.
2010-04-23 18:36:48 +00:00
29b458da40 # Use the footprint shape when rendering unit selection outlines
This was SVN commit r7479.
2010-04-23 16:57:18 +00:00
dd809f83e8 # Add documentation of the entity template XML file format.
Simplify the format a bit.
Use less <interleave> in the RNG so that error reports become
understandable.
Fixes #491.

This was SVN commit r7478.
2010-04-23 16:09:03 +00:00
116645ff74 Update the entity templates to a slightly cleaner format
This was SVN commit r7477.
2010-04-23 16:07:45 +00:00
e738d2f7fc MSVC warning 'fix'
This was SVN commit r7473.
2010-04-19 21:57:56 +00:00
227e86018b Update the entity conversion/validation scripts to work with internal data
This was SVN commit r7470.
2010-04-19 20:53:50 +00:00
08db7ebe13 # Support training units in buildings.
Includes basic batch training (see #298).

This was SVN commit r7469.
2010-04-19 19:47:23 +00:00
45368671c4 Convert training queue data in entity templates.
This was SVN commit r7468.
2010-04-19 19:45:31 +00:00
0d8338c90e # GUI bug fixes.
Fix updates of GUI text positions when an ancestor object's
size/position changes.
Fix CPos parsing to handle negative values.

This was SVN commit r7466.
2010-04-19 19:43:05 +00:00
9f1d904278 # Fix use-of-freed-memory bug.
Don't call xmlCleanupParser after parsing documents.
("This function name is somewhat misleading. It does not clean up parser
state, it cleans up memory allocated by the library itself.")

This was SVN commit r7465.
2010-04-18 16:35:06 +00:00
0547757a30 Make CUnit::GetModel return a reference so it's clear it can never be NULL.
This was SVN commit r7464.
2010-04-17 11:44:08 +00:00
6a9de50692 # Use the correct projectile models.
Fixes #470.
Make CUnit::GetObject return a reference so it's clear it can never be
NULL.

This was SVN commit r7463.
2010-04-17 11:34:40 +00:00
b6a9e0e9b7 # Support '[', ']' keys for camera rotation in scenario editor
This was SVN commit r7460.
2010-04-17 11:28:54 +00:00
d6ab843f9d # Documentation updates
This was SVN commit r7457.
2010-04-15 19:59:07 +00:00
3a1abb5d8f # Compile gameplay scripts in strict mode.
Fixes #487.

This was SVN commit r7456.
2010-04-14 18:57:50 +00:00
3117f52d7c # Automatic runtime validation of entity template files.
Fixes #413.

This was SVN commit r7455.
2010-04-14 17:22:32 +00:00
f9195d8a29 Update source contributors list (see #472)
This was SVN commit r7454.
2010-04-14 10:29:14 +00:00
40688ec5df # Initial support for automatic validation of entity template XML.
Add RelaxNG schemas for all current components.
Add -dumpSchema command-line option to dump the combined entity schema.
Add a Perl script to validate entity templates against the schema.
See #413.

This was SVN commit r7452.
2010-04-09 19:02:39 +00:00
336817a849 Update entity template conversion to be more correct and consistent
This was SVN commit r7451.
2010-04-09 18:48:11 +00:00
cf48ff0588 Expose JS_HasProperty
This was SVN commit r7449.
2010-04-09 18:45:28 +00:00
1fa8052cbe Support 'replace' attribute in entity template inheritance.
Escape whitespace when emitting XML, to avoid attribute-value
normalization.

This was SVN commit r7448.
2010-04-09 18:43:50 +00:00
2f34e5fbc6 Fix #472 (fixed-point CTerrain::GetExactGroundLevel), based on patch from JubJub
This was SVN commit r7443.
2010-04-06 17:31:38 +00:00
c02771fef2 Remove CSoundGroupMgr, since it is unnecessary and broken and leaks memory
This was SVN commit r7442.
2010-04-06 15:17:06 +00:00
27556f4b21 Fix window title only displaying the first character
This was SVN commit r7440.
2010-04-06 12:32:17 +00:00
b4f680594b fixes from work:
- correct AllocateAligned deleter and alignment value
- workaround for boost #pragma pack warnings
add DivideRoundUp

This was SVN commit r7439.
2010-04-06 12:06:02 +00:00
4c0d47707b # Fix animation syncing.
Make animations trigger sound effects.
Adjust attack animation timings to match simulation.
Simplify the animation speed settings.

This was SVN commit r7438.
2010-04-05 23:09:34 +00:00
cfca28cab0 # Initial audio integration with new simulation system.
Support sound group playback from simulation scripts. See #486.
Update some sound group files to sound better for rough testing.
Clean up CSoundGroup a tiny bit.

This was SVN commit r7437.
2010-04-04 21:24:39 +00:00
7275071785 Convert sound data in entity templates
This was SVN commit r7436.
2010-04-04 21:12:21 +00:00
0d6882dad2 # Fix the actor viewer in Atlas.
Delete the old standalone actor viewer.
Import some terrain textures that are useful for tools.
Fixes #483.

This was SVN commit r7428.
2010-04-03 11:07:42 +00:00
6fb5c1b307 lib/ changes required at work:
- allow building regardless of UNICODE setting (e.g. use LoadLibraryW
instead of LoadLibrary)
- export dlopen etc.
- more robust redirection of stdout

This was SVN commit r7427.
2010-04-03 10:46:28 +00:00
45fa351feb Revert unnecessary bcb462ad87
This was SVN commit r7422.
2010-04-01 08:18:16 +00:00
870fe8bfe5 fix nvidia multimon gamma issue ("if at first you fail, try again..")
refs #480

This was SVN commit r7421.
2010-03-31 22:26:08 +00:00
bcb462ad87 windows build fix
(should HAVE_VALGRIND go into e.g. lib/config2.h?)

This was SVN commit r7420.
2010-03-31 22:24:16 +00:00
e1c6249eab Fix warning and debug spew on OS X
This was SVN commit r7417.
2010-03-31 20:33:42 +00:00
1ebebc4338 Avoid -Wnon-virtual-dtor warnings
This was SVN commit r7416.
2010-03-31 08:36:46 +00:00
ba282e3d8e Fixes to the release build script
This was SVN commit r7414.
2010-03-30 21:13:51 +00:00
5a5a269b93 Let Atlas find data files when cwd is not binaries/system. Fixes #481.
This was SVN commit r7412.
2010-03-29 10:24:17 +00:00
38feae61fb Minor bug fixes
This was SVN commit r7411.
2010-03-29 10:22:34 +00:00
13302cc133 Disable visible warnings when gamma-setting fails. Fixes #480.
This was SVN commit r7410.
2010-03-28 18:33:35 +00:00
53744640ec Fix non-PCH builds
This was SVN commit r7409.
2010-03-28 18:21:48 +00:00
672b1221c3 Disable executable stacks in .asm files
This was SVN commit r7408.
2010-03-28 18:20:46 +00:00
9ad4b210dc Fix #479 (water animation in new simulation system)
This was SVN commit r7407.
2010-03-27 17:19:00 +00:00
45184baacf Add script for generating release distributions
This was SVN commit r7406.
2010-03-27 12:39:23 +00:00
49eb176b25 Fix MSVC compiler warnings (replace most M_PI with (float)M_PI)
This was SVN commit r7404.
2010-03-26 19:04:40 +00:00
5dce8a2d8c Disable failing test on Windows. See #478.
This was SVN commit r7403.
2010-03-26 18:58:17 +00:00
ccbc8d534a Show DRI S3TC message on all platforms that probably use Mesa. See #313.
This was SVN commit r7402.
2010-03-26 17:22:13 +00:00
89cce1b3ac # Switch to new simulation system by default
This was SVN commit r7401.
2010-03-26 16:10:42 +00:00
9b6326f124 Always build with Valgrind support. Always use the bundled Valgrind header.
This was SVN commit r7397.
2010-03-26 10:31:47 +00:00
00e18e4ea8 Report S3TC non-support with an in-game GUI message box.
Fixes #313.

This was SVN commit r7390.
2010-03-23 22:45:07 +00:00
58e79bfdbe Force fancywater off if fragment shader extensions are not supported. See #270
This was SVN commit r7385.
2010-03-21 14:18:15 +00:00
148ff026ca Avoid apparent error on OS X by simplifying wopen API to avoid varargs.
Remove unused sys_wopen.

This was SVN commit r7384.
2010-03-21 12:42:50 +00:00
248749c1aa Fix console history loading
This was SVN commit r7383.
2010-03-20 22:01:39 +00:00
a8b3cc4812 add both the (potentially) read-only data from SVN and the appdata path to the config/ search path
(fixes #450)

This was SVN commit r7382.
2010-03-20 21:37:14 +00:00
bf444a8aa1 Load libraries from rpath=$ORIGIN instead of from cwd. Fixes #288
This was SVN commit r7381.
2010-03-20 20:55:54 +00:00
0bbb99c3cd move M_PI etc. to wposix.h to ensure they're always present on Windows (previously required MathUtil.h)
use M_PI instead of nonstandard PI

This was SVN commit r7380.
2010-03-20 20:54:03 +00:00
d1c5119694 fix: mustn't create directories during mount's vfs path traversal (because they may not be associated with a directory, especially in the common case of mounting into the root directory)
fixes #459

This was SVN commit r7378.
2010-03-20 19:26:12 +00:00
a5b8ec6028 Add obstruction debug mode, with GUI toggle.
Make pathfinder debug mode off by default, with GUI toggle.

This was SVN commit r7377.
2010-03-20 19:18:01 +00:00
4059826759 when mounting a mod, don't attempt to create the directories (it's reasonable to assume the mod must exist, there is no value in creating a dummy mod directory - unlike the screenshots/logs etc. mounts)
this fixes write errors because mods/internal doesn't exist in public
SVN checkouts and the default mount logic tries to mount internal anyway
(and now just fails that operation silently)
fixes #458

This was SVN commit r7375.
2010-03-20 18:12:48 +00:00
bdfe28766a osx fix: TIMER_ADD_CLIENT identifier conflicted with the name of an existing symbol (namely the OpenGL function whose time was being measured)
This was SVN commit r7374.
2010-03-20 17:46:45 +00:00
73f67a2272 set crashlog location as soon as it is known to avoid writing to the default location (system/binaries), which might not be writable.
fixes #403

This was SVN commit r7373.
2010-03-20 17:20:23 +00:00
7a870170c9 SpiderMonkey version check
This was SVN commit r7372.
2010-03-20 17:00:21 +00:00
23a702c335 # OS X build fixes.
spidermonkey-tip script fix.
GCC 4.2 compatibility.
Remove redundant code in extern_libs.lua

This was SVN commit r7371.
2010-03-20 16:26:25 +00:00
901056e5b3 Fix Windows build warning
This was SVN commit r7369.
2010-03-19 21:31:48 +00:00
96382e6faf Fix jsval/int ambiguity
This was SVN commit r7368.
2010-03-19 21:23:33 +00:00
ed69187450 Build with spidermonkey-tip by default. Remove codepaths for old SpiderMonkey.
This was SVN commit r7366.
2010-03-19 20:54:44 +00:00
e7e8b8dbc3 Fix spidermonkey-tip to build on Windows. Add precompiled binaries.
This was SVN commit r7365.
2010-03-19 20:28:22 +00:00
31febafb05 Compatibility with non-threadsafe SpiderMonkey
This was SVN commit r7364.
2010-03-19 19:54:00 +00:00
baead3409e Move Position.h to a better location.
Update some files I forgot in previous commits.

This was SVN commit r7361.
2010-03-17 23:13:21 +00:00
18b5a7f17c Add the Obstruction component to entity previews, to support collision detection for building placement
This was SVN commit r7360.
2010-03-17 23:02:40 +00:00
0f0a3774d0 Split collision detection out of pathfinder so it can be used more widely.
Support collision detection of footprints.

This was SVN commit r7359.
2010-03-17 23:01:12 +00:00
705db5181d Fix non-smooth vertical interpolation of unit positions
This was SVN commit r7358.
2010-03-17 22:57:36 +00:00
99a261328a Support scripted modulation of actor colours
This was SVN commit r7357.
2010-03-17 22:56:49 +00:00
bcd5e78b7a Fix test code
This was SVN commit r7356.
2010-03-17 22:53:47 +00:00
79ea8213e5 const-correctness
This was SVN commit r7355.
2010-03-17 22:51:47 +00:00
aca1074188 Load build speeds and foundation actors from entity template files
This was SVN commit r7353.
2010-03-12 22:28:51 +00:00
9213ee8c27 # Construct buildings from foundations.
Display construction costs in tooltips.
Stop buildings leaving corpses.
Add debug info option to GUI.

This was SVN commit r7352.
2010-03-12 21:41:40 +00:00
c55cba34e5 Fix shape ID allocation bug in pathfinder
This was SVN commit r7351.
2010-03-12 20:42:33 +00:00
06928f7694 # Basic bandbox selection of units in new simulation system
This was SVN commit r7349.
2010-03-11 20:01:16 +00:00
86205b4d8e # Basic projectile attacks in new simulation system
This was SVN commit r7347.
2010-03-07 21:38:39 +00:00
36e90e71f2 Convert ranged attack data in entity templates
This was SVN commit r7346.
2010-03-07 20:22:15 +00:00
1712b2cdb1 # Support death in new simulation system
This was SVN commit r7344.
2010-03-07 20:14:30 +00:00
9a1fab5243 Build fixes (closes #464)
This was SVN commit r7343.
2010-03-03 14:14:26 +00:00
a7484933e7 wchar.h -> utf8.h (see previous change)
This was SVN commit r7341.
2010-03-01 14:55:34 +00:00
1861448e6c needed to split lib into separate headers and source files, which requires lots of drudgery to specify paths for each include filename (no longer relying on same-directory lookups)
also rename wchar -> utf8 to avoid conflict with <wchar.h> (requires
rebuild of workspace)
(unfortunately copying history fails to "502 bad gateway"; had to delete
old + add new independently)

This was SVN commit r7340.
2010-03-01 14:52:58 +00:00
adb3847e38 export pthread and byte_order functions
remove ia32_memcpy (no longer provides performance benefit for >= SSE2
CPUs)

This was SVN commit r7339.
2010-03-01 13:54:33 +00:00
633705c832 Support <repeat> in the GUI XML files, as a primitive mechanism to simplify the definition of repetitive structures (like lists of buttons)
This was SVN commit r7336.
2010-02-28 21:36:25 +00:00
275d22742d Fix some rendering glitches
This was SVN commit r7335.
2010-02-28 21:29:23 +00:00
d1f53b9654 Allow GUI scripts to save some data across hotloads
This was SVN commit r7334.
2010-02-28 21:28:09 +00:00
48c871980e Make tooltips update dynamically when the underlying text changes
This was SVN commit r7333.
2010-02-28 21:26:06 +00:00
dc0cd4bedd Move test cache output into a better place
This was SVN commit r7332.
2010-02-28 21:22:52 +00:00
5bb14c7a59 Misc. unity fixes (missing includes, undefs, and other things that could be considered generic cleanup)
This was SVN commit r7328.
2010-02-18 00:06:50 +00:00
4d891117c5 Refactor the NetMessageType system to work in unity builds and remove BLOCK_SIZE macro that caused conflicts and wasn't really used anyway.
This was SVN commit r7327.
2010-02-17 23:38:50 +00:00
02253f82f0 Add/rename header guards
This was SVN commit r7326.
2010-02-17 23:21:49 +00:00
96bb3afaaf Support disabling of inherited components in entity templates
Allow units to walk through farms

This was SVN commit r7323.
2010-02-12 22:48:16 +00:00
f8aca33a14 # Support resource gathering in new simulation system
This was SVN commit r7322.
2010-02-12 22:46:53 +00:00
321cc8ae8f Convert resource data in entity templates
This was SVN commit r7321.
2010-02-12 22:46:07 +00:00
abe5d3185f Fix crash when constructing buildings off the edge of the map
This was SVN commit r7320.
2010-02-12 12:01:46 +00:00
60a9e63c71 # Improved unit animation in new simulation system
Tried to make the motion/AI/animation state transitions saner
Added smoothed rotation of moving units
Slightly more informative error reporting

This was SVN commit r7319.
2010-02-10 19:28:46 +00:00
02ffe82ab7 Optimised pathfinder, particularly to avoid slow MSVC debug STL.
Added rough pathfinder test system.
MapReader: support loading maps into a minimal non-graphical environment
(for tests).

This was SVN commit r7317.
2010-02-08 22:05:05 +00:00
c2fd939898 license change to the more permissible Expat/MIT license for lib/ (see forum thread)
This was SVN commit r7316.
2010-02-08 16:23:39 +00:00
cdf0ef1908 add SSE4 cap bits
This was SVN commit r7315.
2010-02-08 15:56:43 +00:00
d609a9f81c # Basic animation support in new simulation system.
Movement speed.
Improved accuracy of walking.

This was SVN commit r7313.
2010-02-07 20:06:16 +00:00
ea4c22fc0e Convert walking speed data in entity templates
This was SVN commit r7312.
2010-02-07 19:54:58 +00:00
b25076ed4d Min/max range support in pathfinder
This was SVN commit r7311.
2010-02-06 20:58:48 +00:00
b21e798243 # Primitive melee combat support in new simulation system
This was SVN commit r7309.
2010-02-05 22:00:39 +00:00
c50fe9b8c0 Convert health, armour, attack data in entity templates
This was SVN commit r7308.
2010-02-05 21:45:31 +00:00
7770b414b7 Fix hotloading of scripts with registered message handlers
This was SVN commit r7307.
2010-02-05 21:40:08 +00:00
bd4cd244cf Make -autostart=mapname more useful with new sim system
This was SVN commit r7306.
2010-02-03 20:46:05 +00:00
258581c72c Update contributors list
This was SVN commit r7305.
2010-02-03 20:08:53 +00:00
e1b2a7f3ad Fix errors and warnings with optimised builds
This was SVN commit r7304.
2010-02-03 19:43:39 +00:00
50b79962ad fix off-by-one error in wcscpy_s parameter list causing crash when copying error dialog text
closes #454
Thanks to Erik for reporting this!

This was SVN commit r7303.
2010-02-03 11:01:58 +00:00
1fb9a1768e Make CParamNode not return NULL pointers, based on patch from Puel
Fixes #425, #451

This was SVN commit r7302.
2010-02-02 23:01:17 +00:00
9829138e56 Handle pathfinding to inaccessible points better.
Make the path debug display more useful.

This was SVN commit r7301.
2010-02-02 21:22:22 +00:00
cc0c3988d1 build fixes
This was SVN commit r7300.
2010-02-02 13:57:52 +00:00
10f0432fdf Fix Atlas startup crash with old simulation system
This was SVN commit r7299.
2010-02-01 20:28:48 +00:00
0d12738452 Fix crashlog code so it doesn't always crash when trying to generate the crashlog
This was SVN commit r7298.
2010-02-01 20:25:42 +00:00
e0ed8a1629 # Pathfinder updates
More hacks so units follow paths relatively smoothly, and to avoid
pathfinding in simple situations

This was SVN commit r7296.
2010-01-30 13:11:58 +00:00
fa1fd65a3e Add a hack in the pathfinder to pick more diagonal paths
This was SVN commit r7295.
2010-01-29 23:20:42 +00:00
1678055edd Fix build warnings
This was SVN commit r7294.
2010-01-29 21:34:09 +00:00
6a2d237aad # Initial pathfinder integration in new simulation system
Minor extra terrain overlay features

This was SVN commit r7293.
2010-01-29 21:13:18 +00:00
a0ae9062d3 Convert footprint data in entity templates
This was SVN commit r7292.
2010-01-29 21:07:15 +00:00
3c2e80c698 Disable the default slide-down-hills behaviour
This was SVN commit r7290.
2010-01-27 19:34:58 +00:00
c399dc277e # Rough first version of GUI redesign
Minor GUI engine cleanups

This was SVN commit r7289.
2010-01-27 19:20:34 +00:00
0e8698d652 Build fixes
This was SVN commit r7288.
2010-01-27 19:05:02 +00:00
f011f0a3ce Expose entity template data to GUI
This was SVN commit r7287.
2010-01-25 23:43:58 +00:00
3f1dfce41b Simplify GUI/simulation interface
This was SVN commit r7286.
2010-01-25 22:31:43 +00:00
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
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
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
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
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
b3d2f665d3 Fix ConfigDB storing invalid values (with LSB set) in JS privates
This was SVN commit r7227.
2009-12-28 14:49:31 +00:00
a39cb0c83e Fix --without-pch build
This was SVN commit r7224.
2009-12-23 01:46:44 +00:00
6fbc524e65 # Terrain-related bug fixes
Fix several off-by-one errors
Reorder some loops to be theoretically more efficient
Other minor cleanups

This was SVN commit r7221.
2009-12-12 17:52:38 +00:00
72ce122146 # Fix OS X build error
Fixes #414 (wcscasecmp does not exist on OS X), based on patch from
wacko

This was SVN commit r7217.
2009-12-03 22:55:33 +00:00
9709e80936 Fix MSVC warning
This was SVN commit r7215.
2009-12-03 21:13:27 +00:00
f0d9806b3f # Restructured GUI implementation
CGUI now represents a single 'page'. CGUIManager maintains multiple
pages and switches between them.
Split the XML files into pregame, loading, session and messagebox pages.
Added hotloading of GUI pages.
Minor GUI cleanups.
(Merge from hg 81862d33780c)

This was SVN commit r7214.
2009-12-03 20:17:22 +00:00
f85f0c0c2e (Dummy change to help hgsvn)
This was SVN commit r7213.
2009-12-03 20:10:22 +00:00
455137afed Fix broken tests
This was SVN commit r7211.
2009-11-24 15:36:08 +00:00
ab14b71a76 List Lars Kemmann (Caius), for patch in 181a3529de
This was SVN commit r7210.
2009-11-24 13:34:38 +00:00
88ad49bfc2 OS X build fix
This was SVN commit r7209.
2009-11-23 13:02:07 +00:00
181a3529de Fix #402 (Clean up GUItypes.h), based on patch from Caius
This was SVN commit r7206.
2009-11-19 21:44:19 +00:00
7738eecbb0 icc build fix
This was SVN commit r7204.
2009-11-16 23:45:56 +00:00
22ac887785 fix: don't raise warnings when overwriting previous realDirectory (e.g. in the case of multiple mods mounting into the same directory) causes previous directory watches to be canceled
This was SVN commit r7202.
2009-11-16 21:01:36 +00:00
781538313c use lib/wchar.h for UTF8 conversion (avoid duplication, more aware of wchar_t differences and surrogate pairs)
fixes #400

This was SVN commit r7201.
2009-11-16 20:05:03 +00:00
b51a0187bf Fix potential unfreed memory on shutdown
This was SVN commit r7200.
2009-11-14 19:12:09 +00:00
78bc63d92c VC fix: mustn't use filename/parent_path instead of leaf/branch_path because those aren't yet available in the version of boost we're currently using.
remove needless restriction on wdbg_printf buffer size
update description of wdbg_printf to match wvsprintfW's real behavior

This was SVN commit r7199.
2009-11-14 18:32:27 +00:00
a444e6febc Don't use wide print functions on typically-byte-oriented streams
This was SVN commit r7198.
2009-11-14 11:03:43 +00:00
c377a69823 # Fix startup problem on Linux
Fix CreateDirectories when paths end in '/'
Use boost::filesystem parent_path in it, instead of deprecated
branch_path

This was SVN commit r7197.
2009-11-14 10:57:08 +00:00
51f16c30d1 Fix recently-introduced bug
This was SVN commit r7196.
2009-11-14 00:08:16 +00:00
af8d7ce98d Fix tests on Linux
This was SVN commit r7195.
2009-11-13 20:51:04 +00:00
6c8c99a107 # Greatly improve startup time on Linux, and avoid deadlocks
Handle FAM events in a background thread, instead of reading
synchronously

This was SVN commit r7194.
2009-11-13 20:26:20 +00:00
5174a0a1ce Fix GCC warnings
This was SVN commit r7192.
2009-11-13 00:49:58 +00:00
44066f5ae4 GCC build fix
This was SVN commit r7191.
2009-11-12 19:35:28 +00:00
345395375a wchar: only raise warning dialog if caller doesn't ask for a return code
update test_wchar accordingly.
app_hooks: update documentation

This was SVN commit r7190.
2009-11-10 21:07:18 +00:00
7a6109f474 debug_SkipNextError changed to debug_SkipErrors (allow skipping multiple instances of the same error code until the next debug_StopSkippingErrors, which returns the number that were skipped)
also:
- add listing of error codes to avoid collisions
- cpu: add cpu_MemoryBarrier
- wchar: warn whenever a character is replaced/invalid bytes are
encountered

This was SVN commit r7189.
2009-11-10 15:48:41 +00:00
6ee9dd8afe GCC build fixes
This was SVN commit r7188.
2009-11-09 21:40:24 +00:00
ff15c522fe implement changes suggested by Philip:
- add self-test
- allow decoding UTF8 values beyond BMP (and replace them later)
- quietly replace invalid bytes

This was SVN commit r7187.
2009-11-09 20:53:48 +00:00
593bf6a571 GCC build fixes
This was SVN commit r7186.
2009-11-09 17:36:39 +00:00
450da0aaf7 rename [w]string_to_[w]string UTF8
add safer/more portable/less dependent on locale implementation of
wchar_t <-> UTF8

This was SVN commit r7185.
2009-11-09 14:52:51 +00:00
33ec9060dd gcc compile fix (thanks to Heron for reporting the problem)
This was SVN commit r7184.
2009-11-08 18:58:14 +00:00
6cc0b1649a robustified GetPatch / GetTile:
- clarify the meaning of mapSize (patchesPerSide)
- use a single ClampCoordToMap function for clamping
- add annotations to all call sites when it is sure they will succeed
- otherwise, ensure return value is checked or at least add debug_assert
fixes #311 (successfully built house and dock at top of latium map)
thanks to Heron for tracking down the cause!

This was SVN commit r7183.
2009-11-08 16:49:52 +00:00
934bc31246 Fix GCC build error
This was SVN commit r7181.
2009-11-07 13:34:11 +00:00
43e26aa3f6 2 more dehydra fixes
This was SVN commit r7180.
2009-11-07 12:31:18 +00:00
2ef4e7353e self-test and x64 fixes:
- headerless: distinguish between allocation granularity and min size
(hopefully fixes test failure on x64)
- test_wdbg_sym: disable printf spew
- hpet: use workaround when x64 MOVD isn't available due to processor or
compiler
- JSConversions: VC2005 x64 apparently distinguishes ssize_t from long
int (as it does with size_t)

This was SVN commit r7179.
2009-11-07 12:26:40 +00:00
7cf2888323 fix to sys_vswprintf's buffer termination (caught by self-test)
This was SVN commit r7178.
2009-11-07 09:42:25 +00:00
f432d9d18b fix dehydra warnings (some of which were dangerous pass-user-string-as-format-string vulnerabilities)
This was SVN commit r7177.
2009-11-07 09:32:19 +00:00
378bd89c1d Annotate some more printf-style functions, for type checking
This was SVN commit r7176.
2009-11-06 23:06:50 +00:00
3334c83ce0 Fix build and tests on Linux
This was SVN commit r7174.
2009-11-06 18:35:32 +00:00
048d4c41c8 fix: unix doesn't have a standard wopen(). we'd like to use wchar_t _wopen on Windows, and convert to UTF8+open() on unix, which calls for adding a new sys_wopen() interface to sysdep.
This was SVN commit r7173.
2009-11-06 16:46:08 +00:00
607ea6f8b4 chip away at gcc errors/warnings
This was SVN commit r7172.
2009-11-06 16:15:09 +00:00
6ec9128e78 refactor: move reload functionality into ps/Filesystem to allow reloading non-resource files (e.g. scripts); VFS is now responsible for returning VirtualPath and invalidating the changed file/directory
This was SVN commit r7171.
2009-11-06 11:50:04 +00:00
9662666403 more string drudgery
- sprintf, snprintf -> sprintf_s (ensures 0-termination of result)
- use %s instead of %hs with sprintf_s to avoid GCC warnings
- convert h_mgr's to_string to unicode

This was SVN commit r7170.
2009-11-06 10:59:10 +00:00
25717ef768 add VirtualPath API to VFS in preparation for moving hotload logic out of library code and into the game. also rename GetRealPath -> RealPath + some cleanup/documentation
This was SVN commit r7169.
2009-11-06 01:30:16 +00:00