1
0
forked from mirrors/0ad
Commit Graph

18295 Commits

Author SHA1 Message Date
elexis 034124e8d8 Fix range overlay color after deserialization following 5fbb224dc0 / D555, refs #3915.
Since the component initialization order is the alphabetic filename
order and
since the RangeOverlayRenderer < Player < Selectable, the new file in
that commit introduced the issue.
Similar to 36b315ca32, refs #4632.

UpdateColor function taken from temple's D754

This was SVN commit r20963.
2018-01-22 06:50:35 +00:00
elexis 36fba76a74 Revert unintentional function rename in 40cc3aaa09.
Don't troll OOS-debugging developers with aura ranges rendered in an
invisible color, refs 5fbb224dc0 / D555.

This was SVN commit r20961.
2018-01-22 06:02:52 +00:00
elexis a43c654a98 Only initially focus the chat input in multiplayer gamesetup, so that the Tab hotkeys new in D1027 / D1176 are immediately available in singleplayer.
Also focus the chat after having clicked the Send button.

This was SVN commit r20960.
2018-01-22 05:15:51 +00:00
elexis 36821e0937 Use Tab and Shift+Tab as the default hotkey to switch tabs.
Patch By: fpre / ffffffff
Comments By: bb
Differential Revision: https://code.wildfiregames.com/D1176
Refs #4982

This was SVN commit r20959.
2018-01-22 05:06:52 +00:00
elexis 8aaff7fc62 Implement an auto-scroll setting for GUI lists.
Patch By: fpre / ffffffff
Fixes #4987, refs #4254

This allows the replay menu and lobby to focus the selected element if,
but only if it is expected by the user.
Replaces 3f5648767d which scrolled the selected player into view every
single time a new playerlist was received by the lobby server.

This was SVN commit r20958.
2018-01-22 04:45:27 +00:00
elexis 3d65bfe555 Randomize the river angle on Danubius, refs #4855.
This was SVN commit r20957.
2018-01-22 04:29:30 +00:00
temple 2b501c9fa6 Fix formation animation warning
Differential Revision: https://code.wildfiregames.com/D998
Reviewed by: wraitii
Fixes: #3239

This was SVN commit r20956.
2018-01-22 03:00:41 +00:00
temple 7214cfc991 Add a visibility check to FindNearbyResource and FindNearestDropsite
Differential Revision: https://code.wildfiregames.com/D1161
Reviewed by: s0600204
Comments by: bb
This was SVN commit r20955.
2018-01-22 02:49:57 +00:00
temple 340cda5d57 Use obstruction rather than footprint in dock placement
Differential Revision: https://code.wildfiregames.com/D1163
Reviewed by: wraitii
Comments by: mimo, s0600204
Fixes: #4843

This was SVN commit r20954.
2018-01-22 02:34:46 +00:00
elexis d5af005a00 Expose INVALID_PLAYER to the JS simulation and use it instead of -1 for consistency with the C++ counterpart.
This was SVN commit r20953.
2018-01-22 01:02:29 +00:00
elexis 1315d9beb6 Move domestic animal Cost to the trainable templates new in aec1ff5493 / D1071.
Fix lineendings of recent templates.

Discussed with: bb on irc

This was SVN commit r20952.
2018-01-21 23:40:59 +00:00
elexis 83d3e4f7a4 Fix undefined player color errorspam in Atlas after placing an entity, changing the civ and starting the simulation following 343ec21e75 / D623, refs #4643.
The commit had removed the fallback color as there is no traceable use
case.
Copy the Player color from the old to the new player entity in
ReplacePlayer before the ownership changes occur, so that it is always
initialized before read.

Refs 9329506e0d
Reported By: temple
This was SVN commit r20951.
2018-01-21 23:30:38 +00:00
temple dde855f7d5 Use correct distance for determining nearest dropsite
Use the distance to the nearest point on the dropsite's obstruction
rather than the center of the dropsite.

Differential Revision: https://code.wildfiregames.com/D1160
Reviewed by: wraitii
Comments by: bb, elexis
Fixes: #4592

This was SVN commit r20950.
2018-01-21 21:21:21 +00:00
temple 70290e8a22 Add a tile owner check in territory decay
Differential Revision: https://code.wildfiregames.com/D1225
Reviewed By: mimo
Comment By: elexis
Fixes: #4787
Refs: #4681, #4749

This was SVN commit r20949.
2018-01-21 20:01:12 +00:00
Stan 6458b04f1d Add missing template in a7d20b184e
This was SVN commit r20948.
2018-01-21 19:06:36 +00:00
Stan a7d20b184e Make the zebu trainable in the mauryan corral, as what was asked initally in #1992
Discussed with: Mimo, elexis
Funny Image: Itms

This was SVN commit r20947.
2018-01-21 18:39:38 +00:00
elexis d97542e9c6 Fix missing update to options.json in be06299e28 / D1128.
This was SVN commit r20946.
2018-01-21 17:09:07 +00:00
bb ac7b5ce861 New UI for gamesetup settings
Nuke the more options window
Create 3 tabs containing all options from more options and map options,
giving more space for new options
Rename options => settings in gamesetup

Reviewed By: elexis
Comments By: ffffffff and gentz
Differential Revision: https://code.wildfiregames.com/D1027
This was SVN commit r20945.
2018-01-21 12:35:47 +00:00
Stan 7c338b5755 Add missing icons, and update boudica's
Noticed by: mimo.
This was SVN commit r20944.
2018-01-20 20:03:12 +00:00
elexis df3a64c269 Unify Corsica & Sardinia and Pyrennean Sierra slope and smoothened height computation, refs #4805, 9016b8d866, a796800bb1.
Receive vectors as arguments, refs #4992 and don't introduce a RandomMap
object proxy.

This was SVN commit r20943.
2018-01-20 19:25:00 +00:00
Stan bae4156c3a Fix chamfron for champion ptol cavalry.
Noticed by: Wackyserious
This was SVN commit r20942.
2018-01-20 17:19:29 +00:00
Stan 3725f69e11 New peytrals textures by wackyserious
Reviewed by: Stan
Thread:
https://wildfiregames.com/forum/index.php?/topic/23863-task-improved-horse-and-elephant-peytrals/&tab=comments#comment-346412

This was SVN commit r20941.
2018-01-20 16:45:40 +00:00
elexis 5eead1d77a Fix typo in c5b7ecefa1 reported by Imarok.
This was SVN commit r20940.
2018-01-20 16:40:21 +00:00
mimo 2214f206b7 Garrisoned units are lost after an upgrade towards a non garrison holder
Differential Revision: https://code.wildfiregames.com/D1228
This was SVN commit r20939.
2018-01-20 15:22:02 +00:00
mimo 1bcc70a1cc fix miraged properties in GuiInterface changes from 30f0e80dae
Differential Revision: https://code.wildfiregames.com/D1230
This was SVN commit r20938.
2018-01-20 15:09:42 +00:00
mimo cfda5f8a02 petra: fix builder counters when one builder is created and destroyed in the same ai-turn, fixes #4991
This was SVN commit r20937.
2018-01-20 13:03:33 +00:00
elexis 8cfd8cd845 Use vectors for positions in setHeight in random map scripts.
This was SVN commit r20936.
2018-01-20 05:29:35 +00:00
elexis 899041f107 Pass vectors from paintRiver to the map script, refs #4992.
This was SVN commit r20935.
2018-01-20 04:50:23 +00:00
elexis 46dee69668 Randomize map angle on Guadalquivir River and Latium (refs 903e094f62), fixes #4855, refs
This was SVN commit r20934.
2018-01-20 04:16:48 +00:00
elexis 903e094f62 Randomize map angle on random maps with linear playerposition pattern, refs #4855, #4845.
This was SVN commit r20933.
2018-01-20 02:21:22 +00:00
elexis 5519742e7f Move ExportMap code from global helper to RandomMap object, refs #4804.
Delete WATER_LEVEL_CHANGED global, refs #4964.

This was SVN commit r20932.
2018-01-20 00:41:25 +00:00
Stan 664821a5e0 Add back the capture anim i previously removed from the actor in 097c19a6a0 thanks elexis for making me notice.
This was SVN commit r20931.
2018-01-20 00:20:38 +00:00
Stan 487e29c2ae New pouch for macedonians slingers
Reviewed by : Wowgetoffyourcellphone, Wackyserious
Discussion
:https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/

This was SVN commit r20930.
2018-01-20 00:06:47 +00:00
Stan 097c19a6a0 Add templates for some heroes who already have actors
Discussion here:
https://wildfiregames.com/forum/index.php?/topic/23825-creating-templates-for-heroes/

This was SVN commit r20929.
2018-01-19 23:51:33 +00:00
elexis 28a0b0068d Cleanup smoothing on Pyrenean Sierra, refs a796800bb1.
Remove unnoticeable randomization near the shore and specific texturing
of parts of the passages.

This was SVN commit r20928.
2018-01-19 23:17:21 +00:00
Stan e05135d5e0 New cavalry icons by Wowgetoffyourcellphone for iberians, last was carthaginians.
Reviewed by : Stan

This was SVN commit r20927.
2018-01-19 23:02:58 +00:00
Stan e17ca101ab New cavalry icons by Wowgetoffyourcellphone for Iberians
Reviewed by : Stan

This was SVN commit r20926.
2018-01-19 23:00:49 +00:00
Stan ca4a3d55a4 New cavalry icons by Wowgetoffyourcellphone for gauls
Reviewed by : Stan

This was SVN commit r20925.
2018-01-19 22:49:14 +00:00
Stan 5576d5c78b New cavalry icons by Wowgetoffyourcellphone for brits
Reviewed by : Stan

This was SVN commit r20924.
2018-01-19 22:37:36 +00:00
Stan fd7100ddd1 New cavalry icons by Wowgetoffyourcellphone for spartiates
Reviewed by : Stan

This was SVN commit r20923.
2018-01-19 22:33:32 +00:00
Stan e5aa7285a0 Move unused icons files to the art source
This was SVN commit r20922.
2018-01-19 22:29:33 +00:00
Stan abb8aaed16 New cavalry icons by Wowgetoffyourcellphone for seleucids
Reviewed by : Stan

This was SVN commit r20921.
2018-01-19 22:17:00 +00:00
Stan 49dcd1c886 New cavalry icons by Wowgetoffyourcellphone for ptolemies
Reviewed by : Stan

This was SVN commit r20920.
2018-01-19 22:02:07 +00:00
Stan 5786bc03f4 New cavalry icons by Wowgetoffyourcellphone for persians
Reviewed by : Stan

This was SVN commit r20919.
2018-01-19 21:54:06 +00:00
Stan 5323baaa50 New cavalry icons by Wowgetoffyourcellphone for mauryans
Reviewed by : Stan

This was SVN commit r20918.
2018-01-19 21:52:36 +00:00
Stan 39fa3f5ecd New cavalry icons by Wowgetoffyourcellphone for macedonians
Reviewed by : Stan

This was SVN commit r20917.
2018-01-19 21:47:19 +00:00
Stan 616f33d34c New cavalry icons by Wowgetoffyourcellphone for romans
Reviewed by : Stan

This was SVN commit r20916.
2018-01-19 21:42:42 +00:00
elexis 4cd1161c2d Allow calling fractionToTiles and scaleByMapSize before RandomMap initialization, used by e084885ce9 already.
This was SVN commit r20915.
2018-01-19 21:24:04 +00:00
elexis e084885ce9 Pyrenean Sierra sigmoid-based Mountainrange cleanup, refs a796800bb1.
Use vector algebra and remove duplication, refs #4845, #4805.
Unify the first createTerrain call with InitMap.
Move mountain constants and the information which height receives which
texture to the top.

This was SVN commit r20914.
2018-01-19 20:24:36 +00:00
elexis 3361ff0997 Fix variable naming in Botswanan Haven in c5b7ecefa1 reported by mimo.
This was SVN commit r20913.
2018-01-19 19:11:53 +00:00