1
0
forked from 0ad/0ad
Commit Graph

3740 Commits

Author SHA1 Message Date
05aadf1f12 # SwEng: remove X-macros from app_hooks (confused static code analysis)
This was SVN commit r4372.
2006-09-21 12:06:56 +00:00
d34ae19788 # cleanup JS
fix tabs and indenting

This was SVN commit r4371.
2006-09-21 11:30:40 +00:00
054cbaf644 This was SVN commit r4370. 2006-09-20 22:46:15 +00:00
0c0c0c1450 This was SVN commit r4369. 2006-09-20 22:16:15 +00:00
7f50e5b726 This was SVN commit r4368. 2006-09-20 22:15:17 +00:00
56670403ea This was SVN commit r4367. 2006-09-20 22:13:15 +00:00
b12ee2e4ee This was SVN commit r4366. 2006-09-20 21:56:37 +00:00
acdf2efbc0 This was SVN commit r4365. 2006-09-20 21:51:51 +00:00
fa7320981c This was SVN commit r4364. 2006-09-20 21:44:24 +00:00
d90771caf8 #Fixed tree "actors" for more random Gaia goodness.
This was SVN commit r4363.
2006-09-20 21:42:53 +00:00
2e05d4f386 This was SVN commit r4362. 2006-09-20 21:41:42 +00:00
2c5e11722c This was SVN commit r4361. 2006-09-20 21:40:16 +00:00
df36e3db0d #Artichoke Plants for Mediterranean Maps.
This was SVN commit r4360.
2006-09-20 21:39:46 +00:00
7ce31a1544 Hopefully fixing VS2003 (autobuilder) error ("'operator &&' is ambiguous - could be 'built-in C++ operator&&(bool, bool)' or 'built-in C++ operator&&(bool, CEntity *)' while trying to match the argument list '(bool, HEntity)'")
This was SVN commit r4358.
2006-09-18 18:38:29 +00:00
bfae07a0bc # Added more control for water shader
(Murkiness, colour, tint, reflection tint, reflection tint strength)

This was SVN commit r4357.
2006-09-18 18:09:07 +00:00
87598ebf40 This was SVN commit r4356. 2006-09-17 22:14:34 +00:00
ff5a9bb5c4 This was SVN commit r4355. 2006-09-17 22:14:16 +00:00
40a8d05386 This was SVN commit r4354. 2006-09-17 21:49:58 +00:00
2774fd9167 This was SVN commit r4353. 2006-09-17 21:49:24 +00:00
2736bda0c2 This was SVN commit r4352. 2006-09-17 21:48:57 +00:00
b626abfda9 #New Oak tree leaf textures
This was SVN commit r4351.
2006-09-17 20:59:49 +00:00
512e5bbd80 This was SVN commit r4350. 2006-09-17 20:06:03 +00:00
5e28c4bebf - Fixed a bug with aura rendering that was causing a crash when rendering auras that were added to a unit after its creation (initAuraData was not called on subsequent AddAura calls). This caused objects like Settlements, Mills, Farmsteads and Temples to crash when you mouseover them since they do not gain the aura until construction is complete.
- When the map contains no territories, ignore territory-related
building placement rules.

Fixes #149.

This was SVN commit r4349.
2006-09-17 02:49:29 +00:00
e4bcc1c6a3 Gameplay fixes:
- Set the default rally point to be right on top of each building
(rather than (0,0)).
- issueCommand used to send 2 copies of a command, which caused for
example units to be trained in twos (it added some entities twice to
msgEntities).

This was SVN commit r4348.
2006-09-17 02:20:20 +00:00
88474be519 Fixed a missing break statement that caused a research event to also be generated when you try to train something.
This was SVN commit r4347.
2006-09-17 02:18:50 +00:00
6b73ba0296 - Terrain conformance should now work in Atlas as well.
- Renamed Passive stance to Hold (which is what it's called in the
design doc and GUI).

This was SVN commit r4345.
2006-09-16 21:30:23 +00:00
58c159faa0 texture tweaks
This was SVN commit r4344.
2006-09-16 20:30:29 +00:00
d370aa226c This was SVN commit r4343. 2006-09-16 20:29:46 +00:00
bb649c2d4c This was SVN commit r4342. 2006-09-16 20:29:05 +00:00
0484a50f4a This was SVN commit r4341. 2006-09-16 20:28:28 +00:00
04b9809e0b Made CTerrain::getSlopeAngleFace even more "continous" at places where the slope changes rapidly (before, it only checked elevation forward and right, now it also looks left and up).
This was SVN commit r4340.
2006-09-16 20:16:42 +00:00
0baca62d61 # Fixes to terrain conformance and movement speed bonus.
- Simplified CTerrain::getSlopeAngleFace and made it work correctly in
all cases (before, it sometimes returned NAN and used an overly
complicated method based on 8 angle sectors instead of a "continuous"
method).
- Removed the EntityMovement event - instead, movement speed modifier is
calculated in C++ for performance.

This was SVN commit r4339.
2006-09-16 20:13:40 +00:00
cd792eeb8e XML/JS fixes to movement and terrain conformance.
This was SVN commit r4338.
2006-09-16 20:11:42 +00:00
b0e7085fb9 Changed default stance to Hold so units don't look like they're attacking each other in Atlas (eventually we can make this be "aggress" in the game but hold in Atlas).
This was SVN commit r4337.
2006-09-15 18:59:44 +00:00
6e328f1c1c Linux fixes.
This was SVN commit r4335.
2006-09-14 23:04:20 +00:00
43526b061d Linux fixes.
This was SVN commit r4334.
2006-09-14 23:03:54 +00:00
8126769863 Linux fixes.
This was SVN commit r4333.
2006-09-14 23:03:16 +00:00
33ddc81871 Linux fixes.
This was SVN commit r4332.
2006-09-14 23:02:39 +00:00
09b87e84ec #Bugfix: Shadows appeared to be rendered one frame too late
close #141

The problem was that the shadow matrices were setup in BeginFrame, but
GraphicsView calls SetCamera after BeginFrame. The solution was to move
the shadow matrix setup into CRenderer::SetCamera.

This caused a second problem because RenderReflections/RenderRefractions
used SetCamera to change the OpenGL matrices. Solved this problem by
distinguishing explicitly between the camera used for the scene as a
whole and the camera used to configure OpenGL. The latter can be a
virtual camera for shadow or reflection rendering and similar
render-to-texture effects.

This was SVN commit r4330.
2006-09-14 20:06:21 +00:00
1767fe0304 close #103
Produce a more informative warning when GL_ARB_texture_env_crossbar is
missing, and disable shadows in that case.

This was SVN commit r4329.
2006-09-14 19:15:32 +00:00
99a3241616 This was SVN commit r4328. 2006-09-14 18:48:18 +00:00
faa998b8a9 # more mouse fixes (windowed mode)
note: previous fix (clamp to 0 in screen_to_client) causes spurious
messages if mouse moves outside of the window (which is bad). "client"
coords are allowed to be negative, but "idealized client coords" (which
are defended by assert >= 0 or is_in_window) aren't.
fixes #146

This was SVN commit r4324.
2006-09-11 23:30:23 +00:00
1056788a6a - Added support for translating texture coordinates in fancy water, so it can move in some direction like the non-fancy water can.
- Removed a debug assertion that could occur in windowed mode if you
moved your mouse above or to the left of the window (client x and y >=
0); instead, negative client coordinates are now clipped to 0. (The
coordinates can't actually stay negative because we are casting them to
uints, so that would give very large values.)

This was SVN commit r4323.
2006-09-11 22:35:44 +00:00
c4607a9c34 Added support for translating texture coordinates in fancy water, so it can move in some direction like the non-fancy water can.
This was SVN commit r4322.
2006-09-11 22:33:55 +00:00
b177f2b711 Removed some console spam from playing unit sounds.
This was SVN commit r4321.
2006-09-10 23:51:08 +00:00
aa6ca7d1e8 Modified world intersection so that you can also intersect with the water plane, which is useful for making ships move around as expected when you rightclick a spot on the water.
This was SVN commit r4319.
2006-09-10 20:38:39 +00:00
df1a779d76 # Updates to water rendering (more effects).
This was SVN commit r4318.
2006-09-10 05:31:41 +00:00
222d90727e Updated water shader to support more settings (specular strength and reflection tint).
This was SVN commit r4317.
2006-09-10 05:30:49 +00:00
aa50820d9a #Unit AI: Aggressive, defensive and stand ground stances.
Also split Entity.cpp further, moving the rendering code to
EntityRendering.cpp and the JS interface code to
EntityScriptInterface.cpp. This makes each individual file smaller
(about 1000 lines still!) and lets them be compiled independently.

This was SVN commit r4314.
2006-09-09 00:00:23 +00:00
aceaee324b XML and JavaScript changes for unit stances.
This was SVN commit r4313.
2006-09-08 23:58:57 +00:00