1
0
forked from mirrors/0ad

686 Commits

Author SHA1 Message Date
historic_bruno 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
historic_bruno 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
historic_bruno cafb817446 Reverts broken change from 022fc4c47c.
This was SVN commit r11694.
2012-04-29 03:20:00 +00:00
historic_bruno 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
Ykkrosh 9488ca42f6 Disable deadlocking fatal exception handler in Atlas
This was SVN commit r11603.
2012-04-21 14:12:37 +00:00
Ykkrosh 58eb0c97bb Reuse terrain texture name formatting function
This was SVN commit r11601.
2012-04-21 13:09:01 +00:00
historic_bruno 4d8ba45375 Removes unnecessary change from [11575]
This was SVN commit r11578.
2012-04-20 03:01:09 +00:00
historic_bruno 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
Ykkrosh 75e7ea497b Add comment about incorrect array-bounds warning
This was SVN commit r11560.
2012-04-18 22:00:07 +00:00
Ykkrosh 3027ce1a04 Rationalise terrain dirty-rect coordinates.
Clean up some whitespace.

This was SVN commit r11543.
2012-04-17 22:35:34 +00:00
historic_bruno be453771cf Fixes OS X build.
This was SVN commit r11529.
2012-04-17 03:57:53 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
Ykkrosh 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
historic_bruno 0fda0019d1 Updates data paths on OS X and Windows. On OS X only write to locations inside ~/Library. On Windows make the distinction between local and roaming appdata, and use folder inside My Documents for user-created data. Fixes #1145.
Adds proper OS X app bundle support.
Updates Windows installer script.

This was SVN commit r11389.
2012-03-22 00:23:31 +00:00
Ykkrosh 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
historic_bruno 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
historic_bruno e6c58b2a3e Adds log rendering to actor viewer.
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
historic_bruno 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
historic_bruno b7e848de23 Avoid unused parameter warnings due to safe bool operators.
This was SVN commit r11142.
2012-02-25 06:24:24 +00:00
historic_bruno 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
historic_bruno 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
Ykkrosh 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
historic_bruno 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
historic_bruno 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
Ykkrosh 3fab2729b5 Partial SDL2 compatibility
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
Ykkrosh 374242bcfc Fix warnings in autobuild script
This was SVN commit r11012.
2012-02-03 17:08:43 +00:00
historic_bruno 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
historic_bruno 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
historic_bruno 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
Ykkrosh e4b2de4bba Delete obsolete AoE3Ed code
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
Ykkrosh c9cdde256f Disable GCC warning triggered by wx headers
This was SVN commit r10908.
2012-01-14 19:06:47 +00:00
historic_bruno 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
Ykkrosh 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
Ykkrosh 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
Ykkrosh 6f2eec3c2e Fix warnings
This was SVN commit r10867.
2012-01-04 13:19:38 +00:00
Ykkrosh c1c741be9a Fix dangling pointer in Atlas
This was SVN commit r10866.
2012-01-04 13:18:45 +00:00
historic_bruno 5bf70e52de Fixes Atlas startup in Windows when using SDL.
This was SVN commit r10855.
2012-01-02 22:48:43 +00:00
quantumstate 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
quantumstate a4e1f3c292 This was SVN commit r10853. 2012-01-02 21:46:09 +00:00
Ykkrosh e1f7d7e599 Detect and fix characters missing from fonts
This was SVN commit r10840.
2011-12-31 16:34:42 +00:00