Commit Graph

6426 Commits

Author SHA1 Message Date
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Marcel
8e248027c9 Merge branch 'sam/leap-fix' into 'master'
Fixes leap for repeater ranged

See merge request veloren/veloren!1563
2020-11-27 13:51:00 +00:00
Marcel
16c5f467fe Merge branch 'xMAC94x/experimental_netfix' into 'master'
I would except this to be implcitly done by the `drop` though it doesn't hurt...

See merge request veloren/veloren!1564
2020-11-27 11:57:54 +00:00
Marcel Märtens
7a7c1f6f50 I would except this to be implcitly done by the drop though it doesn't hurt here, as this channel is dropped anyway a line later.
But i have the feeling that maybe something with the channel is wrong which leads to this behavior (or maybe did i made a copy somewhere, though i dobt this).
Again, not sure if this is a fix, but i think it doesn't hurt
2020-11-27 10:47:01 +01:00
Sam
332a636647 You can now leap in directions other than forward with repeater ranged again. 2020-11-26 18:23:15 -06:00
Marcel
ccfda1b9e6 Merge branch 'update-ru-translation' into 'master'
Updates ru_RU translation

See merge request veloren/veloren!1562
2020-11-27 00:02:22 +00:00
Marcel
54cc158dea Merge branch 'treeco/fixes' into 'master'
Various tiny fixes

See merge request veloren/veloren!1561
2020-11-26 23:34:40 +00:00
Snowram
b316e9aa7c Updates ru_RU translation 2020-11-26 22:59:39 +01:00
Treeco
ca2e4080c0 Various tiny fixes:
Text over lootbags no longer scales with distance due to performance

Fixed meshing panic

Fixed ambiant lighting default
2020-11-26 21:46:41 +00:00
Marcel
19eee6dad3 Merge branch 'sam/combat-tweaks' into 'master'
Combat tweaks

See merge request veloren/veloren!1559
2020-11-26 09:31:38 +00:00
Sam
6a6260daa1 Weapon combat fixes:
- Modified energy and speed scaling of sword, axe, and hammer combo melees.
 - Nerfed bow basic attack knockback. Buffed bow damage and energy regen.
 - Corrected xp values for theropods. Removed unnecessary function for xp increase per level.
 - Guards no longer flee at low health.
 - Buffed sword spin.
 - Nerfed axe spin and sword dash moderately.
 - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.
2020-11-26 09:15:45 +01:00
Joshua Barretto
00175e866b Merge branch 'zesterer/fixes' into 'master'
Parallelised agent code for some sweet performance gains

See merge request veloren/veloren!1558
2020-11-25 23:32:15 +00:00
Marcel
42201e6a2a Merge branch 'xMAC94x/login_quickfix' into 'master'
Drop is run only AFTER each statement.

See merge request veloren/veloren!1557
2020-11-25 23:01:23 +00:00
Joshua Barretto
867ca911e5 Parallelised agent code for some sweet performance gains 2020-11-25 22:47:16 +00:00
Marcel Märtens
1b18b43fa7 Drop is run only AFTER each statement.
And the guard generated here in the if let Some() will live through the WHOLE statement, which is definitly critical.
The fix is quite easy. We just move it out in a seperate line.
There are still some participants where the dropping will fail, and followup disconnects will NOT get triggered and be queued up till ethernity, but at least we are not blocking new logins
2020-11-25 22:10:10 +01:00
Tim Süberkrüb
49e892b948 Make VOXYGEN_LOGS override settings
This is needed to support package managers that enforce
strict application confinement (e.g. snap).
2020-11-25 20:36:41 +01:00
Marcel
103c2302b0 Merge branch 'azymohliad/add-ukrainian' into 'master'
Added Ukrainian translation

See merge request veloren/veloren!1555
2020-11-25 17:21:32 +00:00
Andrii Zymohliad
733a471090 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Joshua Barretto
1aa9f44c20 Merge branch 'pfau/massive_fixes' into 'master'
Pfau/massive fixes

See merge request veloren/veloren!1556
2020-11-25 16:53:48 +00:00
Monty Marz
e7d27a2c21 fmt
cleanup
2020-11-25 16:53:48 +00:00
Forest Anderson
e8ec4716a3 Merge branch 'yusdacra/update-tr-translation' into 'master'
Update Turkish translation

See merge request veloren/veloren!1554
2020-11-25 13:58:21 +00:00
Yusuf Bera Ertan
3c887315ae
update Turkish translations 2020-11-25 15:46:56 +03:00
Marcel
5e64dcce02 Merge branch 'yusdacra/fix-improve-nix-build' into 'master'
Fix and improve Nix build

See merge request veloren/veloren!1548
2020-11-25 11:14:57 +00:00
Marcel
c64f6e7385 Merge branch 'imbris/fix-drag' into 'master'
Re-fix dragging and fix compilation of the server with the worldgen feature off

Closes #588

See merge request veloren/veloren!1550
2020-11-25 08:58:38 +00:00
Marcel
6ac7495bad Merge branch 'DaforLynx/two-new-songs' into 'master'
Two new music tracks and some edits to soundtrack.ron

See merge request veloren/veloren!1549
2020-11-25 08:25:40 +00:00
DaforLynx
6783e13125 Added two new songs along with edits to the .ron
comma
2020-11-25 08:25:40 +00:00
Imbris
a545d099a2 Restore fix for dragging on windows platforms 2020-11-25 00:29:28 -05:00
Imbris
c0a8422a43 Fix turning off worldgen feature 2020-11-24 23:55:44 -05:00
Marcel
d1a9264a99 Merge branch 'angryanimals' into 'master'
animal attacks

See merge request veloren/veloren!1542
2020-11-25 01:33:20 +00:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
Sam
8ab2d2524a Changed default main and secondary tool from Some(empty) to None.
weapon fixes
2020-11-24 17:49:04 -06:00
jiminycrick
aad9734055 Agent tactic refactoring
Lower theropods spawns

clippy, changelog

review response
2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work
balance

Lavadrake AI tweaks

feedback tweaks
2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
a1aa3efd29 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
ee03304a3a Fix charged melee swing 2020-11-24 17:48:47 -06:00
jiminycrick
6b534729be Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
c07d8df58b assigning weapons, building animations
ability mapping
2020-11-24 17:48:43 -06:00
jiminycrick
793d6095b3 Maneater AI
Rebase fixes and maneater AI
2020-11-24 17:48:38 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai.
initial wolf dash testing

tool.rs

Wolf attack AI
2020-11-24 17:48:20 -06:00
Yusuf Bera Ertan
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
Joshua Barretto
24e5e714b9 Merge branch 'zesterer/worldsim' into 'master'
Fixed bit-twiddling colour bug

See merge request veloren/veloren!1547
2020-11-24 19:54:39 +00:00
Joshua Barretto
46dc49bc0a Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00