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
374242bcfc
Fix warnings in autobuild script
...
This was SVN commit r11012.
2012-02-03 17:08:43 +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
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
fa37c9b441
Reverted some of bad commit (10853) because I hit the wrong button
...
This was SVN commit r10854.
2012-01-02 22:15:21 +00:00
a4e1f3c292
This was SVN commit r10853.
2012-01-02 21:46:09 +00:00
e1f7d7e599
Detect and fix characters missing from fonts
...
This was SVN commit r10840.
2011-12-31 16:34:42 +00:00
ca56add718
Add GUI and civ files to reference checker
...
This was SVN commit r10833.
2011-12-29 19:25:41 +00:00
a18195d0a1
Add checks for terrain texture references
...
This was SVN commit r10832.
2011-12-29 17:57:01 +00:00
7380d2c615
Add incomplete script for detecting data errors (broken references and unused files)
...
This was SVN commit r10830.
2011-12-29 17:39:27 +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
eb45a8e0f0
Fix profile visualiser
...
This was SVN commit r10820.
2011-12-28 22:01:30 +00:00
9f0e357f09
Add a hack for a-macron-acute characters (see #1039 )
...
This was SVN commit r10796.
2011-12-22 22:44:57 +00:00
0c84a6125b
Support larger profiler JSON output
...
This was SVN commit r10781.
2011-12-21 11:28:24 +00:00
46a09ced71
Fixed some compilation warnings
...
This was SVN commit r10710.
2011-12-11 02:11:05 +00:00
427674f713
Fix for compilation failure of [10703] on 64-bit systems
...
This was SVN commit r10705.
2011-12-10 11:53:39 +00:00
fbb0e3995f
Added prop point axes markers to Atlas' Actor Viewer panel
...
This was SVN commit r10703.
2011-12-10 05:11:25 +00:00
1c19e905b1
Added prop points to Atlas' Actor Viewer
...
This was SVN commit r10696.
2011-12-09 10:49:08 +00:00
8492426a14
Rough support for profiling replay mode and scripts
...
This was SVN commit r10634.
2011-11-29 20:32:43 +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
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
56d634bf49
Fix invalid characters in entity templates. Add script to find unrecognised characters.
...
Fixes #960 .
This was SVN commit r10503.
2011-11-10 19:31:35 +00:00
cfb79c3062
# Add GPU performance profiling support.
...
Add some profiler region attributes.
Render events in profile visualiser.
Change profiler from GPL to MIT.
This was SVN commit r10492.
2011-11-09 13:09:01 +00:00
8f3255f9c8
Fix tests and Atlas with new profiler
...
This was SVN commit r10471.
2011-11-05 23:09:31 +00:00
b13f1cade5
# UI for new profiling tool
...
This was SVN commit r10467.
2011-11-04 01:43:46 +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
68fe745eb7
Fix packaging scripts for 5-digit revision numbers
...
This was SVN commit r10001.
2011-08-11 18:16:00 +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
3cc1c7e24e
Templates sorting utility. Closes #801 .
...
This was SVN commit r9938.
2011-07-30 20:20:34 +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
ce42cd611a
Update release packaging script for recent library changes
...
This was SVN commit r9884.
2011-07-19 17:30:49 +00:00
ead45aa957
Report XML parse errors better in validator tool
...
This was SVN commit r9874.
2011-07-18 14:57:41 +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
6371afbc76
Remove the rarely-used source code option from the Windows installer. See #855 .
...
This was SVN commit r9777.
2011-07-07 20:11:47 +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