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
321cc8ae8f
Convert resource data in entity templates
...
This was SVN commit r7321.
2010-02-12 22:46:07 +00:00
ea4c22fc0e
Convert walking speed data in entity templates
...
This was SVN commit r7312.
2010-02-07 19:54:58 +00:00
c50fe9b8c0
Convert health, armour, attack data in entity templates
...
This was SVN commit r7308.
2010-02-05 21:45:31 +00:00
e1b2a7f3ad
Fix errors and warnings with optimised builds
...
This was SVN commit r7304.
2010-02-03 19:43:39 +00:00
10f0432fdf
Fix Atlas startup crash with old simulation system
...
This was SVN commit r7299.
2010-02-01 20:28:48 +00:00
a0ae9062d3
Convert footprint data in entity templates
...
This was SVN commit r7292.
2010-01-29 21:07:15 +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
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
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
e8008edf1c
Fix missing includes
...
This was SVN commit r7267.
2010-01-10 11:31:31 +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
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
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
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
3334c83ce0
Fix build and tests on Linux
...
This was SVN commit r7174.
2009-11-06 18:35:32 +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
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
724418b1d6
Use extended regexps instead of advanced, for portability
...
This was SVN commit r7140.
2009-09-11 16:41:18 +00:00
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
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
008d894dd7
Fix some GCC warnings
...
This was SVN commit r7048.
2009-07-28 16:59:19 +00:00
cdfb58a62f
Fix some more GCC warnings
...
This was SVN commit r7045.
2009-07-28 09:27:56 +00:00
cd0554c6bc
Fix Linux build warnings
...
This was SVN commit r7034.
2009-07-25 20:35:48 +00:00
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
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
6525cfd39e
Patch from #259 : [FreeBSD compat] portability fixes
...
This was SVN commit r7002.
2009-07-16 16:57:59 +00:00
9e3b4276f9
Fixed build on Windows
...
This was SVN commit r6938.
2009-07-02 14:04:59 +00:00
98fe150d1e
Atlas C++/JS editing tool bridge
...
This was SVN commit r6937.
2009-07-02 13:41:41 +00:00
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
cc572d26c7
Fixed wxJS GetKeyState. Fixed crash when manipulating a destroyed button.
...
This was SVN commit r6935.
2009-07-02 11:47:32 +00:00
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
9a977c9962
Fixed Linux build issue
...
This was SVN commit r6931.
2009-06-26 21:49:46 +00:00
b7802901c5
Added wxSizer::clear to wxJS
...
This was SVN commit r6930.
2009-06-26 21:45:37 +00:00
0e9169a158
Avoid boolean ambiguity
...
This was SVN commit r6929.
2009-06-26 21:44:54 +00:00
a56bd4b2c1
Add GPL header to Atlas code
...
This was SVN commit r6910.
2009-06-20 16:13:29 +00:00
43ba574b85
Set svn:eol-style=native
...
This was SVN commit r6909.
2009-06-20 16:11:53 +00:00
bc78e877be
Add a script that I forgot to commit earlier
...
This was SVN commit r6908.
2009-06-20 14:57:02 +00:00
37dbdf4969
Expose wxGetKeyState via wxJS
...
This was SVN commit r6907.
2009-06-20 14:53:38 +00:00
8c175a7f29
Test XML attribute value encoding
...
This was SVN commit r6820.
2009-04-13 17:50:26 +00:00
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
435177434b
More autobuilder WIP
...
This was SVN commit r6789.
2009-03-27 00:40:18 +00:00
0b139cbd99
Autobuilder update (WIP)
...
This was SVN commit r6788.
2009-03-26 23:46:52 +00:00
433c34cd94
Fix warnings on Windows
...
This was SVN commit r6776.
2009-03-24 23:07:48 +00:00
079d9032ac
Fix memory leak
...
This was SVN commit r6769.
2009-03-24 00:28:24 +00:00
fd20cda5b6
# More XML stuff
...
Added some tests for Xeromyces. Refactored it a bit to make it testable.
This was SVN commit r6768.
2009-03-23 21:53:17 +00:00
f74f772a41
# More libxml2
...
Use libxml2 for parsing in Atlas. Plus some tests for it.
This was SVN commit r6764.
2009-03-23 01:07:08 +00:00
