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
7,905 Commits 151 Branches 18 Tags 2.1 GiB
2e0272ce28
Commit Graph

7905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DaforLynx
2e0272ce28 Town music 2021-04-28 05:07:59 +00:00
Samuel Keiffer
5948025327 Merge branch 'james/fix-bird-auto-fly' into 'master' 
Set bird default to not flying and give non-strafing NPCs a larger attack angle

See merge request veloren/veloren!2209
 2021-04-28 02:31:51 +00:00
James Melkonian
2fafcded93 Set bird default to not flying and give non-strafing NPCs a larger attack angle 2021-04-28 02:31:51 +00:00
Marcel
aa963493e8 Merge branch 'james/sound-unwraps' into 'master' 
Remove an unwrap and move outcome sfx to ron

See merge request veloren/veloren!2206
 2021-04-27 21:01:06 +00:00
James Melkonian
2f00af83d8 Remove an unwrap and move outcome sfx to ron 2021-04-27 21:01:06 +00:00
Marcel
8af1b42dbf Merge branch 'yusdacra/chore/nix' into 'master' 
build(nix): update flake deps, switch buildPlatform to use crate2nix

See merge request veloren/veloren!2202
 2021-04-27 20:55:55 +00:00
Marcel
876686893b Merge branch 'duelsik/translations-PL-27-04-2021' into 'master' 
Polish translations update.

See merge request veloren/veloren!2205
 2021-04-27 20:54:48 +00:00
Joshua Barretto
ffd3ef3f14 Merge branch 'james/fix-wolf-ai' into 'master' 
Partially fixes wolf AI

See merge request veloren/veloren!2167
 2021-04-27 17:57:32 +00:00
James Melkonian
24095187c7 Partially fixes wolf AI 2021-04-27 17:57:31 +00:00
Daniel Mizerski
ec55c176fe Polish translations update. 2021-04-27 17:33:30 +02:00
Joshua Barretto
ada579b02d Merge branch 'lboklin/glider-physics' into 'master' 
Glider physics

See merge request veloren/veloren!1665
 2021-04-27 14:41:48 +00:00
Ludvig Böklin
34660462e9 Glider physics 2021-04-27 14:41:48 +00:00
Justin Shipsey
de25358ab7 Merge branch 'slipped/quickfix' into 'master' 
fix glide wield

See merge request veloren/veloren!2203
 2021-04-27 03:54:55 +00:00
jshipsey
f845f2bd11 fix glide wield 2021-04-26 23:17:04 -04:00
Yusuf Bera Ertan
685f4971ac
build(nix): switch to crate2nix 2021-04-27 05:18:12 +03:00
Justin Shipsey
b99404749a Merge branch 'slipped/combatstuff' into 'master' 
combat ori changes

See merge request veloren/veloren!2198
 2021-04-26 02:54:44 +00:00
Sam
1a7779beb3 Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
jshipsey
a0a75b1921 comments 2021-04-25 22:02:32 -04:00
jshipsey
2c74a86170 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Sam
9084e93f8b Added an angle check to all agent attacks. 2021-04-25 22:02:31 -04:00
jshipsey
c01fd86f44 ori fixes 2021-04-25 22:02:30 -04:00
Marcel
991ccf0033 Merge branch 'aweinstock/deflate-downgrade-20210425' into 'master' 
Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's...

See merge request veloren/veloren!2199
 2021-04-25 23:35:43 +00:00
Samuel Keiffer
3f451ef7b3 Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master' 
Fix campfire heal buff description

See merge request veloren/veloren!2165
 2021-04-25 23:06:48 +00:00
Illia Denysenko
efd54021a7 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Joshua Barretto
c6d1963f10 Merge branch 'zesterer/small-fixes' into 'master' 
Small fixes

See merge request veloren/veloren!2201
 2021-04-25 23:03:23 +00:00
Joshua Barretto
559e16e035 Apply flat earth hack to mist 2021-04-25 23:28:19 +01:00
Joshua Barretto
94b6fa6da3 Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
Joshua Barretto
3e4afc5a45 Capped light access 2021-04-25 22:49:20 +01:00
Joshua Barretto
3af4793762 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
Joshua Barretto
98f660e486 More realistic cloud light extinction model 2021-04-25 22:26:07 +01:00
Samuel Keiffer
add895764b Merge branch 'holychowders/fix_villagers_spamming_messages_in_safezones' into 'master' 
Prevent safezoned villagers from spamming messages upon seeing an enemy

See merge request veloren/veloren!2190
 2021-04-25 21:24:06 +00:00
holychowders
5488f9f525 Prevent safezoned villagers from spamming messages upon seeing an enemy 2021-04-25 21:24:06 +00:00
Marcel
35584d0344 Merge branch 'xMAC94x/reduce_deps' into 'master' 
remove some unused deps Yuri found

See merge request veloren/veloren!2197
 2021-04-25 20:22:31 +00:00
Avi Weinstock
57aee57d82 Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's worst-case encoding time. 2021-04-25 16:18:57 -04:00
Joshua Barretto
805822b0b0 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Joshua Barretto
fa262d2a5c Fixed near cloud bug 2021-04-25 20:04:00 +01:00
Marcel
ecb176158c Merge branch 'tormeh/rtsim-first' into 'master' 
Tormeh/rtsim first

See merge request veloren/veloren!2053
 2021-04-25 18:53:39 +00:00
Samuel Keiffer
ccc22d4969 Merge branch 'sam/block-parry' into 'master' 
Blocking/Parrying

Closes #646 and #416

See merge request veloren/veloren!2153
 2021-04-25 18:25:24 +00:00
Marcel Märtens
1842b2d6eb remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
6848851dc3 Cleaned up tweaks in ui and allowed sfx choosing to scale to amount of sfx variants provided. 2021-04-25 13:09:10 -04:00
Monty
2e24fcf165 Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Sam
372eff2a02 Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
d2d8d43410 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2 Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup. 2021-04-25 13:09:07 -04:00
alfy
73cb6d19ff Fixed the sounds since they were seemingly empty, as well as a new more organic wind sound 2021-04-25 13:09:06 -04:00
alfy
9f79c80072 block and parry sounds added 2021-04-25 13:09:06 -04:00
Sam
288a6f3a82 Blocking now works if no weapon is equipped in main hand. 
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
 2021-04-25 13:09:02 -04:00
jshipsey
fad31bd7ab anim 2021-04-25 13:08:43 -04:00
Sam
f5ec23df48 Parrying 2021-04-25 13:08:42 -04:00
Sam
91c6288213 Melee weapons can now block. 2021-04-25 13:08:42 -04:00