1
0
forked from 0ad/0ad
Commit Graph

19553 Commits

Author SHA1 Message Date
Alexandermb
3e66aa093b Resize celtic/hellenic helmet textures from 512 to 256.
Tweaks to some celtic helmets actors.
Invert battersea shield Mesh for proper AO as mentioned by Wow

Approved by Stan

This was SVN commit r22058.
2019-01-18 18:41:35 +00:00
79a41098c3 Update AI difficulty level description.
Reviewed by: Stan, Imarok
Differential Revision: https://code.wildfiregames.com/D1749
This was SVN commit r22056.
2019-01-17 23:02:11 +00:00
2b3c829e74 Update Kushite stable, range, workshop, and elephant stable's specific names.
Patch by: @Nescio
Names by: @Sundiata
Differential Revision: https://code.wildfiregames.com/D1750
This was SVN commit r22055.
2019-01-15 20:35:49 +00:00
db5d4bb5f1 SpiderMonkey-related changes in preparation for the upgrade to SpiderMonkey 45, refs #4893.
- Remove JSVAL_ZERO and JSVAL_NULL
https://bugzilla.mozilla.org/show_bug.cgi?id=1177825
- Remove *_TO_JSVAL https://bugzilla.mozilla.org/show_bug.cgi?id=1177892
- Drop support for parent object in the deserializer
https://bugzilla.mozilla.org/show_bug.cgi?id=1136345,
https://bugzilla.mozilla.org/show_bug.cgi?id=805052
- Correctly use boolean values in JS::RuntimeOptionsRef
- Use JS_FN instead of JS_FS: in future versions, JS_FS is not public
because it isn't supposed to be used in JSAPI code
- Allow to select flags for global objects, and correctly mark progress
bars in the loading screen as not readonly+permanent
- Remove empty JSI_props in IGUIObject

Reviewed By: wraitii, elexis
Differential Revision: https://code.wildfiregames.com/D1716
This was SVN commit r22052.
2019-01-13 16:37:41 +00:00
651cf8b364 Split CColor from Shapes.
Reviewed By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1515
This was SVN commit r22051.
2019-01-13 15:38:41 +00:00
43a291a071 Simple refactoring of Singleton. Make it non-copyable.
Reviewed By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1564
This was SVN commit r22050.
2019-01-13 15:11:40 +00:00
43758bcb92 Fix warnings in vs2015 when building tests.
Reviewed by: @Angen, @Itms
Differential Revision: https://code.wildfiregames.com/D1678
This was SVN commit r22048.
2019-01-12 16:23:47 +00:00
c7485492c5 Use setStringTags in credits.js
As pointed out by elexis in D1695:
> "font=" strings are superseded by setStringTags()

So while we're doing work in that file, let's fix that.

This was SVN commit r22046.
2019-01-10 16:49:36 +00:00
3e1361e5a5 Show translations of the labels of the tab-buttons in the credits gui page.
Mistake introduced in bcf2c75513, made apparent in 19a218cd48, and not
caught in 4223fad060.

Reported by: thekolian1996 (forums)
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1695
This was SVN commit r22045.
2019-01-10 16:20:29 +00:00
fef1b4122c New historically accurate library icon. Move the old one to old public.
Forum Thread:
https://wildfiregames.com/forum/index.php?/topic/25203-library-icon-wrong/
Portrait made by: Me, @sundiata, @vladislavbelov, Anaxandridas ho
Skandiates

This was SVN commit r22043.
2019-01-08 00:06:00 +00:00
74a26820f2 Add a confirmation message when packaging ends.
Reviewed by: elexis
Differential Revision: https://code.wildfiregames.com/D1585
This was SVN commit r22042.
2019-01-07 23:57:18 +00:00
9376609ee8 Remove hardcoded SkyBox sizes and use the infinity sky. No we render
the skybox at the current camera location, so that the skybox appears
indefinitely far away. Refs #3458.

Reviewed By: wraitii
Tested By: elexis, Stan
Differential Revision: https://code.wildfiregames.com/D1683
This was SVN commit r22039.
2019-01-06 21:55:30 +00:00
14a7147540 Removes active values from UserReport, they are not hardware statistics.
Reviewed By: elexis
Differential Revision: https://code.wildfiregames.com/D1621
This was SVN commit r22038.
2019-01-06 21:18:55 +00:00
d5668cfb99 Add an error message for crashes without required UV sets.
Reviewed By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D433
This was SVN commit r22037.
2019-01-06 21:04:01 +00:00
c1027f478c Test we can destroy INVALID_ENTITY
This is part of the spec and wasn't unit-tested for.

Differential Revision: https://code.wildfiregames.com/D1735
This was SVN commit r22036.
2019-01-06 16:32:50 +00:00
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
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
24812b06d7 Revert b56f7f39d4 as it triggers an assertion failure.
This was SVN commit r22032.
2019-01-05 22:38:00 +00:00
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
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
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
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
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
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
155ffb24bb Move the old boar texture to the old public folder.
This was SVN commit r22024.
2019-01-05 14:34:33 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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