Commit Graph

658 Commits

Author SHA1 Message Date
2d1be3d47e Improve correctness of hotkeys at low framerates.
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.

If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.

If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.

Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.

Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.

Fixes #1869.

This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
5778484a77 Refactor text renderer
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.

Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741).

Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.

Fixes #1117.

This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
3624c591bd Fix compilation failure without PCH.
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
7901ed51d4 Implements skirmish maps, based on patch by sanderd17, fixes #1198. Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631, #889.
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872. Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745.
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.

This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
12e2428495 Changes the Renderer to expose global functions to scripts instead of using CJSObject.
Fixes #2137
Refs #1886

This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
52d6a8036d This was SVN commit r13725. 2013-08-21 05:37:28 +00:00
f947fa6afe Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813.
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729

This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
54bbbb9797 Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
a9c71e39a4 make new elevation tool more drastic + add RMB action
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
b820f6e6ae Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
7ff167e7de Removes more unused variables, based on patch by Markus, refs #1852.
Adds TODOs to use POT textures in fancy water rendering.

This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
df2458aa39 Allow setting of prop min/max height in the actor Edit. By sanderd17.
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
a8a968d32c Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
161d6c1ba7 Improves SDL 2.0 support
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
6f78224f8d Fixes tooltip in Atlas' locked teams checkbox.
Adds scrollbar to environment panel and reorganizes controls.

This was SVN commit r13324.
2013-03-23 19:22:11 +00:00
92fdbb49b6 Moves particle interpolation to its own simulation component.
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.

This was SVN commit r13184.
2013-02-22 23:20:59 +00:00
1f7e6cb2ba Adds actor seed support to scenario XML data, optionally used in place of entity ID.
Fixes Atlas previews not matching placed entity.
Fixes in-game building previews not matching final entity (except
walls).

This was SVN commit r13144.
2013-02-03 02:16:52 +00:00
75a23856cf Fix some static analysis warnings
This was SVN commit r13101.
2013-01-21 20:33:25 +00:00
dc6c0e483b Fixes unhandled enumeration warning in some compilers
This was SVN commit r13043.
2013-01-04 05:46:35 +00:00
c5e597d5c4 Fixes some Atlas build warnings about hidden overloaded virtual functions when using wxWidgets 2.9
This was SVN commit r13001.
2012-12-20 03:57:17 +00:00
e91a918164 Fixes race condition in EnsureMonotonic on 32-bit builds, which was causing unreliable timer behavior, fixes #1729
This was SVN commit r12927.
2012-12-03 13:24:12 +00:00
f7608bf270 Attempted fix to prevent strange timer-related bug in Atlas (fails to start when opened from the game's main menu), refs #1729
This was SVN commit r12902.
2012-11-30 21:34:33 +00:00
7c1b03d031 Fixes MSVC warnings of truncation from double to float
This was SVN commit r12797.
2012-10-30 02:03:40 +00:00
1fb7889539 Postproc manager
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
7d8dc05c68 Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562.
Adds water plane option to actor viewer.

This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
58b3a88daa Fixes more overloaded-virtual warnings in clang.
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
619dd95d5b Fixes an overloaded-virtual warning in clang.
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
c9abf6f68c Heightmap importing in Atlas
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
3c0bd23108 Slightly speed up actor rendering; have selectables properly handle fog of war, etc. Refs #1365.
This was SVN commit r12241.
2012-07-30 21:06:54 +00:00
1f15257987 Update actor editor for data driven textures. From zoot. Refs #1493.
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
vts
6b50a660b9 Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824. Refs #824.
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
3efbd0ab25 Fixes Atlas losing map settings if random map generation failed. Refs #1398.
This was SVN commit r11835.
2012-05-10 23:11:42 +00:00
56269b2489 Fixes Atlas bug where default player data wasn't sent to engine after being displayed in the UI (introduced by 1f5f82f375). Fixes #1398.
This was SVN commit r11834.
2012-05-10 22:49:04 +00:00
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
cafb817446 Reverts broken change from 022fc4c47c.
This was SVN commit r11694.
2012-04-29 03:20:00 +00:00
022fc4c47c Fixes Atlas stealing focus on OS X, based on patch by mk12. Fixes #1317.
This was SVN commit r11693.
2012-04-29 02:04:59 +00:00
vts
61fad4a2b5 Fixed strange selection ring fadeout on unit deselection in Atlas
This was SVN commit r11634.
2012-04-22 17:49:43 +00:00
vts
34fc883317 Pretty unit selection overlay rings. Fixes #824.
This was SVN commit r11623.
2012-04-22 04:04:02 +00:00
9488ca42f6 Disable deadlocking fatal exception handler in Atlas
This was SVN commit r11603.
2012-04-21 14:12:37 +00:00
58eb0c97bb Reuse terrain texture name formatting function
This was SVN commit r11601.
2012-04-21 13:09:01 +00:00
4d8ba45375 Removes unnecessary change from [11575]
This was SVN commit r11578.
2012-04-20 03:01:09 +00:00
c8745ee41f Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641.
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
75e7ea497b Add comment about incorrect array-bounds warning
This was SVN commit r11560.
2012-04-18 22:00:07 +00:00
3027ce1a04 Rationalise terrain dirty-rect coordinates.
Clean up some whitespace.

This was SVN commit r11543.
2012-04-17 22:35:34 +00:00
be453771cf Fixes OS X build.
This was SVN commit r11529.
2012-04-17 03:57:53 +00:00
5cfeccea09 Adds eyedropper tool to Atlas terrain brush (Shift+Click to activate). Fixes #1122.
Adds preview box showing currently selected terrain.

This was SVN commit r11528.
2012-04-17 02:43:52 +00:00
772b38e6be Fixes player colors in actor viewer, based on patch by mk12. Fixes #1022.
This was SVN commit r11527.
2012-04-17 01:26:24 +00:00
cf11aa8dea Fixes Atlas canvas resolution init on OS X. Replaces hacky solution for the same problem on wxGTK. Fixes #1176.
This was SVN commit r11525.
2012-04-16 00:57:30 +00:00
b7888aea52 Add support for specular materials.
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
0e1b5522d6 Fix #868 (move wxWidgets Unix config files to XDG basedir location), based on patch from leper.
Fix handling of set but empty XDG environment variables.

This was SVN commit r11374.
2012-03-19 22:40:06 +00:00
4eec2bf5d2 Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.

This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
e6c58b2a3e Adds log rendering to actor viewer.
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
4cdde2b62a Replaces Atlas "Screenshot" option with normal lower-res version (saves result as PNG).
Adds new "Big screenshot" option (saves result as 6400x4800 BMP). Refs
#984.

This was SVN commit r11257.
2012-03-06 00:15:48 +00:00
vts
4cb7972ec2 Renamed some Atlas classes and g_GameLoop to better reflect their Atlas-related nature and to lower potential confusion with similar main-game-related functionality. Refs #678.
This was SVN commit r11232.
2012-03-03 23:48:04 +00:00
ef1e8de44e Removes size_t from shareable types to prevent 32/64-bit errors.
Adds unsigned int to shareable types. In the future, use
int32/player_id_t for player IDs and uint32/entity_id_t for entity IDs.

This was SVN commit r11189.
2012-02-27 23:16:31 +00:00
5f23cd6d10 Changes Atlas ObjectID type to unsigned int, fixes 64-bit build errors caused by size_t.
This was SVN commit r11186.
2012-02-27 22:29:53 +00:00
7d9e98b00e Adds multiple entity selection to Atlas (including move/delete). Fixes #678.
Makes all actors selectable in Atlas and gives them selection rings (an
EditorOnly flag is used in the template for Atlas-only selectables).
Adds player colors to Atlas selection rings.
Fixes decal selection by falling back to old-style AABBs. Refs #1032.
Replaces UnitManager selections with EntitySelection helpers.
Adds DrawOverlays to Atlas views, for Atlas-specific rendering.
Fixes bug where selection rings conflicted with Move/rotate tool in
Atlas simulation test.

This was SVN commit r11177.
2012-02-27 05:32:35 +00:00
b7e848de23 Avoid unused parameter warnings due to safe bool operators.
This was SVN commit r11142.
2012-02-25 06:24:24 +00:00
d3038bbb5c Fixes Atlas assertion failure on wxOSX/Cocoa by properly checking combo box selection index.
This was SVN commit r11135.
2012-02-24 04:40:29 +00:00
b4a33851e6 Improves CColladaManager caching behavior: skeletons.xml changes now invalidate cached .pmd/psa files, CCacheLoader is used for consistency, adds support for archived files. Fixes #1167.
Adds COLLADA conversion to archive builder.
Fixes archive builder on Windows.
Moves error logging from CCacheLoader::TryLoadingCached to its callers,
because this failure can be legitimate (in the case of uncached .pmd/psa
files).

This was SVN commit r11100.
2012-02-19 03:30:59 +00:00
531b40578a More GLES compatibility.
Add config option to disable hardware cursors on Windows.

This was SVN commit r11053.
2012-02-12 20:45:31 +00:00
08bd07ddd6 Adds safe bool operator to ICmpPtr, replacing the null() method, based on patch by leper. Also changes bool operator in AtSmartPtr to safe bool. Fixes #1077.
Changes some CmpPtr variable names for consistency.

This was SVN commit r11036.
2012-02-08 02:46:15 +00:00
046729dfa7 Fixes Atlas double-click behavior in simulation test, by handling the events in Canvas and recognizing wxWidgets' ButtonDown and ButtonDClick events are mutually exclusive.
This was SVN commit r11035.
2012-02-07 00:40:55 +00:00
3fab2729b5 Partial SDL2 compatibility
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
41e3bad341 More build fixes for FreeBSD.
Adds BSD sysdep.
Adds support for MAKE variable, overriding make command in our build
scripts.
Fixes more files not ending with newline.

This was SVN commit r10994.
2012-01-31 00:06:56 +00:00
fc27a5c0ea More FreeBSD build fixes.
Fixes some warnings about files that don't end with newline.

This was SVN commit r10991.
2012-01-30 06:21:11 +00:00
8fabaa4f8c Fixes Atlas crashing when random map generator fails, load the blank map for now.
This was SVN commit r10939.
2012-01-21 00:53:34 +00:00
vts
91652bdf6e Implemented nested territory boundaries. Fixes #918.
Fixed out of bounds memory access in Atlas due to always using global
terrain in TerrainOverlay
Fixed wrong player ID calculation in TerritoryOverlay

This was SVN commit r10929.
2012-01-18 21:22:58 +00:00
e4b2de4bba Delete obsolete AoE3Ed code
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
c9cdde256f Disable GCC warning triggered by wx headers
This was SVN commit r10908.
2012-01-14 19:06:47 +00:00
893cb2668e Renames our sdl.h to libsdl.h, to avoid case sensitivity errors when it includes SDL.h.
This was SVN commit r10904.
2012-01-12 23:32:27 +00:00
ce67dfd333 Rename CELL_SIZE to TERRAIN_TILE_SIZE, to free up the term "cell" for other concepts.
This was SVN commit r10902.
2012-01-12 12:51:10 +00:00
d07eac218c SDL 1.3 build fixes.
Support SDL_CONFIG environment variable in update-workspaces to pick
non-default sdl-config.
Avoid non-standard use of SDL/ in include paths.

This was SVN commit r10895.
2012-01-11 22:50:39 +00:00
6f2eec3c2e Fix warnings
This was SVN commit r10867.
2012-01-04 13:19:38 +00:00
c1c741be9a Fix dangling pointer in Atlas
This was SVN commit r10866.
2012-01-04 13:18:45 +00:00
5bf70e52de Fixes Atlas startup in Windows when using SDL.
This was SVN commit r10855.
2012-01-02 22:48:43 +00:00
c4bb67a1ca Fix #1064 (use ++it instead of it++ for consistency), based on patch by Echelon9
This was SVN commit r10822.
2011-12-29 01:17:03 +00:00
vts
46a09ced71 Fixed some compilation warnings
This was SVN commit r10710.
2011-12-11 02:11:05 +00:00
vts
427674f713 Fix for compilation failure of [10703] on 64-bit systems
This was SVN commit r10705.
2011-12-10 11:53:39 +00:00
vts
fbb0e3995f Added prop point axes markers to Atlas' Actor Viewer panel
This was SVN commit r10703.
2011-12-10 05:11:25 +00:00
vts
1c19e905b1 Added prop points to Atlas' Actor Viewer
This was SVN commit r10696.
2011-12-09 10:49:08 +00:00
ede60520a0 Fixes Atlas and Actor Editor's wxMouseCaptureLostEvent handling, which caused assertion failures in Windows debug builds. Mouse capture events are currently wxMSW only.
This was SVN commit r10623.
2011-11-28 01:12:18 +00:00
vts
85186c98b2 Better selection boxes. Closes #914, #295, #810.
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
39d100c732 Moves camera projection settings to default.cfg.
Changes field of view (FOV) to 45 degrees per discussion. Fixes #941.
Tweaks default camera zoom and rotation accordingly.

This was SVN commit r10548.
2011-11-17 23:34:01 +00:00
5bd7b74ec7 Fix ABI incompatibility with --with-system-mozjs185 in debug mode (see #990).
This was SVN commit r10535.
2011-11-14 18:18:04 +00:00
e7f0639054 Set Atlas canvas size before potentially rendering to it. Fixes #987.
This was SVN commit r10526.
2011-11-13 12:57:34 +00:00
99e012ba56 Fix comments
This was SVN commit r10517.
2011-11-12 22:08:59 +00:00
8f3255f9c8 Fix tests and Atlas with new profiler
This was SVN commit r10471.
2011-11-05 23:09:31 +00:00
09a02c96d5 Add initial code annotations for the new profiling tool
This was SVN commit r10466.
2011-11-04 01:35:50 +00:00
0db6cfd2f7 Fixes crash in Atlas camera handlers, focus loss causes a scroll action, and seg fault if game not initialized. Fixes #988.
Fixes particles lingering in actor viewer when switching actors, by
clearing unattached particle emitters.

This was SVN commit r10457.
2011-10-30 05:09:31 +00:00
7064565ff6 # Allow saving and loading single-player games.
Support writing zip files based on in-memory data.
Fix menu sliding animations to be framerate independent.

This was SVN commit r10454.
2011-10-30 00:07:28 +00:00
21c6141cdc Preserve player colours and animations when serializing models
This was SVN commit r10453.
2011-10-29 15:30:46 +00:00
ab6863c484 This was SVN commit r10430. 2011-10-26 05:41:57 +00:00
c82ebd7ca9 Fixes Atlas build on OS X.
This was SVN commit r10429.
2011-10-26 05:27:03 +00:00
d966c5e10b Fixes Atlas map saving to force PMP extension on all OSes. See #889.
Fixes Atlas map loading to more gracefully handle missing files. Atlas
should no longer crash if a map was not found in VFS. Fixes #986.

This was SVN commit r10416.
2011-10-20 23:45:27 +00:00
7828544946 Attempts to fix ArchiveViewer build on OS X (use wxString::wc_str() to construct std::wstring).
This was SVN commit r10305.
2011-09-23 02:56:19 +00:00
08b4d96cf2 Moves Atlas UI to main thread while engine loop runs in new thread.
Fixes Atlas compatibility with OS X (wxOSX/Cocoa requires the UI to run
in the main thread). Fixes #500.
Fixes Windows shutdown to close COM library properly (and WMI).

This was SVN commit r10299.
2011-09-20 22:49:02 +00:00
c12d2ac0be This was SVN commit r10215. 2011-09-08 03:03:08 +00:00
9e2d97a9c0 Fixes actor viewer button (label didn't update after switching tools).
This was SVN commit r10214.
2011-09-08 03:00:56 +00:00
89532feab6 Fixes Atlas file open dialog on OS X (filters not shown by default in wxOSX 2.9).
This was SVN commit r10168.
2011-09-02 02:27:55 +00:00
90fdd26cf1 Sets default wxFileDialog filters in Atlas.
This was SVN commit r10159.
2011-09-01 04:47:45 +00:00
e8253249a2 Switches Atlas player panel to our custom ColourDialog for consistency.
This was SVN commit r10134.
2011-08-29 22:27:58 +00:00
fc7d303ee4 Adjusts Atlas sidebar and bottombar to look better on different platforms.
This was SVN commit r10133.
2011-08-29 22:12:20 +00:00
6366ad728f Fixes Atlas toolbar in wxOSX (only Realize() it after creation).
Fixes terrain preview not displaying first page in wxOSX.
Formats terrain page labels more nicely.
Adds a bunch of tooltips.

This was SVN commit r10131.
2011-08-29 03:50:29 +00:00
769a927446 Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9).
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X
(otherwise the canvas doesn't seem to update properly).

This was SVN commit r10129.
2011-08-28 21:10:45 +00:00
47e1e23721 Fixes bug on object panel (assert fail when map was loaded before the panel was displayed).
This was SVN commit r10123.
2011-08-28 05:57:09 +00:00
f2b61d2e56 Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error).
This was SVN commit r10118.
2011-08-28 00:28:06 +00:00
cd6ce56632 Fixes some Atlas button layouts with wxWidgets 2.9 (wxGridSizer seems preferable to wxBoxSizer for equally sized buttons).
This was SVN commit r10117.
2011-08-27 23:43:18 +00:00
29dc9c3094 Fixes bug in Atlas player panel (AtIter definition must be checked before incrementing).
This was SVN commit r10102.
2011-08-26 22:58:55 +00:00
bb77e3a300 Changes player panel spin controls to use default style.
This was SVN commit r10099.
2011-08-26 22:11:30 +00:00
2d1fe050b9 Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6).
This was SVN commit r10095.
2011-08-26 01:56:14 +00:00
13dc7a9210 Fix non-PCH build
This was SVN commit r10079.
2011-08-23 17:48:06 +00:00
27e5581d27 Fixes Atlas player panel getting out of sync with simulation. Fixes #927.
Fixes object panel not being notified of map loading.
Fixes bug where opening a new map before using the player panel
prevented default player data being displayed for new players.
Fixes wxGTK 2.8 bug: wxChoicebook control doesn't update the choice
control when adding/removing pages.
Notifies player that deleting player in Atlas will delete all their
objects (and gives them the option).
Changes DeleteObject to DeleteObjects to support multiple selections.
Implements undo for map resize (experimental).
Removes annoying debug message from attempted undo of map settings.
Tweaks a few Atlas UI controls.

This was SVN commit r10064.
2011-08-22 21:45:39 +00:00
5f07107609 Fix build with wxWidgets 2.9
This was SVN commit r10037.
2011-08-18 23:38:11 +00:00
6b26820090 Build fix
This was SVN commit r10033.
2011-08-18 11:16:52 +00:00
36c6318296 This was SVN commit r10031. 2011-08-18 03:28:32 +00:00
89c22993a4 Adds terrain fill (bucket) tool to Atlas.
This was SVN commit r10029.
2011-08-17 23:44:52 +00:00
8872bad668 AoEO BAR compatibility in AoE3Ed
This was SVN commit r10026.
2011-08-17 16:17:22 +00:00
fab7bf4fcf Fixes manifest dependencies for Actor Editor. Fixes #924.
This was SVN commit r10018.
2011-08-16 22:08:47 +00:00
132f9bd63b Fixes bug in Atlas random map generator UI.
This was SVN commit r10006.
2011-08-14 06:11:35 +00:00
7b27fcb716 Disables water rendering in the actor viewer.
This was SVN commit r10005.
2011-08-13 23:00:58 +00:00
d605e85ae5 Removes ColourTester utility (needs update-workspaces).
Adds busy cursor to Atlas map generator.

This was SVN commit r9987.
2011-08-10 22:23:35 +00:00
4a2adece07 Fixes class types for Atlas pathfinding overlay
This was SVN commit r9978.
2011-08-08 01:04:18 +00:00
cdfeeab25f Fixes Atlas non-PCH build.
This was SVN commit r9911.
2011-07-24 21:50:58 +00:00
f9d7c1246d # Initial support for territories
This was SVN commit r9889.
2011-07-20 19:48:06 +00:00
2f0bd8d8b0 Upgrade to SpiderMonkey 1.8.5 (fixes #734)
This was SVN commit r9852.
2011-07-16 23:24:14 +00:00
8eb7af4ac9 Be a bit more robust to build environment changes.
Reduce some module dependencies.
Clean up some unused instantiations.

This was SVN commit r9827.
2011-07-15 13:22:48 +00:00
bb33a259b6 Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring)
This was SVN commit r9797.
2011-07-10 21:00:21 +00:00
a4637c25d0 Fix no-PCH builds
This was SVN commit r9786.
2011-07-08 15:07:08 +00:00
6ba00117e0 Fixes bug in Atlas player editor: saving team as "None" had no effect
This was SVN commit r9721.
2011-06-29 00:57:02 +00:00
996a32125c Add per-player LOS-reveal flag.
Reveal LOS for Gaia and AI players (fixes #879).
Use player_id_t slightly more consistently in interfaces.

This was SVN commit r9720.
2011-06-28 23:24:42 +00:00
195c7a00e9 Adds player settings shortcut to Atlas map panel. Fixes #874
Tweaks some control positions and layouts for consistency

This was SVN commit r9649.
2011-06-23 22:38:26 +00:00
abdc846a65 Adds getInt to AtlasObject
Uses this instead of wxAtoi for consistency, and adds brief comment
about why wxAtof should be avoided

This was SVN commit r9643.
2011-06-21 02:56:49 +00:00
10481ca174 Avoid potentially dangerous locale-dependent atof functions
This was SVN commit r9639.
2011-06-19 19:51:53 +00:00
9965c1ef1b Remove label that is no longer labelling anything
This was SVN commit r9636.
2011-06-19 14:55:43 +00:00
3be43ede41 Adds rotation to starting camera (currently unused)
This was SVN commit r9623.
2011-06-16 21:21:33 +00:00
9e486cd6e3 Fixes bug in Atlas camera control (clear button didn't erase the setting)
This was SVN commit r9620.
2011-06-14 01:03:35 +00:00
3e4d74480d Adds AI control to Atlas player panel
Adds camera control to Atlas player panel
Changes map reader to handle per-player starting camera position. See
#55
Adds entity name filter to Atlas object panel
Fixes bug in Atlas map settings (caused crash when object panel was not
loaded)

This was SVN commit r9617.
2011-06-13 23:32:41 +00:00
0c803f99e8 This was SVN commit r9609. 2011-06-09 23:47:20 +00:00
23f1072a2e Adds player editor to Atlas scenario editor. See #91
Fixes object panel so the list of players updates correctly.
Atlas map settings are now observable and shared between various panels.
Fixes panels for maps missing settings (caused JSON error)
Changes map reader so that entities with invalid players cause a warning
but are not added to the game. That prevents further errors. Fixes #869
Uses map size choices from simulation/data/map_sizes.json instead of
multiple locations. Fixes #787
Prepares Atlas map settings for undo/redo support

This was SVN commit r9608.
2011-06-09 23:45:12 +00:00
8720b4a220 Fix Atlas saving game type under wrong property name.
This was SVN commit r9599.
2011-06-09 16:39:31 +00:00
acb48663d7 Windows fixes
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
6bdafee6a0 Update Atlas sidebar buttons slightly
This was SVN commit r9569.
2011-05-29 16:36:15 +00:00
fa7855f3d9 Delete now-unused wxJavaScript library
This was SVN commit r9568.
2011-05-29 15:46:07 +00:00
a81f180dd6 Remove Atlas UI scripting support
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
dc2035efc9 Move Atlas map settings from JS to C++.
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.

This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
1618aa9c36 Add missing file for actor viewer
This was SVN commit r9565.
2011-05-29 14:57:54 +00:00
07e307c49a Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
4496fcd2df Restore some old Atlas files
This was SVN commit r9558.
2011-05-27 21:48:23 +00:00
9733affb05 Fix non-PCH build
This was SVN commit r9419.
2011-05-04 01:17:09 +00:00
b371686fb7 Rename class to prevent conflict between generated auto_ptr symbols in Atlas and engine
This was SVN commit r9371.
2011-04-30 21:08:53 +00:00
4663ac0fe7 split debug_assert into ENSURE and ASSERT as discussed in a previous meeting.
the old debug_assert always ran and tested the expression, which slows
down release builds. wrapping them in #ifndef NDEBUG is clumsy. the new
ASSERT behaves like assert and ENSURE like the old debug_assert. Let's
change any time-critical but not-super-important ENSURE to ASSERT to
speed up release builds. (already done in bits.h and unique_range.h)

This was SVN commit r9362.
2011-04-30 13:01:45 +00:00
d96fefd4a4 Fix linker errors with GCC 4.6, and some warnings.
This was SVN commit r9346.
2011-04-29 16:32:58 +00:00
b4503bb61e Simplifies random map output, see #782.
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
57e6980465 Fix 64-bit build. Avoid using variable-sized types in Atlas message interface.
This was SVN commit r9251.
2011-04-14 14:27:42 +00:00
bf53b6f3b5 This was SVN commit r9248. 2011-04-14 04:16:06 +00:00
ad6f305359 Integrates random maps with Atlas. Fixes #460.
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.

This was SVN commit r9247.
2011-04-14 04:01:59 +00:00
5a8d291403 Remove old vertexshader renderpath option from Atlas
This was SVN commit r9236.
2011-04-13 18:28:27 +00:00
2b138f47db Handle map loading errors in autostart and normal setup modes. Adds TODOs for Atlas and Replay modes. See #764.
Fixes loading screen 'title'.
Fixes broken autostart behavior for random maps and multiplayer games.

This was SVN commit r9193.
2011-04-07 02:32:16 +00:00
e9cc697c2b Animate particles in the default editor view
This was SVN commit r9177.
2011-04-06 00:22:07 +00:00
29dd635d3b Fix decals and LOS texture in Actor Viewer, by slightly reducing use of globals.
Fix particles in Actor Viewer.
Expand terrain in Actor Viewer.
Change background to black so it blends with the LOS texture more
nicely.

This was SVN commit r9172.
2011-04-05 20:32:03 +00:00
d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program.
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
9193ba56f9 Build fixes and whatnot
This was SVN commit r9115.
2011-03-23 21:15:22 +00:00
1f7e8d7194 per discussion with Philip, remove STL_HASH_MAP etc. because they're ugly, rarely used and superseded by boost::unordered*
This was SVN commit r9111.
2011-03-23 16:56:27 +00:00
dcd192cb60 refactor path interface:
- use wrapper class instead of std::wstring (reduces mixing of
strings/paths; allows safe+easy join via operator/ and convenient
case-insensitive comparison via operator==, avoids NativePathFromString,
similar to boost::filesystem)
- NativePath -> OsPath
- add hash and To/FromJSVal for Path
- add TS_ASSERT_PATH_EQUALS
- replace _wfopen_s with sys_OpenFile
- remove obsolete SortFiles/Directories

This was SVN commit r9107.
2011-03-23 13:36:20 +00:00
c3405e6f50 path improvements/fixes:
- replace more std::wstring with Native or VfsPath; wstring_from_utf8 ->
NativePathFromString
- replace sequences of Join(Path(), Basename+extension) with
ChangeExtension in wsdl, CacheLoader
- add Path::IsDirectory to replace .empty() / path_is_dir_sep(.back()).
also changed behavior to reflect the fact that "" is the VFS root
_directory_
- Path::Join now allows 2 identical path types (e.g. VfsPath) or one
char* literal (prevents inadvertently introducing non-safe characters).
to convert from wstring or wchar_t, use an explicit ctor (e.g.
VfsPath(wchar_t_string))

This was SVN commit r9091.
2011-03-21 19:54:08 +00:00
6d25329412 # towards locale-independent pathnames on Linux
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14541&st=0&p=217250&#entry217250
and 2011-03-19 meeting

This was SVN commit r9090.
2011-03-21 17:53:13 +00:00
ecbd0ae31b Fix Windows build.
Improve compatibility with GL1.3.

This was SVN commit r9077.
2011-03-18 18:07:18 +00:00
92e84a9112 Fix keys like F11 triggering two events when sent from Atlas to the game engine
This was SVN commit r8987.
2011-02-25 23:53:09 +00:00
1c7e33b528 Remove a load of implicit CStr type conversions, since they're error-prone and can cause silent data loss.
Handle most CStr8/CStrW conversions via UTF-8 instead of effectively
assuming Latin-1.
Return UTF-8 strings from Xeromyces API.

This was SVN commit r8929.
2011-02-17 20:08:20 +00:00
aa8c3a9ea9 Fixed #582 (add camera reset command in Atlas), based on patch from stilz
This was SVN commit r8911.
2011-02-11 23:56:55 +00:00
b8925fbbc9 # Support AI construction of buildings.
Pass terrain passability data to AI scripts.
Expand pathfinder passability data to 16 bits per tile, to allow more
classes.
Support 16-bit ints in serializer.
Partially support JS typed arrays.
Allow foundations to be placed on top of units (fixes #499).
Stop farms and fishes blocking movement (fixes #534).
Add obstruction flags to allow finer control over what they block.
Associate entity IDs with obstruction shapes, to allow finding colliding
entities.
Support moving to the edge of a target entity with inactive obstruction.
Support foundation entities in AI.
Support playing as non-hele civs.

This was SVN commit r8899.
2011-02-10 16:06:28 +00:00
5e618e1526 Remove redundant bounds check
This was SVN commit r8875.
2011-01-29 21:14:49 +00:00
03c75100ab # Fix terrain blending logic.
Add terrain priority rendering mode in Atlas.
Fix terrain painting in Atlas to be less profligate with priority
values.
Support hotloading of blend textures.
Clean up some trivial things.

This was SVN commit r8872.
2011-01-29 16:31:48 +00:00
63bd39d4a5 Fix perspective calculation in CCamera::GetScreenCoordinates.
Fixes #99.

This was SVN commit r8870.
2011-01-28 21:51:59 +00:00
0d8ffa58dc AoE3Ed build fixes
This was SVN commit r8868.
2011-01-17 13:29:45 +00:00
dd501b2a5a # Add initial basic player AI framework.
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.

This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
ba2a9d7af3 improvements from work: [update-workspaces required]
- split precompiled.h into several headers (simplifies reuse)
- enable additional warnings not in W4
- split ErrorReaction into ErrorReactionInternal - clarifies which
values can actually be returned by debug_DisplayError
- wsdl: slightly safer HDC usage via CS_OWNDC, avoid dipping into DC
cache via ValidateRect instead of BeginPaint; remove unused thread
create
- StdDeserializer - wasn't including byte_order => BYTE_ORDER was
undefined
- wsysdep: clean up error dialog message handling

This was SVN commit r8828.
2010-12-09 11:16:21 +00:00
1201956b93 Additional cleaning up of logging: removed LOG_CATEGORY macro definitions.
This was SVN commit r8792.
2010-12-05 08:50:33 +00:00
19dbbb816d Changed all references from old CLogger API to use the new API. Removed old API. Fixes #247
This was SVN commit r8791.
2010-12-05 08:41:55 +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
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
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
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
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
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
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
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