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

7887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Samuel Keiffer
005910dae8 Merge branch 'sam/remove-unwraps' into 'master' 
Removed unwraps in buffs

See merge request veloren/veloren!2196
 2021-04-25 16:36:10 +00:00
Sam
e074562735 Removed unwraps in buffs 2021-04-25 12:01:21 -04:00
Samuel Keiffer
eb86237922 Merge branch 'juliancoffee/fix_buff_bar' into 'master' 
Fix bug with missing Burning icon

See merge request veloren/veloren!2195
 2021-04-25 15:55:43 +00:00
juliancoffee
3937740794 Update CHANGELOG 2021-04-25 15:51:39 +03:00
Ben Wallis
865ee8528e Merge branch 'juliancoffee/refactor_localization' into 'master' 
Update doc-strings in voxygen/i18n

See merge request veloren/veloren!2194
 2021-04-25 09:32:39 +00:00
juliancoffee
4cfc1bfecf Fix Bug with missing Burning icon 2021-04-25 10:44:22 +03:00
juliancoffee
6f5b7b8de7 Update doc-strings 2021-04-25 09:12:15 +03:00
Justin Shipsey
afeabfbccf Merge branch 'snowram/bird-large' into 'master' 
Large bird skeleton

See merge request veloren/veloren!2121
 2021-04-25 03:34:12 +00:00
Snowram
abfb14626a Body specific beam offsets 2021-04-25 04:07:12 +02:00
Snowram
58300592ca More phoenix AI work 
More phoenix AI work
 2021-04-25 04:07:12 +02:00
James Melkonian
7cfd8debed Phoenix AI pass 2021-04-25 04:07:11 +02:00
Snowram
4249d0ddcc Phoenix npc + AI (WIP) 2021-04-25 04:07:11 +02:00
Snowram
738be81943 Improves bird_large anims 2021-04-25 04:07:09 +02:00
Snowram
ff5d267535 Day period dependant wildlife spawns 2021-04-25 02:14:51 +02:00
Snowram
b0d617d91d Breathe and stun anims 2021-04-25 02:14:50 +02:00
Snowram
e58e56cb07 Cockatrice bird_large conversion 2021-04-25 02:14:50 +02:00
Snowram
e930b5ee18 Idle, run, vel/ori aware fly anims 2021-04-25 02:14:49 +02:00
Snowram
5b8fbe9a23 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00