1
0
forked from 0ad/0ad
Commit Graph

4683 Commits

Author SHA1 Message Date
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