dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 21:34:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
19238 commits 1 branch 39 tags 194 MiB
Commit graph

19238 commits

This branch
This branch
All branches
Author SHA1 Message Date
vladislavbelov
2d56e62e11 Refactor build information getters and remove the useless code. 
Reviewed By: elexis, Stan
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1348
This was SVN commit r22035.
 2019-01-06 14:32:54 +00:00
vladislavbelov
276050bcad Cleanup Camera code for projections. 
Reviewd By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1514
This was SVN commit r22033.
 2019-01-05 22:40:56 +00:00
wraitii
24812b06d7 Revert b56f7f39d4 as it triggers an assertion failure. 
This was SVN commit r22032.
 2019-01-05 22:38:00 +00:00
Stan
a1c3629874 Templates for domestic horse and camel 
Add two templates for mapmakers that don't want horses and camels
roaming around. Will be useful for scenarios.
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D1524
This was SVN commit r22031.
 2019-01-05 21:53:15 +00:00
bb
7b50eac868 Fix missing assignment from a1ddf6114a 
Patch By: OptimusShepard
Reported By: OptimusShepard
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1656
This was SVN commit r22030.
 2019-01-05 20:46:42 +00:00
wraitii
b56f7f39d4 Change internals of EntityMap to use an std::vector 
This generally makes this code cleaner and easier to maintain, while
also being more modern and fully tested.

Looked at by: leper
Differential Revision: https://code.wildfiregames.com/D8
This was SVN commit r22029.
 2019-01-05 18:19:59 +00:00
FeXoR
f21d79640c Remove excess argument from shift call 
Fixes #5345

Author: FeXoR
Reviewed by: elexis, smiley
Differential Revision: https://code.wildfiregames.com/D1675
This was SVN commit r22028.
 2019-01-05 16:54:37 +00:00
wraitii
af39d45973 Add tests for the Entitymap helper. 
In preparation for D8.

Differential Revision: https://code.wildfiregames.com/D1722
This was SVN commit r22027.
 2019-01-05 16:37:09 +00:00
Stan
241bdba34a Remove unnecessary gaia from other/ structures 
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D1728
This was SVN commit r22026.
 2019-01-05 15:38:25 +00:00
Stan
bd189de430 Move the old fox texture to the old public mod in the animal and do the same for the boar 
This was SVN commit r22025.
 2019-01-05 14:38:27 +00:00
Stan
155ffb24bb Move the old boar texture to the old public folder. 
This was SVN commit r22024.
 2019-01-05 14:34:33 +00:00
wraitii
a16e7c0a56 Always leave/reenter the top-most FSM state when SetNextState is called with the current FSM state. 
When SetNextState is called with the current state, it will leave and
re-enter so that any relevant cleanup will get called and things work as
expected.
It will prevent possibly awkward code issues in UnitAI, which already
called SetNextStateAlwaysEntering in a number of places to work around
them.

This should most likely have been the default behaviour in the first
place.

Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D1488
This was SVN commit r22023.
 2019-01-05 09:01:51 +00:00
Itms
2c167153e9 Upgrade premake5 from alpha12 to alpha13, refs #3729. 
Fixes an issue on macOS Mojave that was patched in fa1c281e79.

The list of changes can be found under
build/premake/premake5/CHANGES.txt.

This was SVN commit r22021.
 2019-01-04 21:20:45 +00:00
bb
060eb35bb8 Improve fishing net description 
Patch By: Gallaecio
Proposed By: Itms
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1549
This was SVN commit r22020.
 2019-01-04 20:51:41 +00:00
bb
b3487dfb60 Handle entity renames in regicide 
This allows heroes to be upgraded

Patch By: smiley
Comments By: elexis
Differential Revision: https://code.wildfiregames.com/D1694
This was SVN commit r22019.
 2019-01-04 20:09:28 +00:00
Stan
6ef0c2b4b3 Properly reset rally points on ownership changes. 
Fixes #5352
Reviewed by: @wraitii
Comments by: @Angen, @elexis
Differential Revision: https://code.wildfiregames.com/D1681
This was SVN commit r22016.
 2019-01-03 19:32:45 +00:00
Imarok
7cc45c40a5 Clarify the purpose of the Replay button in the summary 
Reviewed by: ffffffff, elexis
Differential Revision: https://code.wildfiregames.com/D1485
This was SVN commit r22015.
 2019-01-03 13:22:27 +00:00
Stan
24f0cc7695 Fix inconsistencies between specific name and generic name 
Patch by: Nescio
Differential Revision: https://code.wildfiregames.com/D1523
This was SVN commit r22014.
 2019-01-03 11:03:28 +00:00
Imarok
da62d0b149 [NetServer] Split OnInGame function 
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1516
This was SVN commit r22012.
 2019-01-03 00:15:31 +00:00
Itms
38da2f88bc Rename the Viking longboat into longship, and fix the form of the specific name of the Roman bireme. 
Based on patch by: Phormio
Differential Revision: https://code.wildfiregames.com/D507
This was SVN commit r22011.
 2019-01-02 23:34:51 +00:00
vladislavbelov
b2669131b5 Add Coala Bear for the license header check. 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D404
This was SVN commit r22010.
 2019-01-02 23:12:51 +00:00
Stan
8b05f551f8 SoundGroup cleanup. 
Reviewed by: @vladislavbelov @wraitii
Differential Revision: https://code.wildfiregames.com/D1270
This was SVN commit r22009.
 2019-01-02 22:31:46 +00:00
Stan
aa40c57d85 Fix mesh leftovers. There were a few logs under the ground. 
Add a projectile prop, and a garrisoned prop if someone wants to use it
for garrisoning.
Set the EOL to Native

Reported by: @vladislavbelov
This was SVN commit r22008.
 2019-01-02 21:06:06 +00:00
wraitii
38c096896b Disable back-face culling when rendering the Sides of the map, preventing a graphical artifact at the edge of water maps. 
By rendering sides even when they are back-facing, the water shader is
on top of a mesh instead of emptiness and this solves an old
"edge-of-map" graphical issue.

Taken out from D359 with vlad's agreement. See screenshots there for
more information on the exact issue.

This was SVN commit r22007.
 2019-01-02 15:32:19 +00:00
wraitii
9903fd8a6c Clean up and speed up the water manager distance computations 
The water manager computations for "fancy water effects" have always
been quite slow. I've updated one of the functions to be much faster,
and the other doesn't need to be called (apparently, since I removed
coastal foam, which tbh I don't remember doing).

This should all be redone entirely to be honest, as it's generally
terrible, but in the short-term™ this makes this function almost usable
in real-time.

Differential Revision: https://code.wildfiregames.com/D78
This was SVN commit r22006.
 2019-01-02 15:23:02 +00:00
Itms
807468482a Correct Mauryans into Mauryas. 
The name of the faction is the dynasty name "Maurya". The plural should
be "Maurya" as well, but "Mauryas" is commonly accepted and less likely
to confuse people. On the other hand, "Mauryan" is the adjective, and
cannot get a plural mark in English.
All instances of "Mauryans" were removed, including in file names and
paths.

Patch By: Nescio
Differential Revision: https://code.wildfiregames.com/D1342
This was SVN commit r22005.
 2019-01-02 14:56:31 +00:00
vladislavbelov
24a523504a Clean up and fix height of water vertex shader. 
Reviewed By: wraitii
Tested By: Stan, aeonios
Differential Revision: https://code.wildfiregames.com/D1402
This was SVN commit r22004.
 2019-01-02 14:53:42 +00:00
wraitii
19f600cfa2 Add "mul_round" op to template parsing to support multiplying-then-rounding. 
This allows using arbitrary 'mul' values with Integer types, instead of
having to switch them to Decimal types.
The ParamNode is not aware of validation (thus types) so a better
solution is incredibly non-trivial.

Differential Revision: https://code.wildfiregames.com/D268
This was SVN commit r22003.
 2019-01-02 14:46:17 +00:00
Stan
d91702a16b Fix missing refs in sound files. 
Reported by: A script and Fork AD
Path by: Fork AD
Differential Revision: https://code.wildfiregames.com/D1725
This was SVN commit r22001.
 2019-01-01 20:26:40 +00:00
Stan
85cc5776f3 Remove a useless file introduced in 9a4fcd55a8 
Reexport it using the 0AD Skeleton Generator:
https://github.com/StanleySweet/0AD-Skeleton-Generator
Reported by: Angen
This was SVN commit r22000.
 2019-01-01 18:49:15 +00:00
Stan
8835a11ec7 Add a donkey fauna template, to be able to place it in Atlas 
- Use the rotary mill icon (copy it)
- Fix the walking speed.
- Add a material.

This was SVN commit r21999.
 2019-01-01 16:09:39 +00:00
wraitii
9536f0a5cc Do not actually Kill in debug_break() in non-debug binaries 
Revelead by the A23 crash when hosting a game in the lobby. We have a
debug_break() call that calls "kill" with SIGTRAP, which generally
doesn't get handled correctly in release versions, particularly on OSX.

Differential Revision: https://code.wildfiregames.com/D1499
This was SVN commit r21998.
 2019-01-01 16:06:20 +00:00
wackyserious
429dfac82f New Texture: Ptolemaic Royal Agema and Royal Companion 
Thread:
https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/&do=findComment&comment=350382

Reviewed by Stanislas69, Wowgetoffyourcellhpone and Prodigal Son

This was SVN commit r21997.
 2019-01-01 00:31:45 +00:00
wackyserious
7ec4978eb5 Actor file cleanup: celt/cavalry_sworsman_e_r.xml 
Reported and reviewed by Stanislas69

This was SVN commit r21996.
 2018-12-31 16:54:18 +00:00
wackyserious
6d88146d87 New Texture: Celtic Elite Units 
Thread:
https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/&do=findComment&comment=366615

Reviewed by Lordgood and Genava55

This was SVN commit r21995.
 2018-12-31 14:18:07 +00:00
wackyserious
b275380bec New Texture: Hellenistic Military Settlers 
Thread:
https://wildfiregames.com/forum/index.php?/topic/22184-task-hellenic-unit-textures/&do=findComment&comment=344057

Reviewed by Stanislas69 and the forum community.

This was SVN commit r21993.
 2018-12-31 01:40:43 +00:00
Stan
a180a47e9e manual/intro.txt corrections 
Patch by: @Nescio
Differential Revision: ​https://code.wildfiregames.com/D1719
This was SVN commit r21992.
 2018-12-30 16:00:13 +00:00
wackyserious
892154db2f Celtic Unit Texture Update 
Thread:
https://wildfiregames.com/forum/index.php?/topic/23002-task-celtic-unit-textures/

Reviewed by Stanislas69 and other community members

-Rework on the previous textures from Delenda Est
-New female textures
-New cape textures

This was SVN commit r21991.
 2018-12-30 07:58:58 +00:00
Stan
41267c9f96 Improve the description of the Teacher aura 
Patch by: @Gallaecio
Reported by: GunChleoc
Accepteby by: @bb
Differential Revision: https://code.wildfiregames.com/D1580
This was SVN commit r21990.
 2018-12-29 21:24:34 +00:00
Stan
d56ef7b4b3 Reword the description of the Temple at Naqa aura 
Patch by: @Gallaecio
Reported by: Zephyros256 and GunChleoc
Accepted by: bb
Differential Revision: https://code.wildfiregames.com/D1533
This was SVN commit r21989.
 2018-12-29 18:28:50 +00:00
Stan
7e67fcf9de BackSlash → Backslash 
Patch by: @Gallaecio
Reported by: pilino1234  on Transifex.
Differential Revision: https://code.wildfiregames.com/D1529
This was SVN commit r21988.
 2018-12-29 18:26:41 +00:00
Stan
dcbec6a895 Fix a typo cit-states → city-states 
Patch by: @Gallaecio
Reported by: xtother90 on Transifex.
Differential Revision: https://code.wildfiregames.com/D1536
This was SVN commit r21987.
 2018-12-29 18:20:34 +00:00
Stan
9442c927fc Fix imperative of choose 
Differential Revision: https://code.wildfiregames.com/D1528
This was SVN commit r21986.
 2018-12-29 18:15:09 +00:00
Stan
25e71d9235 Split a sentence 
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​​https://code.wildfiregames.com/D1539
This was SVN commit r21985.
 2018-12-29 17:56:45 +00:00
Alexandermb
8ea29bd710 Corinthian Helmet Update: 
Thread:
https://wildfiregames.com/forum/index.php?/topic/24129-task-hellenic-helmet-part-i/&page=3

Reviewed by Stanislas69

This was SVN commit r21984.
 2018-12-29 17:17:02 +00:00
Stan
e9520f8fce barracks → Barracks 
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​https://code.wildfiregames.com/D1536
This was SVN commit r21983.
 2018-12-29 16:43:56 +00:00
Stan
7df4a60719 constructed → ready (a field) 
Patch by: @Gallaecio
Reported by: kingu on Transifex.
Differential Revision: ​​​​​https://code.wildfiregames.com/D1534
This was SVN commit r21982.
 2018-12-29 16:21:20 +00:00
Stan
dba5a59f81 reaffect → reassign 
Patch by: @Gallaecio
Reported by: GunChleoc on Transifex
Differential Revision: ​​​​​https://code.wildfiregames.com/D1526
This was SVN commit r21981.
 2018-12-29 16:10:06 +00:00
Stan
88b4d0da66 multi-coloured → multi-colored 
Reported by: pilino1234 on Transifex
Patch by: @Gallaecio
Differential Revision: ​​​​​https://code.wildfiregames.com/D1553
This was SVN commit r21980.
 2018-12-29 15:34:52 +00:00
Stan
43be7823b8 north-west africa → Northwest Africa 
Patch by: @Gallaecio
Reported by: Shamann at Transifex.
Differential Revision: https://code.wildfiregames.com/D1612
This was SVN commit r21979.
 2018-12-29 15:19:11 +00:00