1
0
forked from 0ad/0ad
Commit Graph

649 Commits

Author SHA1 Message Date
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
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
674eaa1283 Latest version of user-report server code
This was SVN commit r9393.
2011-05-02 15:47:12 +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
73add20727 Load original Pagella .otf font with hinting explicitly disabled, instead of loading via .ttf
This was SVN commit r9243.
2011-04-13 22:15:04 +00:00
5a8d291403 Remove old vertexshader renderpath option from Atlas
This was SVN commit r9236.
2011-04-13 18:28:27 +00:00
469d0fe5c5 Remove rmgen tool.
Log error description when sound engine fails (instead of cryptic
LibError code).

This was SVN commit r9219.
2011-04-10 00:54:15 +00:00
50e30ae8af Be more explicit about function types in font builder to fix crash
This was SVN commit r9201.
2011-04-07 19:59:34 +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
6beb1ea89b Exclude FCollada tests from Unix releases, since they rely on non-free data file Eagle.DAE
This was SVN commit r9160.
2011-04-04 14:20:16 +00:00
1abbf8b64b Old changes to compress releases better
This was SVN commit r9159.
2011-04-04 14:17:39 +00:00
09413d940c Delete an obsolete particle system editor
This was SVN commit r9145.
2011-04-03 18:44:20 +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
b70a0a5b5a Latest version of user-report server code
This was SVN commit r9051.
2011-03-12 02:36:20 +00:00
bec4c6437b Make non-combat units flee when under melee attack, and not attack enemies automatically.
Fixes #703.

This was SVN commit r9010.
2011-03-04 14:36:41 +00:00
8d2d4a8505 Fix profile parser
This was SVN commit r9002.
2011-03-03 00:14:23 +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
f0ea32cb8d Import user-report server side code
This was SVN commit r8986.
2011-02-25 19:46:01 +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
64f02d5b47 Remove misleadingly obsolete package scripts
This was SVN commit r8895.
2011-02-09 16:36:08 +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
aaef1b0d74 Add script for generating mostly-useless component interaction graphs.
Fix some components to use more standard syntax.

This was SVN commit r8857.
2011-01-07 20:31:48 +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
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