phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
19,368 Commits 12 Branches 28 Tags 13 GiB
fd719833ab
Commit Graph

19368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandermb
06e01ef944 Rome Testudo & Anti-Cavalry formations animations: 
Reviewed by Stan

This was SVN commit r22081.
 2019-02-06 14:57:43 +00:00
Alexandermb
6ba5307655 Fix a typo in last commit 
This was SVN commit r22080.
 2019-02-05 19:18:40 +00:00
Alexandermb
c60b20a17a Remove old naming schema of Celtic helmets. 
This was SVN commit r22079.
 2019-02-05 19:09:04 +00:00
Alexandermb
cdf7d0fc8c Celtic helmets/celt_alesia_base_01.xml 
Thread:
https://wildfiregames.com/forum/index.php?/topic/24465-committed-celtic-unit-helmets/&page=5

Fix to inconsistencies in celtic helmets pointed by user Genava55

This was SVN commit r22078.
 2019-02-05 19:05:19 +00:00
Stan
700baef3b4 Health.js cleanup. Fixes Vulkan complaints 
- Var → let
- Simplify some lines
- add break to

Reviewed by: @elexis
Differential Revision: https://code.wildfiregames.com/D1770
This was SVN commit r22075.
 2019-01-31 13:34:13 +00:00
Imarok
111f850927 Don't let the duplicateplayernames setting break lobbied games (0fd8aa2a77) 
Looked at by: elexis
Differential Revision: https://code.wildfiregames.com/D1748
This was SVN commit r22072.
 2019-01-28 12:09:42 +00:00
Stan
040b367bc4 Fix wallsets throwing annoying errors when loaded in Atlas. 
Refs: b05879e151, 490182ddd0, #786

This was SVN commit r22070.
 2019-01-26 11:10:27 +00:00
Stan
5453adf7dd Improved pig animations and textures. 
Thread:
https://wildfiregames.com/forum/index.php?/topic/21005-committed-pig/

This was SVN commit r22067.
 2019-01-24 22:35:36 +00:00
vladislavbelov
ac1a56e0cc Fix cell text wrapping inside COList. 
Patch By: gentz
Tested By: vladislavbelov
Commented By: elexis
Differential Revision: https://code.wildfiregames.com/D1717
This was SVN commit r22066.
 2019-01-24 20:00:31 +00:00
Stan
86cfe554b4 Celtic structures' specific names update 
Thread:
https://wildfiregames.com/forum/index.php?/topic/25268-specific-name-review-structures/&page=2&tab=comments#comment-367917
Patch by: @Nescio
Reviewed by: @Stan, @Genava55
Differential Revision: https://code.wildfiregames.com/D1757
This was SVN commit r22065.
 2019-01-23 22:46:57 +00:00
Stan
9229ed6c42 Fix a little bug with the boar, remove the old files. 
This was SVN commit r22064.
 2019-01-21 22:05:04 +00:00
Alexandermb
74be5f03c8 Hele Phrygian Helmet commit 
Updated sele_hero_seleucus_nikator helmet texture.

Thread:
https://wildfiregames.com/forum/index.php?/topic/25179-task-phrygian-helmet/

Reviewed by Stan

This was SVN commit r22062.
 2019-01-19 20:39:24 +00:00
Stan
0d00866c8f Merge entity templates, removing two templates with non descriptive names. 
Patch by: @Nescio
Discussed with: @elexis

Differential Revision: https://code.wildfiregames.com/D1734
This was SVN commit r22061.
 2019-01-19 12:47:39 +00:00
Stan
14810ca5bf manual/intro.txt corrections 
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D1744
This was SVN commit r22060.
 2019-01-19 12:43:43 +00:00
wraitii
8bab09d37c Fix UnitAI infinite loop following a16e7c0a56 
As reported by Angen and Gurken Khan on the forums, there is a crash
following a16e7c0a56 caused by an infinite loop in UnitAI. The reason is
that IDLE.enter can order us to attack, which can fail, switching us
right away back to idle.

FinishOrder's behaviour allows us to have IDLE as a default state and
lets us not lose a turn when becoming idle, so to keep this behaviour
explicitely check that we are not already in IDLE before switching
states.

Reported by: Angen, Gurken Khan
Commented by: elexis, Itms
Differential Revision: https://code.wildfiregames.com/D1743
This was SVN commit r22059.
 2019-01-19 07:44:40 +00:00
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
Imarok
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
Stan
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
Itms
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
vladislavbelov
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
vladislavbelov
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
Stan
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
s0600204
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
s0600204
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
Stan
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
Stan
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
vladislavbelov
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
vladislavbelov
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
vladislavbelov
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
wraitii
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
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