Commit Graph

4969 Commits

Author SHA1 Message Date
vts
8f2b82fa8a Basic README.txt for fontbuilder.py to outline installation process of PyCairo on Win32
This was SVN commit r11980.
2012-06-17 23:01:37 +00:00
vts
821cfe8862 Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495.
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
8dc36bed4e Fixes error in actor viewer caused by 962da61f12. Fixes #1499
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
637c09b204 Add support for OpenBSD. Fixes #1463.
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
4ac52a3c47 Fixes bug in percentage map explored calculation. Refs #1334
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
2243f699fc Fix test failure.
Fix entity placement on Phoenician Levant.

This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
962da61f12 Adds shared LOS for allied players, based on patch by Deiz/F00. Fixes #1334.
This was SVN commit r11949.
2012-06-08 04:41:39 +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
vts
da719b883c Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
vts
1c005b0c0e Fixed AABB to OBB transformation resulting in NaN basis vectors when the AABB size in one or more dimensions is zero. Fixes #1121.
This was SVN commit r11928.
2012-05-31 23:17:15 +00:00
137b6dd338 Queued orders for rally points. Fixes #1053 and #1211.
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
c4d6019599 Add garrison order sound and remove the old garrison sound.
Fix some map errors, tabs in templates and update docs.

This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
f72d820cd4 Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18.
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
2ee9981d99 Replace boost::uniform_real to avoid OOS caused by changes in behaviour between Boost versions
This was SVN commit r11857.
2012-05-13 23:40:06 +00:00
fbc3cbad7c Fix handling of non-ASCII paths on Unix
This was SVN commit r11839.
2012-05-11 14:30:15 +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
1f5f82f375 Fixes invalid civ check in rmgen.
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.

This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
282d0f39e2 Remove unused variables
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
c036a7d7e3 Adds control groups to saved game data, based on patch by mk12. Fixes #1261.
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
37a5bedb81 Adds partial support for Debian GNU/kFreeBSD, based on patch by vincent. Refs #1322.
This was SVN commit r11781.
2012-05-07 01:53:35 +00:00
1674a7503f Fixes error from 79c6a2cecc.
This was SVN commit r11780.
2012-05-07 01:29:02 +00:00
79c6a2cecc Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186.
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
vts
d67d2e2370 Updated some documentation in CmpObstructionManager
This was SVN commit r11766.
2012-05-05 23:10:25 +00:00
vts
490182ddd0 Wall placement. Closes #786.
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
ffc89ee1af Adds some OS X availability macros to support 10.5 SDK. Not foolproof but good enough for now.
This was SVN commit r11757.
2012-05-05 03:18:22 +00:00
0c233487ec Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381. Refs #741
This was SVN commit r11752.
2012-05-04 23:30:46 +00:00
32d2927449 Adds UTF-8 support for JavaScript files.
This was SVN commit r11750.
2012-05-04 21:48:46 +00:00
d0784bd314 Fix minimap issue caused by 5b7027ec53. Fixes #1372.
This was SVN commit r11748.
2012-05-04 17:44:28 +00:00
da4c1c8f2b Fixes handling of UTF-8 encoded JSON files (stripping BOM if necessary). Fixes #1375.
This was SVN commit r11739.
2012-05-04 03:46:05 +00:00
58836c624a Read formations from civ JSON files. Fixes #1234, #601.
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
5b7027ec53 Fix tech overlay issue.
This was SVN commit r11725.
2012-05-02 22:57:35 +00:00
6f06d7e69e ...
This was SVN commit r11714.
2012-05-01 23:01:40 +00:00
9173f3c81f This was SVN commit r11713. 2012-05-01 22:54:02 +00:00
030771907e This was SVN commit r11712. 2012-05-01 22:52:24 +00:00
fc47098743 Implements TerritoryInfluence/Radius tech modification. Adds C++ interface for TechnologyManager. Renames its message to MT_TechnologyModification defined in TypeList.h. Refs #1357.
This was SVN commit r11711.
2012-05-01 22:44:27 +00:00
e4528af72b Fix vector allocator types
This was SVN commit r11708.
2012-05-01 21:12:43 +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
0bd649294f Add support for texture-based terrain overlays.
Fix GLES compatibility.

This was SVN commit r11663.
2012-04-24 16:46:32 +00:00
vts
f72bfb1cf1 Add option to disable particles, based on patch by rogue-spectre. Fixes #1222.
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
vts
97f49954cd Allocate VBO buffers in OverlayRenderer only after graphics capabilities and shader path have been properly determined. Fixes #824.
This was SVN commit r11654.
2012-04-23 18:55:32 +00:00
vts
2590e62c38 Dropped some remnant debugging code
This was SVN commit r11644.
2012-04-22 22:45:28 +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
3cbfd9260e Properly enforce the MAX_QUAD_OVERLAYS constraint
Some cleanup of graphics/Overlay.h

This was SVN commit r11629.
2012-04-22 13:19:35 +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
4c372aa6d8 Remove some unused component setters
This was SVN commit r11602.
2012-04-21 13:12:36 +00:00
58eb0c97bb Reuse terrain texture name formatting function
This was SVN commit r11601.
2012-04-21 13:09:01 +00:00
177d7856a6 Avoid assertion failure when editing terrain off the edge of the map
This was SVN commit r11600.
2012-04-21 13:07:47 +00:00
b101f5ad01 Adds hardware cursors for Linux and OS X. Requires libxcursor on Linux. Fixes #748.
Adds explicit links to frameworks we need on OS X.

This was SVN commit r11596.
2012-04-21 07:53:53 +00:00
6f18a42269 Fixes bug detecting mouse focus change. Refs #748.
This was SVN commit r11594.
2012-04-21 07:14:39 +00:00
755e407aeb Technologies. Refs #3. Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
This was SVN commit r11584.
2012-04-20 17:21:04 +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
edc62a240a Try to avoid some type warnings
This was SVN commit r11558.
2012-04-18 21:02:11 +00:00
769350a3e7 Compute camera height and zoom limits based on smoothed terrain heightmap. Fixes #794, based on patch by Dietger.
This was SVN commit r11556.
2012-04-18 20:39:00 +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
a16d56cc72 Delete an unused obsolete method
This was SVN commit r11540.
2012-04-17 21:06:47 +00:00
54fb33841e Fix some issues.
This was SVN commit r11537.
2012-04-17 20:44:18 +00:00
c56f96040e Implement healing. Fixes #999.
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
80277e3da9 Fix #953 (local.cfg adds keys instead of replacing them)
This was SVN commit r11535.
2012-04-17 13:14: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
vts
7f612c266a Calculate new random variations where necessary upon graphics object reloads. Fixes #979.
This was SVN commit r11523.
2012-04-15 23:04:25 +00:00
6410d36a55 Fix engine to respect lack of castshadow flag in actors.
Remove unused variable.

This was SVN commit r11499.
2012-04-14 17:31:18 +00:00
9028c354e6 Fix non-PCH build more. Fixes #1313.
This was SVN commit r11494.
2012-04-13 15:01:51 +00:00
789036fb90 Fix #1299 (page up in console doesn't scroll up)
This was SVN commit r11493.
2012-04-13 12:15:50 +00:00
55e576177d Fix non-pch build. Fixes #1313.
This was SVN commit r11491.
2012-04-12 20:55:21 +00:00
227f9e403f Experimental GPU skinning.
Share inverse bind pose matrices between models.

This was SVN commit r11490.
2012-04-12 15:43:59 +00:00
ce215cace3 Add support for custom vertex attributes and array-of-matrix uniforms in GLSL.
This was SVN commit r11489.
2012-04-12 14:10:02 +00:00
e6a82fff48 Bind textures correctly to GLSL sampler uniforms.
This was SVN commit r11476.
2012-04-10 21:07:52 +00:00
f2260892bd Add config option to force alpha-tested materials.
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
11115770ec Fix memory leak
This was SVN commit r11474.
2012-04-10 20:56:18 +00:00
b6ef80b741 Fix GCC build
This was SVN commit r11456.
2012-04-08 17:44:29 +00:00
f3617822e0 Make AlwaysVisible objects always visible in shader mode. Fixes #908.
This was SVN commit r11454.
2012-04-08 16:36:23 +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
b253cbbee6 Don't unnecessarily die when loading empty files
This was SVN commit r11449.
2012-04-07 21:36:27 +00:00
vts
305723f9a7 Prevent AABB/frustum intersections from blowing up on empty input bounds. Fixes #1027.
This was SVN commit r11441.
2012-04-05 22:29:01 +00:00
6d57808b84 Fix build with old Boost
This was SVN commit r11427.
2012-04-04 11:48:07 +00:00
59447bce2e Move shaders into appropriate subdirectories.
Delete some obsolete shader files.

This was SVN commit r11424.
2012-04-03 19:45:58 +00:00
6bc33fe8bd Update renderer design to be more flexible and data-driven based on material and shader definitions.
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.

This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
a56169ff8c Add interned string class, for fast comparisons and reduced memory usage.
This was SVN commit r11422.
2012-04-03 18:26:52 +00:00
3792b02963 Fix CPreprocessor uninitialised data causing error messages on "#endif" followed by EOF with no newline. Warn about unrecognised "#elif".
This was SVN commit r11418.
2012-04-02 16:12:46 +00:00
vts
8680c6ce06 Delete rally point marker entity when entity is destroyed. Fixes #1254.
This was SVN commit r11409.
2012-03-28 23:09:05 +00:00
d0fc32af4c Fix failure in replay mode
This was SVN commit r11402.
2012-03-26 22:11:30 +00:00
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
1095782d1a Increase maximum VBO size, to support larger meshes
This was SVN commit r11387.
2012-03-21 18:45:10 +00:00
f1e73807a8 Fix formatting
This was SVN commit r11377.
2012-03-20 18:13:27 +00:00
e97547dbd4 Fix FFP renderer
This was SVN commit r11376.
2012-03-20 13:32:30 +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
700e28480d Add command-line option to enable archivebuilder compression
This was SVN commit r11373.
2012-03-19 21:16:12 +00:00
36107cb7e1 GLES compatibility for particles and shadows.
Fix invalid enum errors.
Fix shader texture binding.

This was SVN commit r11372.
2012-03-19 21:10:14 +00:00
8c6231f940 Fix black-square cursor on 16bpp Windows
This was SVN commit r11371.
2012-03-19 20:46:12 +00:00
5a21140093 Added grayscale option for ui textures
This was SVN commit r11364.
2012-03-18 19:43:03 +00:00
vts
d7128572ae Removed logger output for XML token node tests
This was SVN commit r11360.
2012-03-17 23:03:02 +00:00
vts
2207786c05 Missed a bit of indentation in previous commit
This was SVN commit r11343.
2012-03-15 22:58:25 +00:00
vts
31da0a746b Fixes crash when removing non-existent tokens from XML 'token' nodes
This was SVN commit r11342.
2012-03-15 22:57:08 +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
6fc508f662 Fix non-PCH build.
Fix typo.

This was SVN commit r11327.
2012-03-13 21:39:01 +00:00
894dc30c69 Trade. Closes #30.
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
c393732939 Adds slightly more helpful error message when failing to validate an entity template.
This was SVN commit r11273.
2012-03-08 05:13:35 +00:00
e6c58b2a3e Adds log rendering to actor viewer.
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
98c8a47192 Fix crash on Clang
This was SVN commit r11269.
2012-03-07 20:40:38 +00:00
vts
3c677ee425 Prevent unnecessary work, especially on maps with many actors
This was SVN commit r11267.
2012-03-07 19:54:54 +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
0b0f2e9e30 Fixed broken tests by silently failing if Math.js is not found. This is not ideal but seems better than everything else.
This was SVN commit r11253.
2012-03-05 21:20:39 +00:00
e9bbf25997 Remove some redundant code
This was SVN commit r11252.
2012-03-05 18:30:00 +00:00
2afc4d9d8f Fix #1140 (signedness warning on some platforms).
This was SVN commit r11251.
2012-03-05 17:05:02 +00:00
dc715fe57f Remove some unused includes
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
26efdaf216 Try to improve ambiguous bit descriptions
This was SVN commit r11249.
2012-03-05 16:09:47 +00:00
07ab38cdcb Implements COLLADA -1 vertex weight support, using simpler initial solution. Fixes #1012.
This was SVN commit r11242.
2012-03-05 00:42:34 +00:00
d60df4b127 Adds saved game deletion. Refs #1090
Documents a few things related to saved games.

This was SVN commit r11233.
2012-03-04 05:27:17 +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
vts
649cb7ee7b Added PickFriendlyEntitiesOnScreen function to the JS side for #1187.
This was SVN commit r11230.
2012-03-03 21:42:23 +00:00
e2e5c81272 Added safe (identical across platforms) replacement sin and cos functions for scripts. This is part of #1193.
This was SVN commit r11226.
2012-03-03 00:06:16 +00:00
7fa6afac37 Corrects some Doxygen comments and adds a few others of interest.
This was SVN commit r11209.
2012-03-01 03:55:05 +00:00
a01e1cd46a Fixes incorrect use of jschar (broke Linux builds)
This was SVN commit r11207.
2012-02-29 23:41:23 +00:00
2d65ee60f3 Tweaks minimap water color.
This was SVN commit r11202.
2012-02-29 01:12:52 +00:00
366cd7f15a Fixes broken selections in saved games (CmpSelectable needed to call Init on deserialization).
Adds function name to log output when serializer fails on functions, to
aid in debugging.

This was SVN commit r11199.
2012-02-28 22:12:30 +00:00
d755af157f Fixes constant logical operand warning on OS X build.
This was SVN commit r11190.
2012-02-28 03:34:33 +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
vts
b8e8602e39 Fixed test failure in test_CmpTemplateManager.h after atlas selection improvement
This was SVN commit r11182.
2012-02-27 19:10:49 +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
7663e78861 Fix terrain overlay rendering
This was SVN commit r11163.
2012-02-25 22:11:34 +00:00
5009636e39 Improve Android compatibility.
Basic touchscreen input for testing.
Better GLSL support for map rendering.

This was SVN commit r11155.
2012-02-25 17:29:27 +00:00
c888c00377 Avoid unnecessary use of printf in text renderer.
This was SVN commit r11154.
2012-02-25 17:14:47 +00:00
9b0a3830df Support more commands in shader technique XML files.
Always print GLSL shader logs, to help debugging.

This was SVN commit r11149.
2012-02-25 15:38:38 +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
46ee6f0566 Adds more specific error messages to failed model or animation loading.
This was SVN commit r11111.
2012-02-21 05:00:21 +00:00
vts
590228804e Fixed rally line attachment point for circular buildings (refs #1172)
This was SVN commit r11106.
2012-02-20 00:13:46 +00:00
d4c32b8a80 Fixes tests broken by [11100]
This was SVN commit r11104.
2012-02-19 22:00: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
5a4aa790ad Fix spelling and whitespace and add rationale
This was SVN commit r11088.
2012-02-17 14:34:44 +00:00
4c43d1f9c5 Fixing building with older versions of Boost
This was SVN commit r11083.
2012-02-16 18:01:10 +00:00
7656ffa265 Be more informative about errors in CreateDirectories
This was SVN commit r11082.
2012-02-16 13:50:31 +00:00
645a6e31be Basic touch input for testing
This was SVN commit r11081.
2012-02-15 22:27:02 +00:00
832a51da80 GLSL text support
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
5f6e3de42f Convert shaders to GLSL ES automatically
This was SVN commit r11079.
2012-02-15 20:33:43 +00:00
20d23eb340 Sysdep code for Android/ARM
This was SVN commit r11075.
2012-02-15 15:40:31 +00:00
f4625e69af Partial Android compatibility.
Remove unnecessary VM allocation (which seemingly causes problems on
Android due to mmap during static initialization).
Allow building without NVTT.

This was SVN commit r11074.
2012-02-15 13:58:58 +00:00
d70a981377 Android fixes
This was SVN commit r11068.
2012-02-13 23:53:09 +00:00
9972eb8cae Enough GLES compatibility to reach the menu screen
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
d89c82092a Fix GLSL shaders on Mesa
This was SVN commit r11063.
2012-02-13 20:47:14 +00:00
vts
4f5a02acc4 Changes CCmpProjectileManager's culling to use recursive world bounds. Fixes instantly-disappearing smoke trails on projectiles going off-screen.
This was SVN commit r11062.
2012-02-13 20:06:57 +00:00
677ccf53e6 Yet more GLES compatibility
This was SVN commit r11061.
2012-02-13 16:41:17 +00:00
a9eca31bad Even more GLES compatibility
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
4bf59b9a7d More GLES compatibility, mainly around terrain rendering.
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
baff889321 Fix invalid varargs
This was SVN commit r11054.
2012-02-12 21:05:13 +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
1185ebdea5 Fix build
This was SVN commit r11051.
2012-02-12 13:26:57 +00:00
db85833655 More GLES compatibility.
Move more rendering code to shader API.

This was SVN commit r11050.
2012-02-12 13:20:49 +00:00
4029d409bb Handle CBrush assertion failure less fatally
This was SVN commit r11049.
2012-02-12 12:36:05 +00:00
202a8e17c4 Fixes camera constraints by clamping the camera focus point to within the map bounds instead of outside, since the constraints are partially based on terrain height. Should improve scrolling behavior on both circular and square maps. Refs #656, #850
This was SVN commit r11044.
2012-02-10 02:17:40 +00:00
2bf3383624 Attempt to fix minimap rendering issues
This was SVN commit r11041.
2012-02-09 20:45:19 +00:00
a3f168b887 Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility.
Specify GLSL version in shader files, for better error detection.

This was SVN commit r11040.
2012-02-09 17:55:25 +00:00
1f5b8f1c9a Move GUI renderer towards using shader infrastructure.
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.

This was SVN commit r11039.
2012-02-08 20:43:38 +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
ba84c54535 Render GUI quads with consistent winding order, to stop them vanishing with negative sizes.
This was SVN commit r11030.
2012-02-05 22:57:58 +00:00
275e5b9620 Fixes signed/unsigned comparison warnings in GCC.
This was SVN commit r11014.
2012-02-04 06:17:17 +00:00
374242bcfc Fix warnings in autobuild script
This was SVN commit r11012.
2012-02-03 17:08:43 +00:00
868b256cce Throw error in PSA converter if animation has no frames, as this will lead to a divide-by-zero error in the engine, and it's good to catch that as early as possible.
This was SVN commit r11009.
2012-02-03 01:49:32 +00:00
0f4928bd0a Use dummy IO tracer, to avoid overhead of storing data that will never be used. (See #1143.)
This was SVN commit r11007.
2012-02-02 23:12:36 +00:00
b9c406551b Cache shader effects. Fixes #1143.
This was SVN commit r11006.
2012-02-02 22:58:42 +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
5cdb2ebd70 Fix cursor winding
This was SVN commit r10992.
2012-01-30 12:13:43 +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
2d0e8021aa Fixes old g++ build error with default template arguments, by wrapping them in parentheses.
This was SVN commit r10990.
2012-01-30 04:57:39 +00:00
cc5a0fba4e Use shader API for GUI text.
Flip GUI quads so we don't have to disable back-face culling.

This was SVN commit r10989.
2012-01-30 00:27:23 +00:00
63572a5247 Fix build
This was SVN commit r10986.
2012-01-29 20:16:47 +00:00
04c63a4093 Clean up some text rendering to avoid relying on deprecated GL matrix state.
Use scissor instead of deprecated clip planes for GUI text.
Remove unused support for generic font names.

This was SVN commit r10985.
2012-01-29 20:04:21 +00:00
8be430eb30 Remove obsolete ogl_shader
This was SVN commit r10984.
2012-01-29 12:23:16 +00:00
9884d21830 Be more consistent in using the ARB forms of functions. Fixes #1138, based on patch by Echelon9.
This was SVN commit r10983.
2012-01-29 12:15:22 +00:00
8324a8981d Simplify GLSL program files.
Move water shaders to new shader system.

This was SVN commit r10982.
2012-01-29 12:04:39 +00:00
adbd7633dd # Initial GLSL rendering support
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
8ca59d418d Partially fix hotloading (see #848)
This was SVN commit r10977.
2012-01-29 01:19:54 +00:00
63e151fbd5 Slightly more Android compatibility
This was SVN commit r10975.
2012-01-28 16:38:21 +00:00
27687873d5 Fix SSE skinning normalisation (fixes #1136). Add a few more comments.
This was SVN commit r10974.
2012-01-28 12:17:44 +00:00
7f679a7975 # Support separate rotation and scaling for each terrain texture
This was SVN commit r10952.
2012-01-22 18:20:33 +00:00
d40e4797de Report timer_Resolution via hwdetect
This was SVN commit r10947.
2012-01-22 13:49:09 +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
d068c1dd09 Fix build with old versions of Mesa
This was SVN commit r10936.
2012-01-19 18:23:54 +00:00
95e6673ed4 Fixes include in wsdl.
This was SVN commit r10932.
2012-01-18 22:51:49 +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
8099388bec final sync with work - add VECTOR_ALIGNED, fix wsdl to match new SDL include path
This was SVN commit r10926.
2012-01-18 15:36:44 +00:00
182bf2b4af Vague start at hypothetical Android support
This was SVN commit r10923.
2012-01-17 22:05:43 +00:00
09907adae3 Prevents game from running with root permissions with appropriately scary message on Unix-like OSes, based on patch by leper. Fixes #1058.
This was SVN commit r10916.
2012-01-16 03:30:55 +00:00
e64a3d3946 Experiment a little with OpenGL ES
This was SVN commit r10915.
2012-01-15 23:15:31 +00:00
c8bf34948c Fixes no PCH build. Fixes #1113.
This was SVN commit r10914.
2012-01-15 21:48:41 +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
1389e754de Include *.DELETED files when building archives. See #1110.
This was SVN commit r10907.
2012-01-14 18:46:20 +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
72bd886f80 Delete ancient obsolete simulation code.
This was SVN commit r10903.
2012-01-12 12:56:15 +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
4f559e8aff Report quicksave/quickload times, to help identify performance problems.
This was SVN commit r10901.
2012-01-12 12:47:24 +00:00
ed237ff1a6 Implements GetVideoMode on OS X (10.6+ compatible), based on patch by Echelon9. Fixes #847.
This was SVN commit r10897.
2012-01-11 23:41:59 +00:00
6bb54ee1d4 Fix Windows build
This was SVN commit r10896.
2012-01-11 23:04:33 +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
1e4b950ed1 This was SVN commit r10870. 2012-01-05 03:38:54 +00:00
29a8f01254 Adds missing attributes when using autostart-random (caused undefined variable warning in saved games list).
This was SVN commit r10869.
2012-01-04 22:48:32 +00:00
10527b4551 Fix #1092 (script runtime mismatch when saving games)
This was SVN commit r10868.
2012-01-04 15:28:48 +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
f73e3c7668 Fix uninitialised members
This was SVN commit r10865.
2012-01-04 13:17:26 +00:00
8b6a3923d3 instead of wcscasecmp, use std::string operator< (i.e. case-sensitive comparison)
closes #1036  (see rationale/discussion there)

This was SVN commit r10862.
2012-01-04 00:25:34 +00:00
56bd4b37cd Fix #1064 more
This was SVN commit r10860.
2012-01-03 15:42:03 +00:00
785b6efa4b by default, don't attempt to start the aken driver
addresses security concerns
[http://www.wildfiregames.com/forum/index.php?showtopic=15482]

This was SVN commit r10858.
2012-01-02 23:38:46 +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
0ec4242962 Detect and fix printf signedness errors. Fixes #1086, #1087.
This was SVN commit r10846.
2012-01-01 16:43:10 +00:00
cc405939c2 Fix #1085 (incorrect buffer size), based on patch by Echelon9
This was SVN commit r10845.
2012-01-01 14:42:58 +00:00
e1f7d7e599 Detect and fix characters missing from fonts
This was SVN commit r10840.
2011-12-31 16:34:42 +00:00
325c344ddd increase size of error message buffer, don't complain about "invalid image hash" (known issue with aken.sys on Win7 x86).
fixes #1083

This was SVN commit r10834.
2011-12-29 20:15:47 +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
1e0074e9da Fix crash with missing shader support
This was SVN commit r10829.
2011-12-29 13:35:07 +00:00
78ba79209d more minor fixes. rename uname.machine to x64 (less confusing than amd64)
This was SVN commit r10827.
2011-12-29 09:47:42 +00:00
23308f0259 wsdl: add error checks, add support for bpp in sdl_surface
This was SVN commit r10826.
2011-12-29 09:01:09 +00:00
1e210165f2 Fix some MSVC static analysis warnings
This was SVN commit r10825.
2011-12-29 02:06:09 +00:00
9ef1cd8ba8 Avoid the deprecated (and fallible) SHGetMalloc, per current MSDN documentation
This was SVN commit r10824.
2011-12-29 01:50:18 +00:00
dbf27dbc5e Fix #1065 (incorrect printf format string), based on patch by Echelon9
This was SVN commit r10823.
2011-12-29 01:40:24 +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
6ac6d4f1ec Fix #1062 (incorrect check for empty string), based on patch by Echelon9
This was SVN commit r10821.
2011-12-29 01:07:20 +00:00
eb45a8e0f0 Fix profile visualiser
This was SVN commit r10820.
2011-12-28 22:01:30 +00:00
52756535f3 Fix crash in GL_EXT_timer_query profiler
This was SVN commit r10819.
2011-12-28 22:00:52 +00:00
c134221739 minor fixes
waio: ensure error is disk_full on failure
cache_adt: scaffolding code wrongly used std::remove_if instead of
list::remove. thanks to Echelon9 for catching this! fixes #1063

This was SVN commit r10818.
2011-12-28 11:21:05 +00:00
0d05c96be2 [gcc] compile fix.
fixes #1074
thanks to Echelon9!

This was SVN commit r10816.
2011-12-27 18:56:20 +00:00
3537ae31d5 sync with work:
x86_x64: update MSR definitions to include model 2F (westmere ex);
update bus clock computation for sandy bridge; remove unused
cpu_Serialize; use namespace, add model names
mahaf: cope with stricter security for services/drivers
ApicId -> GetApicId, move to apic module
aken: add batch file to install driver (optional)

This was SVN commit r10815.
2011-12-27 14:12:31 +00:00
1f38526444 Fix test failures on Windows
This was SVN commit r10802.
2011-12-23 13:37:11 +00:00
4f6f0b7baf Fix tests, and warnings, and non-PCH build
This was SVN commit r10801.
2011-12-23 13:01:29 +00:00
587487811b Fixes typo in pool allocator stats, based on patch from Echelon9. Fixes #1061.
This was SVN commit r10799.
2011-12-23 03:54:36 +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
c989f52c46 Use heap-based queue in pathfinder to improve worst-case performance (in exchange for terrible VS2008 debug-mode performance)
This was SVN commit r10790.
2011-12-22 16:58:03 +00:00
6399ec0cd2 # Partial support for saved games with AI.
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.

This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
5f0d5e4137 Tidy some whitespace
This was SVN commit r10786.
2011-12-22 13:50:11 +00:00
0c84a6125b Support larger profiler JSON output
This was SVN commit r10781.
2011-12-21 11:28:24 +00:00
2bc2666e4e sync with work - minor fixes
This was SVN commit r10770.
2011-12-19 11:55:30 +00:00
286ce58b1c more restrictive permissions required by tightened vista/win7 security (still unable to launch services without admin - but could install them once)
This was SVN commit r10762.
2011-12-18 12:21:57 +00:00
36ef0a376d workaround hardware/BIOS craziness
fixes #1047

This was SVN commit r10754.
2011-12-17 20:41:32 +00:00
vts
292ed1d9e0 Allocated rally point flag entity on-demand instead of at initialization time. Fixes #1042.
This was SVN commit r10722.
2011-12-13 14:14:41 +00:00
vts
6156fa7c9a Changed default idle animation speed to 1 so that waypoint flags will animate properly
This was SVN commit r10712.
2011-12-11 13:35:51 +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
db864f10c3 Rendering marker lines between buildings and rally points
Added command button to focus on rally point
(implements #524)

This was SVN commit r10704.
2011-12-10 07:07:04 +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
f4e46d166d sync with work; minor fixes (wsdl must report gfx memory in KB to match sdl)
This was SVN commit r10678.
2011-12-06 09:17:39 +00:00
0ba908816f Fix line endings
This was SVN commit r10635.
2011-11-29 21:04:38 +00:00
8492426a14 Rough support for profiling replay mode and scripts
This was SVN commit r10634.
2011-11-29 20:32:43 +00:00
4da8bf001f Add pathfinders to new profiler
This was SVN commit r10633.
2011-11-29 20:29:50 +00:00
2d017698e1 Fix random maps in replay mode
This was SVN commit r10632.
2011-11-29 20:29:06 +00:00
24aa71b566 safely handle the case where an archive required for populating a directory cannot be opened (e.g. because it is open within 7-zip, which apparently wants exclusive access)
fixes #1021

This was SVN commit r10631.
2011-11-29 16:51:58 +00:00
ee417e8fd0 Attempts to fix incorrect destructor order in random map generator. See #1037, #1035.
This was SVN commit r10627.
2011-11-29 00:14:34 +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
e74d6707e4 Avoid calling glGenQueries while a timer query is active (hopefully fixes #1033)
This was SVN commit r10622.
2011-11-27 22:24:05 +00:00
b1fa90b8ef Use a deterministic order when loading multiple archive files from within a single mod
This was SVN commit r10620.
2011-11-27 17:33:42 +00:00
301854702c add support for removing individual files from VFS and a mechanism for automatically doing so (add filename.extension.DELETED to the same directory/archive), as discussed in meeting.
refactor: split up Invalidate into RemoveFile+RepopulateDirectory
GameSetup: fix: ensure the first mod always overrides game files,
irrespective of timestamp.

This was SVN commit r10610.
2011-11-26 18:37:53 +00:00
d82b85b8f3 Fix #1025 (add config option to toggle pause on window focus loss), based on patch by markcho.
This was SVN commit r10609.
2011-11-26 15:23:41 +00:00
vts
85186c98b2 Better selection boxes. Closes #914, #295, #810.
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
8cbab40137 Barter. Closes #23.
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
8d977e4818 Allows building in fog of war. Fixes #958.
This was SVN commit r10584.
2011-11-24 00:58:34 +00:00
2878102ed7 Avoid some code duplication
This was SVN commit r10583.
2011-11-23 21:26:14 +00:00
ab88151ed0 Fix uninitialised value
This was SVN commit r10582.
2011-11-23 21:24:41 +00:00
18eefc7303 Fixes simulation replay mode in Windows.
This was SVN commit r10563.
2011-11-20 02:00:54 +00:00
31bcb5c803 Fixes buggy selection behavior due to incorrect camera plane calculation.
This was SVN commit r10558.
2011-11-19 05:05:59 +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
6b1ce04aad Fix VC2008 compatibility
This was SVN commit r10544.
2011-11-16 17:49:28 +00:00
f66a3e726f Avoid overflow identified by /RTCc warning
This was SVN commit r10537.
2011-11-14 22:22:38 +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
ade841efdd Avoid assertion failures on abnormal exit() (e.g. dumpSchema mode)
This was SVN commit r10530.
2011-11-13 21:37:12 +00:00
fbff0aa98d Fix printf argument types
This was SVN commit r10529.
2011-11-13 18:31:06 +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
72237c32a2 Avoid release-mode warnings
This was SVN commit r10525.
2011-11-13 12:31:41 +00:00
f0f81827f3 Fix build with old GCCs
This was SVN commit r10522.
2011-11-13 01:04:40 +00:00
f865401136 Detect allocation failure
This was SVN commit r10520.
2011-11-12 23:57:33 +00:00
99e012ba56 Fix comments
This was SVN commit r10517.
2011-11-12 22:08:59 +00:00
95bd6f874e Fix OS X build by using GL_TIME_ELAPSED consistently
This was SVN commit r10516.
2011-11-12 19:29:48 +00:00
70224e7940 Fix missing symbols in old glext
This was SVN commit r10515.
2011-11-11 11:56:51 +00:00
0192c24ebc Fix warning in old GCCs
This was SVN commit r10514.
2011-11-11 11:55:27 +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
3916c25b84 Optimise vertex skinning code with SSE, based on patch by gruby.
Fixes #905.

This was SVN commit r10499.
2011-11-09 23:11:28 +00:00
87b3b0856f Fix warning
This was SVN commit r10496.
2011-11-09 22:35:31 +00:00
8617dfd0e1 Avoid fatal error on printf overflow in profiler
This was SVN commit r10495.
2011-11-09 18:29:08 +00:00
f2ea307507 Moved warning and debug messages to below the top bar.
This stops them obscuring the useful inormation in the bar.

This was SVN commit r10494.
2011-11-09 17:01:57 +00:00
b090ec48ce Add query counter bits to hwdetect
This was SVN commit r10493.
2011-11-09 13:10:34 +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
8fba3f92b1 Allow better hwdetect debugging
This was SVN commit r10491.
2011-11-09 11:54:05 +00:00
ab347de754 Fixes PMD converter's handling of static prop points. Coordinate conversion was not performed correctly according to the model's up-axis orientation. Fixes #886, #243.
This was SVN commit r10484.
2011-11-09 00:10:14 +00:00
cb27a680bf Fix profiler shutdown order
This was SVN commit r10483.
2011-11-09 00:09:19 +00:00