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
5,963 Commits 151 Branches 18 Tags
Commit Graph

5963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam
043d615f3f 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
ffe6d9a5a4 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
6d65693e5b 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
48a8bbe943 Parallelised agent code for some sweet performance gains 2020-11-25 22:47:16 +00:00
Marcel Märtens
aeb50dff60 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
Marcel
bfbae4c3ed 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
95d4a43fa3 Added Ukrainian translation 2020-11-25 17:21:32 +00:00
Joshua Barretto
55c11694a4 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
6aaacc3847 fmt 
cleanup
 2020-11-25 16:53:48 +00:00
Forest Anderson
f8300495df 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
4e2aa2d133
update Turkish translations 2020-11-25 15:46:56 +03:00
Marcel
ad985e052b 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
2812c944fc 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
a6ab7cfe03 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
090462a172 Added two new songs along with edits to the .ron 
comma
 2020-11-25 08:25:40 +00:00
Imbris
0ce1628d08 Restore fix for dragging on windows platforms 2020-11-25 00:29:28 -05:00
Imbris
50ccca89e5 Fix turning off worldgen feature 2020-11-24 23:55:44 -05:00
Marcel
11ede8567d Merge branch 'angryanimals' into 'master' 
animal attacks

See merge request veloren/veloren!1542
 2020-11-25 01:33:20 +00:00
Sam
65357eb3dd Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
670e99efac 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
031e707e54 Changed default main and secondary tool from Some(empty) to None. 
weapon fixes
 2020-11-24 17:49:04 -06:00
jiminycrick
64ec89a3cc Agent tactic refactoring 
Lower theropods spawns

clippy, changelog

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

Lavadrake AI tweaks

feedback tweaks
 2020-11-24 17:48:54 -06:00
jshipsey
d553227557 theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
d7ebd98a5d bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
68021841f0 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
aea8268389 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
2cdbe9e5d3 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
ca2b38f6a7 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
ba7b1eff92 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
cb10c87fbb Fix charged melee swing 2020-11-24 17:48:47 -06:00
jiminycrick
c31499e729 Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
5f0f575f70 assigning weapons, building animations 
ability mapping
 2020-11-24 17:48:43 -06:00
jiminycrick
e77aed4577 Maneater AI 
Rebase fixes and maneater AI
 2020-11-24 17:48:38 -06:00
jshipsey
5df7af03ec initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
2e8b7b77e5 Wolf attacks and ai. 
initial wolf dash testing

tool.rs

Wolf attack AI
 2020-11-24 17:48:20 -06:00
Yusuf Bera Ertan
3046cdbf55
fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
Joshua Barretto
38f39d7bb3 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
b9abb9d443 Fixed bit-twiddling colour bug 2020-11-24 18:44:41 +00:00
Samuel Keiffer
e33fcf03d8 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
74a47f447d Changed default main and secondary tool from Some(empty) to None. 2020-11-23 21:54:12 -06:00
Samuel Keiffer
78dd5711a5 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
6b6d3b3f1a Restructures loadout builder function to better support weapons being passed in. 2020-11-23 18:22:24 -06:00
Joshua Barretto
b46e37bf56 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
5000c9872c use iter once.chain(once).flatten trick to deduplicate SiteInfo generation 2020-11-23 23:28:21 +01:00
Christof Petig
147638a5f7 Remove the last remnants of the site circle and cave map drawing code 2020-11-23 19:54:56 +01:00
Christof Petig
138bcc59d6 fix clippy: One argument is no longer needed 2020-11-23 19:17:19 +01:00
Christof Petig
3371b03798 remove cave lines from the map, also remove remnants of the colored site circles 2020-11-23 19:07:11 +01:00
Christof Petig
347d3e9b69 Display names for caves (identical on both ends) 2020-11-23 19:05:43 +01:00
Christof Petig
338a8ab18b Show caves in map 2020-11-23 19:05:17 +01:00