e5e255cbd3
move anim code from voxygen/src/anim to voxygen/anim
2020-12-01 20:20:01 +01:00
e06dd3fe7e
Merge branch 'yusdacra/fix-nix-build-tag-bug' into 'master'
...
Improve Nix build files (yet again!)
See merge request veloren/veloren!1571
2020-11-30 21:50:15 +00:00
fe46f8d901
Merge branch 'xvar/fix-docker-shutdown-signal' into 'master'
...
Fixed graceful shutdown countdown for servers running in Docker
See merge request veloren/veloren!1580
2020-11-30 21:42:08 +00:00
eb730f6904
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff
2020-12-01 00:15:18 +03:00
e2fccd9694
Merge branch 'ubruntu/fix-home-fall-damage' into 'master'
...
Stop /home from causing fall damage
Closes #843
See merge request veloren/veloren!1552
2020-11-30 21:13:06 +00:00
1b27adaffd
Stop /home from causing fall damage
2020-11-30 21:13:06 +00:00
9e5c31a27e
Merge branch 'xvar/tooltip-fade-fix' into 'master'
...
Changed tooltip fade time from 100 to 0ms to fix tooltip glitching
See merge request veloren/veloren!1567
2020-11-30 21:13:05 +00:00
a189163910
Merge branch 'azymohliad/sun-movement-direction' into 'master'
...
Fix Sun and Moon movement direction
See merge request veloren/veloren!1568
2020-11-30 21:13:03 +00:00
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv
2020-11-30 23:51:05 +03:00
93d2ee48a0
Merge branch 'offspec/larger-scalemode-range' into 'master'
...
Offspec/larger scalemode range
See merge request veloren/veloren!1579
2020-11-30 20:36:58 +00:00
885e1aac61
Offspec/larger scalemode range
2020-11-30 20:36:58 +00:00
c37b91fbf1
Changed Dockerfile to use ENTRYPOINT to allow the veloren-server-cli process to receive signals sent by Watchtower
2020-11-30 16:46:36 +00:00
3c7d682361
nix: dont run git-lfs shell hook if its already initialized, add experimental nix-bundle bundling command, add nixGL to shell.nix for non-nixos users, switch to nixpkgs-fmt for formatting, update niv deps and many other minor improvements
2020-11-30 03:48:00 +03:00
515e444e3d
nix: add git-lfs setup to shell hook for dev shell
2020-11-29 16:59:13 +03:00
e0096a1a91
nix: auto setup cachix cache, do git-lfs check in Nix, link assets dir directly (no assets package) and other minor improvements
2020-11-29 02:02:46 +03:00
3c7f0e4375
nix: fix build failing when on tag, combine nixpkgs.nix and common.nix
2020-11-28 17:45:58 +03:00
bce6e1c6e9
Merge branch 'xMAC94x/release_numbers' into 'master'
...
Change the version number to 0.8
See merge request veloren/veloren!1570
2020-11-28 11:12:06 +00:00
ca1601a980
Change the version number to 0.8
2020-11-28 11:25:58 +01:00
8a6f08df91
Fix sun & moon movement direction
...
They were rising on the west and setting on the east
2020-11-27 23:17:59 +02:00
7ce0c7fc05
Changed tooltip fade time from 100 to 0ms to fix tooltip glitching
2020-11-27 19:51:45 +00:00
9065d0ca02
Merge branch 'imbris/audio-fixes' into 'master'
...
Stop unbounded wind volume when zooming out, make campfires quieter
Closes #844
See merge request veloren/veloren!1566
2020-11-27 18:59:23 +00:00
c8735ba946
Merge branch 'timsueberkrueb/log-path-override' into 'master'
...
Make VOXYGEN_LOGS override logs_path setting
See merge request veloren/veloren!1565
2020-11-27 18:25:39 +00:00
a96e9982c7
Stop unbounded wind volume when zooming out, make campfires quieter
2020-11-27 12:43:47 -05:00
a431fe3fad
Merge branch 'sam/dehardcode-energy' into 'master'
...
Graying out skills with insufficient energy no longer dependent on hard-coded values
Closes #824
See merge request veloren/veloren!1560
2020-11-27 16:27:09 +00:00
352917d9cb
Graying out skills with insufficient energy no longer dependent on hard-coded values
2020-11-27 16:27:09 +00:00
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
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
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
332a636647
You can now leap in directions other than forward with repeater ranged again.
2020-11-26 18:23:15 -06:00
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
54cc158dea
Merge branch 'treeco/fixes' into 'master'
...
Various tiny fixes
See merge request veloren/veloren!1561
2020-11-26 23:34:40 +00:00
b316e9aa7c
Updates ru_RU translation
2020-11-26 22:59:39 +01:00
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
19eee6dad3
Merge branch 'sam/combat-tweaks' into 'master'
...
Combat tweaks
See merge request veloren/veloren!1559
2020-11-26 09:31:38 +00:00
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
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
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
867ca911e5
Parallelised agent code for some sweet performance gains
2020-11-25 22:47:16 +00:00
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
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
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
733a471090
Added Ukrainian translation
2020-11-25 17:21:32 +00:00
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
e7d27a2c21
fmt
...
cleanup
2020-11-25 16:53:48 +00:00
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
3c887315ae
update Turkish translations
2020-11-25 15:46:56 +03:00
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
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
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
6783e13125
Added two new songs along with edits to the .ron
...
comma
2020-11-25 08:25:40 +00:00
