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

8105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DaforLynx
5f8c7e54b5 Town music 2021-04-28 05:07:59 +00:00
Samuel Keiffer
20176b1bf2 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
124a684e47 Set bird default to not flying and give non-strafing NPCs a larger attack angle 2021-04-28 02:31:51 +00:00
Marcel
2abbd1cdda 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
3ae25b8348 Remove an unwrap and move outcome sfx to ron 2021-04-27 21:01:06 +00:00
Marcel
134ee907bb 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
0a8a0452f5 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
f9020490ec 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
1e47652741 Partially fixes wolf AI 2021-04-27 17:57:31 +00:00
Daniel Mizerski
7aa309fa06 Polish translations update. 2021-04-27 17:33:30 +02:00
Joshua Barretto
5f3ac34f4a 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
b389806d2e Glider physics 2021-04-27 14:41:48 +00:00
Justin Shipsey
3c822c2be5 Merge branch 'slipped/quickfix' into 'master' 
fix glide wield

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

See merge request veloren/veloren!2198
 2021-04-26 02:54:44 +00:00
Sam
201fe2a19c Added angle check for new npcs. 2021-04-25 22:19:30 -04:00
jshipsey
aa344baa45 comments 2021-04-25 22:02:32 -04:00
jshipsey
585e468de1 skill adjustments, ori changes 2021-04-25 22:02:32 -04:00
Sam
77f05ec53d Added an angle check to all agent attacks. 2021-04-25 22:02:31 -04:00
jshipsey
4f3c766757 ori fixes 2021-04-25 22:02:30 -04:00
Marcel
ccafc3f9e8 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
06d9ec1d8a 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
8cc6469626 Fix campfire heal buff description 2021-04-25 23:06:47 +00:00
Joshua Barretto
0637816ab0 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
a785fb13a8 Apply flat earth hack to mist 2021-04-25 23:28:19 +01:00
Joshua Barretto
9bba3acfbe Don't use movement efficiency for orientation 2021-04-25 23:00:30 +01:00
Joshua Barretto
430d75b67b Capped light access 2021-04-25 22:49:20 +01:00
Joshua Barretto
2281c6f189 Minor control over velocity when in the air 2021-04-25 22:37:25 +01:00
Joshua Barretto
4626b7e95d More realistic cloud light extinction model 2021-04-25 22:26:07 +01:00
Samuel Keiffer
c67995d240 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
dd36d1aab5 Prevent safezoned villagers from spamming messages upon seeing an enemy 2021-04-25 21:24:06 +00:00
Marcel
31098ad75b 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
553dcc45dc 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
d00348cbd2 Rebalanced arrow speed 2021-04-25 20:06:29 +01:00
Joshua Barretto
5c469b99d2 Fixed near cloud bug 2021-04-25 20:04:00 +01:00
Marcel
1948507085 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
17492dc0fa 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
fd5d1ffaf3 remove some unused deps Yuri found 2021-04-25 20:18:20 +02:00
Sam
c368883499 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
c59f11ef6e Add i18n, change SCT Blocked col and string 2021-04-25 13:09:09 -04:00
Sam
6294b3c5ff Initial SCT implementation to display blocks. 2021-04-25 13:09:09 -04:00
Sam
fdd2b58954 Addressed testing feedback. 
Particles better.
 2021-04-25 13:09:08 -04:00
Sam
2d3d48e84c 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
5a759be5e3 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
434d1353eb block and parry sounds added 2021-04-25 13:09:06 -04:00
Sam
b028b647ca 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
d4d2f4e79a anim 2021-04-25 13:08:43 -04:00
Sam
165603aa65 Parrying 2021-04-25 13:08:42 -04:00
Sam
c9e1b1d341 Melee weapons can now block. 2021-04-25 13:08:42 -04:00