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
Samuel Keiffer
eb8c640d1b
Merge branch 'sam/biped-weapon-fix' into 'master'
...
Fix weapon assignment loadout issues
See merge request veloren/veloren!1546
2020-11-24 04:48:35 +00:00
Sam
17656c990d
Changed default main and secondary tool from Some(empty) to None.
2020-11-23 21:54:12 -06:00
Samuel Keiffer
7774599a19
Merge branch 'sam/rt-loadout-fix' into 'master'
...
Fixes loadout for RT NPCs
See merge request veloren/veloren!1545
2020-11-24 01:34:18 +00:00
Sam
0abe02ca13
Restructures loadout builder function to better support weapons being passed in.
2020-11-23 18:22:24 -06:00
Joshua Barretto
c1fc9e08f1
Merge branch 'christof/cave_in_maps' into 'master'
...
Show cave entries in the map
See merge request veloren/veloren!1540
2020-11-23 23:42:00 +00:00
Christof Petig
4563cb40ce
use iter once.chain(once).flatten trick to deduplicate SiteInfo generation
2020-11-23 23:28:21 +01:00
Christof Petig
49d7c40bec
Remove the last remnants of the site circle and cave map drawing code
2020-11-23 19:54:56 +01:00
Christof Petig
11f9d71fde
fix clippy: One argument is no longer needed
2020-11-23 19:17:19 +01:00
Christof Petig
813f63a1e5
remove cave lines from the map, also remove remnants of the colored site circles
2020-11-23 19:07:11 +01:00
Christof Petig
921022638c
Display names for caves (identical on both ends)
2020-11-23 19:05:43 +01:00
Christof Petig
a3db20c9d6
Show caves in map
2020-11-23 19:05:17 +01:00
Joshua Barretto
d52b595240
Merge branch 'zesterer/worldsim' into 'master'
...
Rtsim, HDR rendering, various worldgen improvements, map improvements
See merge request veloren/veloren!1533
2020-11-23 16:59:31 +00:00
Joshua Barretto
4e8cce3dc8
Merge branch 'zesterer/fix-entity-despawning' into 'master'
...
Allow entities to despawn without a home chunk
See merge request veloren/veloren!1544
2020-11-23 16:14:13 +00:00
Joshua Barretto
26fd40c0e3
Fmt, make clippy happy
2020-11-23 15:39:03 +00:00
