Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,306 Commits 151 Branches 18 Tags 2.1 GiB
ac60bf5794
Commit Graph

6306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcel Märtens
e5e255cbd3 move anim code from voxygen/src/anim to voxygen/anim 2020-12-01 20:20:01 +01:00
Forest Anderson
f82016c66c Updated changelog 2020-12-01 10:29:49 -05:00
Forest Anderson
57c2f21e4d Cleaning 2020-12-01 10:28:39 -05:00
weldar
a2d98d31a7 Removed SSAA option to resolve issue #871. 2020-12-01 09:43:06 -05:00
Marcel
6da55b8f2e Merge branch 'xMAC94x/common_seperation_1' into 'master' 
Move Systems out of common into `common_sys`

See merge request veloren/veloren!1583
 2020-12-01 13:31:33 +00:00
Marcel Märtens
e398cca53c move common_state into common_sys 2020-12-01 13:46:28 +01:00
Marcel Märtens
add7922653 Move Systems out of common into common_sys 
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
 2020-12-01 13:44:07 +01:00
Marcel
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
Marcel
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
Yusuf Bera Ertan
eb730f6904
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff 2020-12-01 00:15:18 +03:00
Marcel
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
ubruntu
1b27adaffd Stop /home from causing fall damage 2020-11-30 21:13:06 +00:00
Marcel
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
Marcel
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
Yusuf Bera Ertan
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv 2020-11-30 23:51:05 +03:00
Marcel
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
Nicholas Kinney
885e1aac61 Offspec/larger scalemode range 2020-11-30 20:36:58 +00:00
Ben Wallis
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
Yusuf Bera Ertan
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
Yusuf Bera Ertan
515e444e3d
nix: add git-lfs setup to shell hook for dev shell 2020-11-29 16:59:13 +03:00
Yusuf Bera Ertan
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
Yusuf Bera Ertan
3c7f0e4375
nix: fix build failing when on tag, combine nixpkgs.nix and common.nix 2020-11-28 17:45:58 +03:00
Marcel
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
Marcel Märtens
ca1601a980 Change the version number to 0.8 2020-11-28 11:25:58 +01:00
Andrii Zymohliad
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
Ben Wallis
7ce0c7fc05 Changed tooltip fade time from 100 to 0ms to fix tooltip glitching 2020-11-27 19:51:45 +00:00
Forest Anderson
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
Forest Anderson
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
Imbris
a96e9982c7 Stop unbounded wind volume when zooming out, make campfires quieter 2020-11-27 12:43:47 -05:00
Marcel
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
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