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

3232 Commits

Author SHA1 Message Date
Avi Weinstock
8dc20d0dd5 Add red-orange pulsing "Nothing!" to the second phase of an a 0-quantity trade, and improve the distance merchants are visible at. 2021-05-07 15:24:55 -04:00
Avi Weinstock
ff83cf752b Add DamageKind, and make piercing damage partially ignore damage resistence. 
- Tweak bow/staff M1 stats.
 2021-05-06 17:39:06 -04:00
Marcel Märtens
af7091182e use a constant for recommended_threads 2021-05-05 14:35:06 +02:00
Marcel Märtens
87cf347377 limit tokio threads to 1/4 of num_cpus 
make sure that rayon has at least 2 threads even on 1cpu systems to increase stability
 2021-05-04 21:06:11 +02:00
Marcel Märtens
9fefdcbbca rayon::join creates a global threadpool, which is only used in /world 
instead just use the same threadpool for everything
helps with debugging problems with GDB
using threadpool.install() to also be used when `into_par_iter()` is called
 2021-05-04 21:06:07 +02:00
Sam
ccb5a80a88 Removed useless clippy allow, added todo. 2021-05-04 11:27:17 -04:00
Sam
344e8c8a67 Made buff commands exhaustive 2021-05-04 09:54:28 -04:00
Sam
f6b364c644 Buff icons 2021-05-04 08:45:14 -04:00
Sam
74a68e24d5 Added sfx. Addressed comments. 2021-05-04 08:45:12 -04:00
Sam
f491854699 Added kit for testing tier 4 dungeons. 2021-05-04 08:45:11 -04:00
Sam
bb98b021da Particles for frenzy buff and ground cleave. 2021-05-04 08:45:10 -04:00
jshipsey
8860e60415 anims 2021-05-04 08:45:08 -04:00
Sam
2e97fad3d8 Added frenzy ability to minotaur. 
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
 2021-05-04 08:45:07 -04:00
Sam
c79c929e9f Crippling strike now functional. Crippled debuff added. 2021-05-04 08:45:05 -04:00
Illia Denysenko
652171b146 Add possibility to translate buff outcomes 2021-05-03 23:02:59 +00:00
Samuel Keiffer
a0899db36a Merge branch 'slipped/oritweak' into 'master' 
ori tweaks, animal adjusts

See merge request veloren/veloren!2234
 2021-05-03 18:49:22 +00:00
Samuel Keiffer
7b82e9b1f4 Merge branch 'sam/ability-sets' into 'master' 
Allow Specification of Custom Ability Sets per Weapon

See merge request veloren/veloren!2231
 2021-05-03 17:50:11 +00:00
Avi Weinstock
bb7dbe245d Make terrain compression a checkbox instead of a bandwidth (throughput?) heuristic. 2021-05-03 00:09:44 -04:00
James Melkonian
6956d364d1 Add map markers for lakes and mountains 2021-05-03 02:00:23 +00:00
jshipsey
f6043b7e53 ori addition to combomelee 2021-05-01 12:29:28 -04:00
Joshua Barretto
b471128ce5 Added map marker 2021-05-01 16:26:13 +00:00
Sam
c5ce67f36c Made naming of fields more explicit. 2021-05-01 09:25:56 -04:00
Sam
3c3977d6a6 Formatting stuffs. 2021-05-01 09:25:53 -04:00
Sam
40d00f46cb Removed clone in animations. Added GATs to animations to do so. 2021-05-01 09:25:53 -04:00
Sam
25c78dc660 Removed all unique and simple tool kinds. 2021-05-01 09:25:51 -04:00
Sam
3bf46fa640 Removed ability set as field on items. 2021-05-01 09:25:49 -04:00
DaforLynx
5358e7346a Poise (stun) SFX and fix for town music 2021-04-29 23:36:22 +00:00
DaforLynx
5f8c7e54b5 Town music 2021-04-28 05:07:59 +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
Ludvig Böklin
b389806d2e Glider physics 2021-04-27 14:41:48 +00:00
Yusuf Bera Ertan
78b1773c05
build(nix): switch to crate2nix 2021-04-27 05:18:12 +03:00
jshipsey
585e468de1 skill adjustments, ori changes 2021-04-25 22:02:32 -04: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
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
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
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
c9e1b1d341 Melee weapons can now block. 2021-04-25 13:08:42 -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
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