mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-28 05:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,139 Commits 1 Branch 39 Tags
5368271d700d7ff1dbfad4bc600bf7e499264156
Commit Graph

18139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elexis 5368271d70 Fix a resource collision in 6d52a71d4a in the Lions Den and in 7f8adcf8cb/25682da568/0d0bc32736 in the Unknown maps, refs #4902. 
This was SVN commit r20802.
 2018-01-08 17:01:10 +00:00
elexis d448d9313b Fix missing coordinate conversion in e596ef6011 (and rearrange if-statement to be more readable). 
This was SVN commit r20801.
 2018-01-08 16:55:08 +00:00
elexis 2414e4946e Replace TWO_PI with 2 * Math.PI, refs #4933. 
This was SVN commit r20798.
 2018-01-07 20:32:43 +00:00
bb 891870a554 Stop serializing minimap playercolors 
Patch By: temple
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1124
This was SVN commit r20797.
 2018-01-07 20:23:04 +00:00
elexis 4bc8dc9ed4 Remove rmgen Math.round proxy, refs #4933. 
This was SVN commit r20796.
 2018-01-07 20:18:31 +00:00
elexis a554a7c1ed Remove rmgen Math.abs proxy, refs #4933. 
This was SVN commit r20795.
 2018-01-07 19:57:30 +00:00
elexis 92fe7445e4 Remove rmgen Math.floor proxy, refs #4933. 
This was SVN commit r20794.
 2018-01-07 19:45:48 +00:00
elexis 0aa875b3f2 Remove rmgen sqrt proxy, refs #4933. 
This was SVN commit r20793.
 2018-01-07 18:42:22 +00:00
elexis ab1bfb83f7 Remove unneeded rmgen min and max proxies, refs #4933. 
This was SVN commit r20792.
 2018-01-07 18:26:04 +00:00
mimo 67b76e6705 petra: reduce a bit the distance between ccs for defensive ai + some cleanup 
This was SVN commit r20791.
 2018-01-07 17:44:01 +00:00
mimo e50beaedc0 Fix trigger difficulty level (9daa7520ef) for translation 
Discussed with elexis

Trac Tickets: #4931

Differential Revision: https://code.wildfiregames.com/D1207
This was SVN commit r20790.
 2018-01-07 17:37:17 +00:00
elexis a2e93de942 Remove rmgen Math.ceil proxy and unused lerp function from 0e0ed94926. 
This was SVN commit r20789.
 2018-01-07 16:19:24 +00:00
elexis 6b6c6ef8d3 Refactor Alpine Valley mountainrange code, refs 992a8ee0b8, 70e67af87f. 
Describe the algorithm using graph theory vocabulary.
Split code into small functions, making it easier to digest and remove
duplication, refs #4805.
Use a prototype to avoid any possible naming conflicts.
Add helper variables to reduce array lookup nesting.
Remove non-functional unneeded max-distance check, refs c438a1eb82.
Use mapCenter getter, refs #4854.

This was SVN commit r20788.
 2018-01-07 16:02:37 +00:00
elexis 0b1b7d19cf Return an array of Vector2D instead of an array of X coordinates and an array of Z coordinates from distributePointsOnCircle, so that one can iterate over the result, refs #4845. 
Use map center getter for Rivers and the Unknown maps, refs #4854.

This was SVN commit r20787.
 2018-01-07 15:25:53 +00:00
elexis 2d5196cd19 Fix wrong mapSize comparison in efd9b3e212. 
This was SVN commit r20786.
 2018-01-07 14:41:40 +00:00
bb 917056f4e3 Fix few style issues in 8ae67ed15f/9ae7c4d810 
Spotted By: elexis
This was SVN commit r20785.
 2018-01-07 13:44:50 +00:00
vladislavbelov a49a1f3746 Escapes slashes in the report help 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D976
This was SVN commit r20784.
 2018-01-07 10:56:15 +00:00
elexis e1a5a50bdf Display the summary screen as a dialog if it was opened during a running game or replay. 
This makes it consistent (all stacked pages are dialogs) and
the player is kept aware of the game being still active in the
background for the time the page is open.

Differential Revision: https://code.wildfiregames.com/D1058
Patch By: fpre / ffffffff
This was SVN commit r20782.
 2018-01-07 01:12:27 +00:00
Gallaecio 11bcc7c0e7 Solve some issues reported on Transifex, and update translation files 
This was SVN commit r20781.
 2018-01-07 00:10:14 +00:00
elexis ae2e045df5 Delete createShallowsPassage / passageMaker from bc805bd357 and use the unified createPassage function from 0c70fb3036 (9016b8d866, a796800bb1) to achieve the same shallows generation, refs #4805. 
Place shallows at every tributary river rather than leaving out the last
35 percent of the mapsize.
Use vector algebra to do the horizontal/vertical rotation, refs #4845.

This was SVN commit r20780.
 2018-01-06 22:59:56 +00:00
Gallaecio d9d76d450b Fix the Tributes entry in the Value drop-down of the Charts tab of the game summary 
Trac Tickets: #4613

Differential Revision: https://code.wildfiregames.com/D1203
This was SVN commit r20779.
 2018-01-06 21:42:20 +00:00
elexis de4e51c447 Replace the hardcoded keynames of the Introductory Tutorial strings with the sprintf solution from 4055c564e9 / D1184. 
Remove hardcoded default batch training size and GUI row count hint
(which could have become invalidated too easily).

Differential Revision: https://code.wildfiregames.com/D1199
Reviewed By: mimo
This was SVN commit r20778.
 2018-01-06 16:25:45 +00:00
elexis 0350bee2e6 Remove workaround from 4055c564e9 / D1184 and display hotkey strings too if the hotkey is unassigned. 
Differential Revision: https://code.wildfiregames.com/D1200
Reviewed By: mimo
This was SVN commit r20777.
 2018-01-06 16:20:59 +00:00
elexis f352d20e17 Support both DateTime formats of XEP-0082 in the lobby, refs #3156, f2c76cc75d, 6141c5c4fa, f27efac053. 
Patch By: Dunedan
Fixes #4920.
Differential Revision: https://code.wildfiregames.com/D1197
This was SVN commit r20776.
 2018-01-06 16:09:10 +00:00
elexis 015aa4adee Rename getTIPIADBON (The Intended Point In A Direction Based On Height) from 1fd00b5e3f to findLocationInDirectionBasedOnHeight. 
Use vector algebra to simplify it and the according maps, refs #4845.
Remove stepSize parameter as long as the non-interpolated heightmap grid
is tested.

This was SVN commit r20775.
 2018-01-06 15:48:38 +00:00
mimo 4925b8d21a fix 4842b2158b 
This was SVN commit r20774.
 2018-01-05 17:34:21 +00:00
elexis a8e63c72a8 Fix gamesetup when compiled --without-lobby following 61261d14fc / D364. 
Differential Revision: https://code.wildfiregames.com/D1196
Patch By: nwtour
This was SVN commit r20773.
 2018-01-05 16:47:05 +00:00
Stan 2661020b29 Fix a bug with horses variants found by wowgetoffyourcellphone 
Thread:
https://wildfiregames.com/forum/index.php?/topic/23012-committed-horse-animations-actors-update/&page=12
Rotate by 180 degrees every horse that would have otherwise his head
through the roof.

This was SVN commit r20772.
 2018-01-05 14:57:24 +00:00
Stan 73b1c96ed1 New officer helmets, update the current ones. 
Thread here :
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/
Accepted by Lordgood
Fixes #2288

This was SVN commit r20770.
 2018-01-05 04:14:13 +00:00
Stan fef0b8b8c4 New hoplites helmets 
Thread here :
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/
Accepted by Lordgood

This was SVN commit r20769.
 2018-01-05 04:13:26 +00:00
Stan aabd578a43 New Agema helmet 
Thread here :
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/
Accepted by Lordgood, Enrique, Wowgetoffyourcellphone
Fixes #2293

This was SVN commit r20768.
 2018-01-05 04:11:42 +00:00
Stan 1a8d8cb84e New Phrygian cap and mask. 
Thread here :
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/
Accepted by Lordgood

This was SVN commit r20767.
 2018-01-05 04:05:00 +00:00
Stan 0d6afda873 Fix a bug with incorrect geometry. 
This was SVN commit r20766.
 2018-01-05 03:03:55 +00:00
Stan 91fe20f8ee New highcrest version for chalcidean helmet, 
Lower the brow.
Thread
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/&page=4

This was SVN commit r20765.
 2018-01-03 16:54:53 +00:00
Stan 815b3766ae New Seleucus Nikator (Victor) helmet 
Discussion here :
https://wildfiregames.com/forum/index.php?/topic/23049-help-needed-the-next-big-thing-helmets/&page=4
Accepted by Lordgood

This was SVN commit r20764.
 2018-01-03 16:24:30 +00:00
mimo 2dc41277df cleanup 9daa7520ef following bb's comments 
This was SVN commit r20763.
 2018-01-03 15:27:02 +00:00
Stan 549c0ee1b4 Rename some helmets to better reflect what they are. 
Move them  to the new folder.
Update the actors accordingly.

This was SVN commit r20762.
 2018-01-03 15:12:23 +00:00
elexis fc733d0b22 Delete createRamp which is the same as createPassage, refs #4805, f3823847b0, 9016b8d866, a796800bb1. 
Use vector algebra to compute the ramp position, refs #4845.

This was SVN commit r20761.
 2018-01-03 11:46:09 +00:00
mimo 9daa7520ef Allows trigger script with different difficulty levels 
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1189
This was SVN commit r20760.
 2018-01-03 11:21:37 +00:00
elexis cdd96d8ae2 Simplify rmgen distanceOfPointFromLine and checkIfIntersect a lot by using vector algebra, refs #4845, #4805, 53074c7715, 70e67af87f, e596ef6011. 
First createRamp cleanup, f3823847b0.

This was SVN commit r20758.
 2018-01-03 03:27:09 +00:00
Stan 0f2f5aef77 Use variants for boeotian helmets to remove duplication everywhere, 
Change the material to use parallax were possible.
Add an empty normal texture 2x2 to allow other helmets to have theirs.
Use fully inheritance, only repeating frequency and names where needed
as they
are also inherited.

This was SVN commit r20757.
 2018-01-03 00:04:20 +00:00
elexis bc2c9c1939 JS GUI session cleanup. 
Load technologies through the globalscript from D1108 / c90d72deb5
rather than querying the simulation for that.
Same can be done for auras afterwards.

This was SVN commit r20756.
 2018-01-02 21:50:41 +00:00
Stan 56f4e13c9d Fix previous commit (Whiteline in XML) 
Move headband to the new folder, and fix its position on the head
to better fit new heads.

This was SVN commit r20755.
 2018-01-02 18:26:44 +00:00
Stan 4b0ee4dd86 New variant for the kausia cap: 
Discussion here :
https://wildfiregames.com/forum/index.php?/topic/21084-committed-kausia-cap/
Discussion about other units that should get it here :
https://wildfiregames.com/forum/index.php?/topic/23634-task-new-persian-equipment/&tab=comments#comment-345401
Remove a cape frome a unit.

This was SVN commit r20754.
 2018-01-02 18:16:19 +00:00
elexis c0dd4795ca Fix oversight in 83ee8cd62e / D827. 
This was SVN commit r20753.
 2018-01-02 17:49:20 +00:00
elexis efabf76364 Small JS GUI settings simplification using 58b2e2baf4 / D1107, refs D1189. 
This was SVN commit r20752.
 2018-01-02 17:10:04 +00:00
fabio 75eb8a8004 Add 8-bit easteregg music track. 
Music by Omri Lahav.

Coded with oggenc -q -2 (32kbps) using aoTuV Beta6.03 from the wav in
[[SVN:19890]].

Fixes: #4677
Differential Revision: https://code.wildfiregames.com/D1097
This was SVN commit r20751.
 2018-01-02 15:27:06 +00:00
s0600204 f6b5488a24 Move unravelPhases function from structree to globalscripts for use in AI init. 
Reviewed By: mimo
Differential Revision: https://code.wildfiregames.com/D1183
This was SVN commit r20750.
 2018-01-02 06:38:09 +00:00
s0600204 00b05fd9f7 Use phase techs to determine phase order in structure tree. 
(Instead of non-phase techs which is what it was using up to now.)


Reviewed/accepted by: mimo
Changes agreed (but not tested/formally proven) by: elexis

Differential Revision: https://code.wildfiregames.com/D1181
This was SVN commit r20749.
 2018-01-02 06:23:33 +00:00
s0600204 f4bbf9be5f Fix sound inheritance from template_unit_hero.xml 
Patch by: Grugnas
Reviewed by: s0600204
Discussed with: Stan, fatherbushido

Differential Revision: https://code.wildfiregames.com/D747
Refs: #4678

This was SVN commit r20748.
 2018-01-02 05:43:46 +00:00