1
0
forked from 0ad/0ad
Commit Graph

4790 Commits

Author SHA1 Message Date
2c642fc68e Uninitialized variable was causing nondeterministic weirdness in Atlas.
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
20d75a3880 Free cursors before shutting down SDL. Fixes #1355.
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
be31d3a9e7 Added a function for finding colliding entities with identical control groups. Refs #1529.
This was SVN commit r12269.
2012-08-03 16:36:40 +00:00
692795e56e Added engine-side obstruction group sanitizing, saving, and loading. Refs #1566
This was SVN commit r12258.
2012-08-01 21:38:13 +00:00
b8b6ebb6ec Properly re-initialize drop-down lists when the list items changes. Fixes #1558.
This was SVN commit r12244.
2012-07-31 03:34:09 +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
4264166acf Detect when units aren't in the world and hide their selection rings. Based on patch by dvangennip. Refs #1365.
This was SVN commit r12239.
2012-07-30 04:45:33 +00:00
2c8adb1aea Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527. Refs #1360
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
c6a0d0b6f3 Fixes build error left out of c1a3b8f171. Refs #1497
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
c1a3b8f171 Updates to myconid's most recent multiple UV set patch. Refs #1497
This was SVN commit r12185.
2012-07-24 02:57:25 +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
f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +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
51b9fa6186 Uses xml attributes instead of elements for obstructions shapes.
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
574f4db8ab Fixes font texture handling to use format auto-detection when possible, based on patch by Deiz/F00. Fixes #1508
This was SVN commit r12073.
2012-07-05 01:05:09 +00:00
512854e30c Fixes log folder script on WinXP/2000. Moves script inside source/tools. Adds start menu shortcut to the installer. Updates README. Fixes #1438
This was SVN commit r12068.
2012-07-04 03:50:01 +00:00
99d04e93bb Implements global tech modification function. Fixes #1358, refs #1520.
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193.
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.

This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
ebe5b66ba3 Fix test failure caused by f660f834bf.
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
941a8c014b Update fontbuilder with stroked and bold stroked 12, 13, and 16
This was SVN commit r12001.
2012-06-23 22:05:05 +00:00
vts
f660f834bf Added default, arbitrary-sized Footprint component to actor entities. Makes their selection outlines show up in Atlas. Fixes #1477.
This was SVN commit r11997.
2012-06-23 21:12:51 +00:00
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