Commit graph

507 commits

Author SHA1 Message Date
Ykkrosh
5c03456a38 Windows build fix
This was SVN commit r7604.
2010-06-02 23:08:45 +00:00
Ykkrosh
ed90168b72 Support WASD camera movement in Atlas.
Fix some issues with losing focus while moving the camera in Atlas.

This was SVN commit r7603.
2010-06-02 10:13:26 +00:00
Ykkrosh
23ab6dad38 Make session GUI visible and usable when playtesting from Atlas.
Fix Atlas icon on non-Windows.
Remove some nonexistent-hotkey config.

This was SVN commit r7602.
2010-06-02 00:36:21 +00:00
Ykkrosh
6de0cdc5f9 Delete old obsolete font builder tool and related files
This was SVN commit r7599.
2010-05-31 19:04:39 +00:00
Ykkrosh
47ca9fc6cb Autobuild fixes (untested)
This was SVN commit r7597.
2010-05-30 15:18:24 +00:00
Ykkrosh
7dca91f26b # Various changes to the text rendering system.
Rewrite font builder tool to be much simpler and to support more text
effects.
Change GUI to use new set of fonts.
Switch font textures from TGA to PNG so they're easier for the font
builder to create.
Support RGBA font textures (for e.g. stroked text).
Greatly improve text rendering performance by using vertex arrays.
Fix rendering code leaving vertex buffers bound.
Add 'clip' property to GUI text objects, to disable clipping when
rendering.
Delete part of unused console function registration system.

This was SVN commit r7595.
2010-05-30 13:42:56 +00:00
Ykkrosh
11a20e1bcf # Handle terrain passability and movement costs in pathfinder.
Simplify terrain code (remove Handle indirection).
Delete unused terrain properties.

This was SVN commit r7590.
2010-05-27 23:31:03 +00:00
Ykkrosh
828400d82e # Support floating units in new simulation system.
Fix rendering of underwater lines.
Fix rendering of unit selection outlines in Atlas.
Remove some obsolete hotkeys.

This was SVN commit r7589.
2010-05-27 23:23:53 +00:00
Ykkrosh
6fdb947ff0 Convert CCmpTemplateManager to use ASCII strings internally, to save memory and serialisation cost.
This was SVN commit r7577.
2010-05-25 18:17:12 +00:00
Ykkrosh
cf85004f61 Windows build fixes.
Remove unused function.

This was SVN commit r7557.
2010-05-20 20:05:38 +00:00
Ykkrosh
56bb858802 # Delete a lot of obsolete simulation code.
This was SVN commit r7555.
2010-05-20 18:09:23 +00:00
Ykkrosh
c684c211a2 # Basic experimental multiplayer integration with new simulation system.
Add new turn manager that should be more correct and potentially more
efficient.
Remove evil CNetServer/CNetClient multiple inheritance of CTurnManager.
Add multiplayer autostart.
Various minor cleanups.

This was SVN commit r7551.
2010-05-20 00:59:01 +00:00
Ykkrosh
cdcee291cf Convert all remaining entity template data to new file format.
Add dummy component implementations for new data.
Partly support multiple weapons for a single unit.

This was SVN commit r7547.
2010-05-15 21:07:52 +00:00
Ykkrosh
afe29fdadf Fix errors and inconsistencies in entity template XML files
This was SVN commit r7532.
2010-05-09 21:46:41 +00:00
Ykkrosh
3c75dba1b8 Clean up some svn:executable flags
This was SVN commit r7518.
2010-05-08 23:17:08 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
1b51cf7ad5 Fix obstruction shapes for some buildings
This was SVN commit r7487.
2010-05-01 09:44:28 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
08720c9a58 Convert minimap data in entity templates
This was SVN commit r7481.
2010-04-23 18:37:37 +00:00
Ykkrosh
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
Ykkrosh
116645ff74 Update the entity templates to a slightly cleaner format
This was SVN commit r7477.
2010-04-23 16:07:45 +00:00
Ykkrosh
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
Ykkrosh
45368671c4 Convert training queue data in entity templates.
This was SVN commit r7468.
2010-04-19 19:45:31 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
b6a9e0e9b7 # Support '[', ']' keys for camera rotation in scenario editor
This was SVN commit r7460.
2010-04-17 11:28:54 +00:00
Ykkrosh
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
Ykkrosh
336817a849 Update entity template conversion to be more correct and consistent
This was SVN commit r7451.
2010-04-09 18:48:11 +00:00
Ykkrosh
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
Ykkrosh
7275071785 Convert sound data in entity templates
This was SVN commit r7436.
2010-04-04 21:12:21 +00:00
Ykkrosh
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
Ykkrosh
1ebebc4338 Avoid -Wnon-virtual-dtor warnings
This was SVN commit r7416.
2010-03-31 08:36:46 +00:00
Ykkrosh
ba282e3d8e Fixes to the release build script
This was SVN commit r7414.
2010-03-30 21:13:51 +00:00
Ykkrosh
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
Ykkrosh
45184baacf Add script for generating release distributions
This was SVN commit r7406.
2010-03-27 12:39:23 +00:00
Ykkrosh
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
Ykkrosh
89cce1b3ac # Switch to new simulation system by default
This was SVN commit r7401.
2010-03-26 16:10:42 +00:00
Ykkrosh
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
janwas
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
Ykkrosh
96382e6faf Fix jsval/int ambiguity
This was SVN commit r7368.
2010-03-19 21:23:33 +00:00
Ykkrosh
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
Ykkrosh
31febafb05 Compatibility with non-threadsafe SpiderMonkey
This was SVN commit r7364.
2010-03-19 19:54:00 +00:00
Ykkrosh
aca1074188 Load build speeds and foundation actors from entity template files
This was SVN commit r7353.
2010-03-12 22:28:51 +00:00
Ykkrosh
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
Ykkrosh
36e90e71f2 Convert ranged attack data in entity templates
This was SVN commit r7346.
2010-03-07 20:22:15 +00:00
janwas
a7484933e7 wchar.h -> utf8.h (see previous change)
This was SVN commit r7341.
2010-03-01 14:55:34 +00:00
olsner
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
olsner
02253f82f0 Add/rename header guards
This was SVN commit r7326.
2010-02-17 23:21:49 +00:00
Ykkrosh
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
Ykkrosh
321cc8ae8f Convert resource data in entity templates
This was SVN commit r7321.
2010-02-12 22:46:07 +00:00
Ykkrosh
ea4c22fc0e Convert walking speed data in entity templates
This was SVN commit r7312.
2010-02-07 19:54:58 +00:00
Ykkrosh
c50fe9b8c0 Convert health, armour, attack data in entity templates
This was SVN commit r7308.
2010-02-05 21:45:31 +00:00
Ykkrosh
e1b2a7f3ad Fix errors and warnings with optimised builds
This was SVN commit r7304.
2010-02-03 19:43:39 +00:00
Ykkrosh
10f0432fdf Fix Atlas startup crash with old simulation system
This was SVN commit r7299.
2010-02-01 20:28:48 +00:00
Ykkrosh
a0ae9062d3 Convert footprint data in entity templates
This was SVN commit r7292.
2010-01-29 21:07:15 +00:00
Ykkrosh
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
Ykkrosh
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
Ykkrosh
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
Ykkrosh
f5632af192 Fix Undo menu labelling in Atlas
This was SVN commit r7275.
2010-01-14 20:11:43 +00:00
Ykkrosh
e8008edf1c Fix missing includes
This was SVN commit r7267.
2010-01-10 11:31:31 +00:00
Ykkrosh
47420c363b Windows build fix
This was SVN commit r7260.
2010-01-09 19:45:35 +00:00
Ykkrosh
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
Ykkrosh
3339aea2a7 Add tooltip support to wxJS
This was SVN commit r7258.
2010-01-07 19:38:05 +00:00
Ykkrosh
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
Ykkrosh
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
janwas
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
Ykkrosh
3334c83ce0 Fix build and tests on Linux
This was SVN commit r7174.
2009-11-06 18:35:32 +00:00
janwas
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
janwas
8a52113e60 huge cleanup and conversion of most string handling (especially paths) to unicode
please note: format strings must be %hs for char* arguments and %ls for
wchar_t*

This was SVN commit r7161.
2009-11-03 21:46:35 +00:00
Ykkrosh
724418b1d6 Use extended regexps instead of advanced, for portability
This was SVN commit r7140.
2009-09-11 16:41:18 +00:00
Ykkrosh
5c8861adf4 Remove redundant -L linker arguments on non-Windows.
Fix some compiler warnings.
Fix missing non-PCH headers.

This was SVN commit r7083.
2009-08-07 17:22:05 +00:00
Ykkrosh
5294821694 Attempt to fix type ambiguity (http://www.wildfiregames.com/forum/index.php?showtopic=12546)
This was SVN commit r7068.
2009-08-03 09:50:23 +00:00
Ykkrosh
008d894dd7 Fix some GCC warnings
This was SVN commit r7048.
2009-07-28 16:59:19 +00:00
Ykkrosh
cdfb58a62f Fix some more GCC warnings
This was SVN commit r7045.
2009-07-28 09:27:56 +00:00
Ykkrosh
cd0554c6bc Fix Linux build warnings
This was SVN commit r7034.
2009-07-25 20:35:48 +00:00
Ykkrosh
21b3d13c64 Avoid calling unnecessary inline functions, to work around GCC visibility issues (see #281)
This was SVN commit r7030.
2009-07-22 16:37:40 +00:00
olsner
7a942d29e7 Only try to use valgrind stuff if --with-valgrind is given to update-workspaces.sh
This was SVN commit r7018.
2009-07-18 02:06:42 +00:00
Ykkrosh
6525cfd39e Patch from #259: [FreeBSD compat] portability fixes
This was SVN commit r7002.
2009-07-16 16:57:59 +00:00
Ykkrosh
9e3b4276f9 Fixed build on Windows
This was SVN commit r6938.
2009-07-02 14:04:59 +00:00
Ykkrosh
98fe150d1e Atlas C++/JS editing tool bridge
This was SVN commit r6937.
2009-07-02 13:41:41 +00:00
Ykkrosh
4d4dc98bb5 # Integrated Actor Viewer tool into the Scenario Editor
and rewrote its UI in JS, but lost a few features (which could be added
back later)

This was SVN commit r6936.
2009-07-02 12:58:51 +00:00
Ykkrosh
cc572d26c7 Fixed wxJS GetKeyState. Fixed crash when manipulating a destroyed button.
This was SVN commit r6935.
2009-07-02 11:47:32 +00:00
Ykkrosh
34d0f012e8 # Converted Atlas's object-settings UI into JavaScript.
(Note: This breaks the Actor Viewer, hopefully temporarily.)

This was SVN commit r6932.
2009-06-26 22:43:49 +00:00
Ykkrosh
9a977c9962 Fixed Linux build issue
This was SVN commit r6931.
2009-06-26 21:49:46 +00:00
Ykkrosh
b7802901c5 Added wxSizer::clear to wxJS
This was SVN commit r6930.
2009-06-26 21:45:37 +00:00
Ykkrosh
0e9169a158 Avoid boolean ambiguity
This was SVN commit r6929.
2009-06-26 21:44:54 +00:00
Ykkrosh
a56bd4b2c1 Add GPL header to Atlas code
This was SVN commit r6910.
2009-06-20 16:13:29 +00:00
Ykkrosh
43ba574b85 Set svn:eol-style=native
This was SVN commit r6909.
2009-06-20 16:11:53 +00:00
Ykkrosh
bc78e877be Add a script that I forgot to commit earlier
This was SVN commit r6908.
2009-06-20 14:57:02 +00:00
Ykkrosh
37dbdf4969 Expose wxGetKeyState via wxJS
This was SVN commit r6907.
2009-06-20 14:53:38 +00:00
Ykkrosh
8c175a7f29 Test XML attribute value encoding
This was SVN commit r6820.
2009-04-13 17:50:26 +00:00
Ykkrosh
2d15c81313 # Updated autobuilder to build Atlas
(and also Collada), via options in the admin UI

This was SVN commit r6792.
2009-03-27 01:19:55 +00:00
Ykkrosh
435177434b More autobuilder WIP
This was SVN commit r6789.
2009-03-27 00:40:18 +00:00
Ykkrosh
0b139cbd99 Autobuilder update (WIP)
This was SVN commit r6788.
2009-03-26 23:46:52 +00:00
Ykkrosh
433c34cd94 Fix warnings on Windows
This was SVN commit r6776.
2009-03-24 23:07:48 +00:00