1
0
forked from 0ad/0ad
Commit Graph

654 Commits

Author SHA1 Message Date
ead65712eb Delete obsolete archbuild tool
This was SVN commit r8761.
2010-12-02 18:05:16 +00:00
bd3bd084c0 Support new SpiderMonkey API.
wposix: Define int8_t compatibly with SpiderMonkey.
Remove unused camera, lightenv JS interfaces.
Remove most of vector JS interface.
Remove some of the redundant JS string conversion functions.
Remove unneeded vmem, _lodBias functions.
Clean up some formatting.

This was SVN commit r8629.
2010-11-16 23:00:52 +00:00
818ea52c3b Delete obsolete non-working i18n code
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
52851faeb6 cleanup - remove old cpu_memcpy and cpu_i64FromDouble that are no longer needed
This was SVN commit r8517.
2010-11-01 11:09:03 +00:00
5d764f1435 Run network server in a separate thread, to minimise latency.
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.

This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
8dc7eca77a Autobuilder fixes
This was SVN commit r8502.
2010-10-30 20:39:23 +00:00
10c5dbcba4 Fix Atlas and autostart.
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.

This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
9ee44bd9b8 Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590.
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
73286885d9 Fix race condition when enabling S3TC in Atlas
This was SVN commit r8448.
2010-10-23 19:58:45 +00:00
3eed24a338 Fix Mesa S3TC-enabling to work in Atlas
This was SVN commit r8433.
2010-10-21 23:44:54 +00:00
46d5fff269 Use zipped data files and pre-converted textures in release distributions
This was SVN commit r8306.
2010-10-07 19:57:31 +00:00
8dda4db8d8 Remove obsolete pmdexp tool
This was SVN commit r8303.
2010-10-07 18:50:49 +00:00
d77e70389b Fix #585 (Windows support for font builder), based on patch from historic_bruno
This was SVN commit r8269.
2010-10-04 12:00:22 +00:00
924d1219a7 # Add fog-of-war.
Move Vision component to C++, for more efficient FoW processing.
Disable FoW on demo maps.

This was SVN commit r8160.
2010-09-23 12:13:13 +00:00
4c92b7b596 Add primitive tool for generating profile graphs
This was SVN commit r8124.
2010-09-17 21:03:57 +00:00
f3c9a59d29 Fix layout errors and crash with Atlas terrain previews.
Fix warning.

This was SVN commit r8103.
2010-09-10 21:35:08 +00:00
67a94572ec # Add new texture loading system with automatic compression.
Replace almost all texture uses with calls to the new system.
Add some anistropic filtering to terrain textures.
Let Atlas load terrain texture previews partly-asynchronously by
polling.
Fix inefficient texture colour determination for minimap.
Remove unused global g_TerrainModified.
Change GUI texcoord computation to be less efficient but to cope with
dynamic texture changes.
Fix GUI renderer effects leaving bogus colour state.

This was SVN commit r8099.
2010-09-10 21:02:10 +00:00
2e7436434d warning fixes: mostly size_t vs. specialized API type and other type conversion.
added player_id_t typedef and INVALID_PLAYER, use that instead of -1.
also added sanity checks to cpu.cpp to ensure ARCH_* is correct (see
http://www.wildfiregames.com/forum/index.php?showtopic=13327&hl=)
and further predefined macros to arch.h just to be sure.

This was SVN commit r8079.
2010-09-05 09:38:30 +00:00
6c7830df3f Rename CTextureManager and CTextureEntry since they are only for terrain textures
This was SVN commit r8076.
2010-09-04 21:26:52 +00:00
81f4347c71 Fix #553 (build error when wxUSE_ON_FATAL_EXCEPTION disabled), based on patch from Karlik
This was SVN commit r8044.
2010-08-29 12:51:52 +00:00
ac9340584c Fix building when wxWidgets has TIFF support disabled
This was SVN commit r8026.
2010-08-22 18:06:46 +00:00
87cf84fb4c Fix #538 (Atlas has wrong icon in Start menu)
This was SVN commit r8016.
2010-08-21 22:02:07 +00:00
fed57d7bee Add primitive .3do (TA/Spring) model conversion tool.
This was SVN commit r8007.
2010-08-19 21:59:08 +00:00
7a8d1f9542 Add files used for https://launchpad.net/~wfg/+archive/0ad
This was SVN commit r7983.
2010-08-16 01:36:22 +00:00
b44636d10f Fix uninstaller to remove link
This was SVN commit r7971.
2010-08-15 16:31:05 +00:00
961d19d037 Try a more readable stroked font.
This was SVN commit r7932.
2010-08-13 14:14:27 +00:00
6c7b82130c # Redesigned the camera control system.
Add shift+wheel (and Q/E, and ctrl+arrows, and ctrl+WASD) to rotate the
camera.
Restrict the rotation and zoom to narrow ranges. (Constraints can be
disabled in the dev overlay).
Smooth the movement and rotation.
Fix some stupid whitespace.
Fix some const correctness.

This was SVN commit r7930.
2010-08-13 13:26:29 +00:00
7ddfb18fe7 Add web site link to start menu in Windows installer. Remove docs folder in uninstaller.
This was SVN commit r7929.
2010-08-13 13:22:34 +00:00
c728aa972c Support the <float/> property in actors
This was SVN commit r7883.
2010-08-09 01:28:13 +00:00
40e268e06a # Add terrain smoothing tool to Atlas, based on patch from DigitalSeraphim.
Fixes #516.

This was SVN commit r7854.
2010-08-05 20:43:31 +00:00
8286218cad Delete lots of obsolete unused script-interface code.
Delete unused code from various other places.

This was SVN commit r7839.
2010-08-01 20:56:34 +00:00
d29dd45237 Fix compiling with Clang
This was SVN commit r7824.
2010-07-30 21:42:22 +00:00
3124b55cc0 Warning fixes
This was SVN commit r7821.
2010-07-29 21:04:07 +00:00
797e2bb491 NSIS-based installer for Windows. Fixes #519.
This was SVN commit r7812.
2010-07-26 23:38:46 +00:00
16f70cfe4c Delay construction of Atlas message passer
This was SVN commit r7793.
2010-07-24 11:56:21 +00:00
e19146cf25 # Added AI for chickens.
Add scripted HFSM system.
Add very basic animal AI.
Support script-only message types.
Add shift+D hotkey to toggle dev command panel.

This was SVN commit r7763.
2010-07-18 15:19:49 +00:00
1ea8ab60ee Compile with -Wundef to detect stupid macro typos like "GCC_VER"
This was SVN commit r7756.
2010-07-14 15:54:39 +00:00
8c1deecdbe C++0x compatibility (fix narrowing conversions in initialisers; avoid ambiguity with std::next)
This was SVN commit r7739.
2010-07-11 22:40:17 +00:00
2ca501deeb Extend tool to check errors in Builder/TrainingQueue lists
This was SVN commit r7677.
2010-07-03 15:50:59 +00:00
5bc3c4b751 Fix inheritance of construction/training lists.
This was SVN commit r7667.
2010-07-03 01:23:23 +00:00
1c0536bf08 # Refactored the networking code, and redesigned the game setup screen.
Major updates to most network classes.
Simplify CNetServer so it doesn't duplicate any client behaviour; all
players now run CNetClient.
Remove most player/slot management from networking code.
Wait for all players to finish loading before starting the simulation.
Remove CGameAttributes; attributes are now just a JS object.
Remove CPlayer; they are now just simulation entities.
Handle player colours via simulation system.
Add a default map for Atlas, so it always has something to load.
Move network documentation to Doxygen.
Remove lots of now-unused code.

This was SVN commit r7653.
2010-06-30 21:41:04 +00:00
dfb10c8209 # Various networking code cleanups.
Don't flush network queue after every message.
Desingletonify CGameAttributes to allow testing.
Make network server/client basically testable.
Add very basic tests for network server/client.
Fix FsmActionCtx memory leak.
Split CNetHost into a separate file.
Convert CNetHost, CNetSession to a more conventional coding style.
Delete CNetLogger, since it's a lot of complexity and is barely used and
is redundant with CLogger.
Other minor simplifications.

This was SVN commit r7623.
2010-06-07 22:19:05 +00:00
23c92b7fe3 Fix actor viewer animation offsetting.
Fix attack animation drifts.

This was SVN commit r7612.
2010-06-05 22:23:28 +00:00
d3048906cb # Unit animation improvements.
Animate props much more sensibly.
Move ammo code out of CUnit.
Move animation logic out of CModel.
Launch projectiles from the correct location.
Use entity's speeds and sounds in actor viewer.
Add -nosound option to disable audio, and allow audio by default in
Atlas.
Remove some obsolete options.

This was SVN commit r7609.
2010-06-05 00:49:14 +00:00
a18aa24fe3 Windows support for window resizing and fullscreen toggling.
Windows build fixes.

This was SVN commit r7607.
2010-06-03 21:15:45 +00:00
0f611042b1 # Support alt+enter to toggle fullscreen mode. Make game window resizable.
Refactor the video mode setting logic to cope better with dynamic
changes.

This was SVN commit r7606.
2010-06-03 19:07:59 +00:00
310f3466a8 # Hotloading of actor XML files.
Stop ignoring actor XML animation speeds.
Add decentralised registration of hotloaders.
Move player ID storage into CModel, to simplify CUnit.
Remove obsolete unit ID allocation code.
Remove some material junk.

This was SVN commit r7605.
2010-06-03 01:29:43 +00:00
5c03456a38 Windows build fix
This was SVN commit r7604.
2010-06-02 23:08:45 +00:00
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
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
6de0cdc5f9 Delete old obsolete font builder tool and related files
This was SVN commit r7599.
2010-05-31 19:04:39 +00:00
47ca9fc6cb Autobuild fixes (untested)
This was SVN commit r7597.
2010-05-30 15:18:24 +00:00
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
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
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
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
cf85004f61 Windows build fixes.
Remove unused function.

This was SVN commit r7557.
2010-05-20 20:05:38 +00:00
56bb858802 # Delete a lot of obsolete simulation code.
This was SVN commit r7555.
2010-05-20 18:09:23 +00:00
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
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
afe29fdadf Fix errors and inconsistencies in entity template XML files
This was SVN commit r7532.
2010-05-09 21:46:41 +00:00
3c75dba1b8 Clean up some svn:executable flags
This was SVN commit r7518.
2010-05-08 23:17:08 +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
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
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
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
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
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
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
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
45368671c4 Convert training queue data in entity templates.
This was SVN commit r7468.
2010-04-19 19:45:31 +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
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
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
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
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
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
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
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
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
31febafb05 Compatibility with non-threadsafe SpiderMonkey
This was SVN commit r7364.
2010-03-19 19:54:00 +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
36e90e71f2 Convert ranged attack data in entity templates
This was SVN commit r7346.
2010-03-07 20:22:15 +00:00
a7484933e7 wchar.h -> utf8.h (see previous change)
This was SVN commit r7341.
2010-03-01 14:55:34 +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
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
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
7610d4361c # Started using libxml2
This was SVN commit r6763.
2009-03-22 20:51:35 +00:00
6768858cf1 Fix some GCC warnings
This was SVN commit r6762.
2009-03-22 20:47:43 +00:00
ed65cf33d0 Removed unnecessary debug output from autobuilder
This was SVN commit r6715.
2009-02-28 18:46:37 +00:00
43f91d0d0b Make the autobuilder write svn_revision.txt
This was SVN commit r6704.
2009-02-24 15:43:34 +00:00
6a7fdd8315 # Updated autobuilder
Also added the autobuild manager scripts

This was SVN commit r6697.
2009-02-19 22:25:31 +00:00
778ab75cfe Updating build script to help with testing the autobuilder
This was SVN commit r6692.
2009-02-19 00:26:50 +00:00
b51353ae0b Use NONCOPYABLE macro, to avoid ICC warnings
This was SVN commit r6589.
2009-01-03 18:40:28 +00:00
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
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
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
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
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
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
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
dave
d8bb8bddd8 Cleaned up and incorporated appropriate headers so it compiles
This was SVN commit r6325.
2008-08-11 09:57:42 +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
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
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
5fe79fbb7c adding needed include
This was SVN commit r6169.
2008-07-01 22:12:03 +00:00
58407c7438 workaround for invalidId issue (fixes windows build)
class static const member apparently sometimes requires external linkage
and enum causes conversion warnings, so go with file-scope constants.

This was SVN commit r6161.
2008-06-30 17:31:09 +00:00
84f5428b9f Mismatching typedef int ObjectID. All the other places use size_t, so I changed this one to size_t too.
This was SVN commit r6155.
2008-06-29 10:15:13 +00:00
b5987f11e8 Cleaned up TerrainOverlay a little
This was SVN commit r6104.
2008-06-24 23:35:46 +00:00
c0ed950657 had to remove uint and ulong from lib/types.h due to conflict with other library.
this snowballed into a massive search+destroy of the hodgepodge of
mostly equivalent types we had in use (int, uint, unsigned, unsigned
int, i32, u32, ulong, uintN).

it is more efficient to use 64-bit types in 64-bit mode, so the
preferred default is size_t (for anything remotely resembling a size or
index). tile coordinates are ssize_t to allow more efficient conversion
to/from floating point. flags are int because we almost never need more
than 15 distinct bits, bit test/set is not slower and int is fastest to
type. finally, some data that is pretty much directly passed to OpenGL
is now typed accordingly.

after several hours, the code now requires fewer casts and less
guesswork.

other changes:
- unit and player IDs now have an "invalid id" constant in the
respective class to avoid casting and -1
- fix some endian/64-bit bugs in the map (un)packing. added a
convenience function to write/read a size_t.
- ia32: change CPUID interface to allow passing in ecx (required for
cache topology detection, which I need at work). remove some unneeded
functions from asm, replace with intrinsics where possible.

This was SVN commit r5942.
2008-05-11 18:48:32 +00:00
3f23e37fac fix atlas screenshot (code that passes the extension wasn't updated when porting to boost::filesystem; the one inside the game engine was)
This was SVN commit r5672.
2008-02-23 18:30:30 +00:00
9269be9ee3 remove mmgr and macros that redefine malloc/new/free
(see http://www.wildfiregames.com/forum/index.php?showtopic=11450&hl= )

clean up debug module
. no longer include platform-dependent header (-> less rebuilds)
. DISPLAY_ERROR -> DEBUG_DISPLAY_ERROR
. parts of config.h that don't affect all files moved to config.2 (->
fewer full rebuilds)
. remove creaky symbol cache (no longer needed for mmgr)
. remove TLS thread naming stuff (can use debugger's thread window
instead; no need for platform independence there)

wdbg: remove thread suspension and breakpoint APIs (not needed)

acpi: fix: u64 -> uintptr_t

wutil: fix WinScopedLock, use that instead of direct lock() functions

misc:
. get rid of SAFE_STRCPY, replace with strcpy_s
. remove _getcwd (shouldn't be used)

This was SVN commit r5563.
2008-01-19 11:33:11 +00:00
a859562ea7 improvements and fixes:
- properly differentiate between buffer/offset alignment and length
alignment (relevant since block size has been increased to 256k)
- use VfsPath for most game paths instead of CStr
- clean up timer interface and implementation
- self-tests no longer crash
- file_cache.cpp: fix for the case where allocation fails (prevent
deleter from seeing a null pointer)
- allocators: move all shared_ptr-related stuff to its own component;
add DummySharedPtr
- codec: disable checksums (important for performance at work)
- File: made into an interface class to avoid export problems. not
entirely sure about this..
- vfs_path.h, path.h, os_path.h: proper fix for using
fs::change_extension and similar utility functions with derivatives of
basic_path
- lib_api: automatically link against import lib if building lib/ as a
DLL
- path_util: remove unused functions (this component is deprecated)
- compiler.h: add INLINE
- Xeromyces.cpp: pass PIVFS so that GetXMBPath works in self-test
(should do this mostly everywhere rather than have one singleton g_VFS)

This was SVN commit r5537.
2008-01-07 20:03:19 +00:00
5529977ecd fix: CLogger's ELogMethod is now inside the class and does not use names that are vulnerable to macro destruction (fixes a conflict with Windows system header's #define ERROR)
This was SVN commit r5532.
2007-12-29 16:22:23 +00:00
e2eb5b2610 part4: adapt codebase to changes in lib/
mostly straightforward except for CVSFile / Filesystem. moved the former
into the newly created latter component. removed VFSUtil entirely (that
functionality is available from lib/file/file_system_util.h)

Xeromyces.cpp: simplify buffer handling since smart pointers are now in
play. also use WriteBuffer instead of membuffer.

This was SVN commit r5519.
2007-12-20 20:21:45 +00:00
277ed33da6 # OS X fixes.
- Networking no longer tries to use IPV6, ignoring the family type of
CSocketAddr. This address will be replaced when we switch to ENet
anyway.
- The name of the Atlas semaphore now also includes a timestamp, since
the RNG generated the same sequence of names for multiple runs of the
game, causing problems if the games crashed and leaked semaphores, and
making debugging painful.
- get_executable_name now also works if the game is within an app bundle
(useful for packaging it more nicely later on, and since wxWidgets
expects us to be in an app bundle).

This was SVN commit r5407.
2007-10-11 08:00:05 +00:00
ebd7446d8a Fixed Altas/wxJS for Windows.
This was SVN commit r5328.
2007-09-04 20:04:43 +00:00
14f6843419 Alt+enter to toggle fullscreen mode in Atlas
This was SVN commit r5325.
2007-09-03 23:50:25 +00:00
28244544c7 Various wxJS bug fixes and minor feature additions
This was SVN commit r5324.
2007-09-03 23:49:33 +00:00
264f394f17 Moved X11 stuff out of unix/ folder, added osx/ sysdep folder, corresponding premake.lua changes, and a few misc other Mac OS X-related changes
This was SVN commit r5320.
2007-09-03 12:56:45 +00:00
f5a2a141dc Fixed non-PCH compiles.
Removed a few global variables from Atlas.
Added call to srand(time).
Restored NotebookEvent in wxJS.
Fixed CPU-detection in Valgrind.

This was SVN commit r5318.
2007-09-02 23:38:58 +00:00
22e4d2fd98 # win/macosx compat, add hooks to disable OpenGL feature usage
config: add 2 parameters to allow disabling s3tc/auto mipmap gen
wpthread: add support for named semaphores (required for macosx compat)
openal, ogghack: remove direct use of __APPLE__ macro (replace with
OS_MACOSX)
GraphicsSetupHandlers.cpp: fix incorrect usage of OS_ macros (they're
always defined, so the test should be if their value is != 0)

This was SVN commit r5316.
2007-09-02 21:44:56 +00:00
027c3c7cc0 Use one semaphore for the process's lifetime, for efficiency.
Use a name that works on Linux.
Try several random names to avoid conflicts with other processes.

This was SVN commit r5315.
2007-09-02 21:16:23 +00:00
5d26f84910 Updated wxJavaScript to 0.9.71 (plus minor customisations)
This was SVN commit r5313.
2007-09-02 17:17:58 +00:00
08d3ff2952 Updates for OS X and gcc 4.0 compatibility.
- Fixed some invalid member function references in wxJS code that gcc
4.0 didn't like.
- Some conversion changes.
- Don't try to construct wxSound from memory in OS X (it's not
available).
- Added dependency on zlib in AtlasUI (something there uses _compress).
- Added Mac code for finding current executable's path.
- Added dummy code for getting display size that does not use X.
- Fixed dir_get_changed_file stub to return ERR::AGAIN (end of files)
instead of INFO::OK.

This was SVN commit r5312.
2007-09-02 16:50:20 +00:00
5ef98758b2 Atlas: Fixes for compiler warnings and UI layout issues on Windows. Fixed territory updates when deleting units.
This was SVN commit r5176.
2007-06-14 15:42:24 +00:00
047b1ca21d Atlas: Ported terrain texture selection panel to JS. Removed textual labels on each texture.
wxJS: Added incomplete wxNotebook. Added wxWindow.toolTip.

This was SVN commit r5174.
2007-06-14 12:11:22 +00:00
f331b7313d fix very very insidious bug with mapping physical memory (TLB corruption). fix weirdness reported by michael (underlying cause: using cpu_ClockFrequency instead of wcpu_*; that made the timer run at freq=0)
mahaf: now disabled on Win2k because we can't prevent the TLB bug there.
removed the CopyPhysical API.
wutil: allow querying windows version via number

View: fix warning

This was SVN commit r5169.
2007-06-12 23:29:27 +00:00
52aa29681c Atlas: Partial porting of the Terrain section to JS.
Slightly nicer rendering of circular brush previews.

This was SVN commit r5168.
2007-06-12 22:01:25 +00:00