Commit Graph

4233 Commits

Author SHA1 Message Date
Youssef Fahmy
aec866e5ec Balance tweaks 2022-04-23 14:54:01 +00:00
Marcel
967d151312 Merge branch 'aerialfiddle/be_BY' into 'master'
Fixed an error where '{amount} Exp' floater did not use existing localizations

See merge request veloren/veloren!3332
2022-04-19 17:02:19 +00:00
Anton Katsuba
d37db03270 Fixed an error where '{amount} Exp' floater was displayed only in English despite localizations being available 2022-04-19 18:28:15 +03:00
aflying pumpkin
c7f7e63495 Added Lionesses 2022-04-16 16:57:59 +00:00
Leonid Toshchev
860af759a4 # Fix 994: fix panic when hotloading figure manifests 2022-04-14 15:53:39 +00:00
Marcel Märtens
64b9602760 update further dependencies, including strum and get rid of old strum_macro 2022-04-04 16:06:47 +02:00
Marcel Märtens
affdf3131f update a bunch of dependencies, including clap3 2022-04-04 11:43:29 +02:00
jh0l
585bcda729 fix: 🐛 resolve issue where client spams TradeAction updates based on out of sync PendingTrade values 2022-03-27 20:25:22 +02:00
jh0l
32d4ddd4fd style: 🎨 remove newline 2022-03-27 20:25:20 +02:00
Jack hollis-london
aeae94d31b small refactor per code review 2022-03-27 20:25:19 +02:00
jh0l
403a523ec7 refactor: ♻️ move voxygen hud update definitions from common/trade to voxygen/hud & trade 2022-03-27 20:24:23 +02:00
jh0l
de70ce61d8 feat: a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:21 +02:00
jh0l
991cfcaa47 feat: 🌐 add i18n for trade amount input placeholder 2022-03-27 20:24:20 +02:00
jh0l
6f22f31376 feat: a TextEdit input in the trade window so that users can specify the amount of an item to trade by typing 2022-03-27 20:24:18 +02:00
Andrzej Drabarek
fa5555a348 Fixed Tutorial HUD being covered up by other HUD elements. 2022-03-20 19:05:10 +01:00
Mehmet-dev
903e216d32 fixing blood particles on bodies not supposed to bleed from gameplay perspective 2022-03-20 15:45:50 +00:00
Marcel
aa244b23c4 Merge branch 'Melonai/apply_mount_offset_to_weapon_trails' into 'master'
Apply mount transform position to weapon trails

Closes #1489

See merge request veloren/veloren!3279
2022-03-15 21:24:49 +00:00
Imbris
1ff8fffa1d Merge branch 'olexorus/2021_cleanup' into 'master'
Simplifications made possible by the 2021 Edition

Closes #1447

See merge request veloren/veloren!3277
2022-03-15 21:05:53 +00:00
Mel
0ba3a806c0 Apply mount transform position to weapon trails 2022-03-15 21:47:17 +01:00
DaforLynx
e936a27d40 Small sound fixes 2022-03-15 16:23:10 +00:00
Olexorus
2212c3d70c Remove borrow-checker appeasing code that's no longer necessary in Rust 2021 2022-03-15 16:49:03 +01:00
DaforLynx
7b6f424bb0 Loud rivers 2022-03-13 07:47:23 +00:00
DaforLynx
123fee2707 Fix swim sfx, fix glider sfx, add glide sfx 2022-03-13 05:44:07 +00:00
Marcel
d05cb99007 Merge branch 'unvariant/trading_fix' into 'master'
prevent glider and sneak from triggering during trade

See merge request veloren/veloren!3264
2022-03-08 10:25:16 +00:00
ninefox
115b2875b3 prevent glider and sneak from triggering during trade 2022-03-07 20:28:38 -08:00
Isidor Nielsen
a5ab36e6b5 Map marker fixes 2022-03-07 12:16:04 +00:00
Sam
89bf529a5e Addressed review comments 2022-03-03 01:12:40 -05:00
Sam
f5e0cb0045 Addressed review comments 2022-03-03 01:11:18 -05:00
Sam
0a0fffd5ed Addressed review comments 2022-03-03 01:11:17 -05:00
Sam
5a60562eee Addressed review comments 2022-03-03 01:11:16 -05:00
Sam
ce70c512e2 Arrow trails 2022-03-03 01:11:15 -05:00
Sam
48c97cd829 Glider trails 2022-03-03 01:11:13 -05:00
Sam
eacd43be16 Moved weapon offset functions up a level. Should allow gliders and arrows to be handled better. 2022-03-03 01:11:12 -05:00
jshipsey
6ba8af5434 anim additions 2022-03-03 01:11:11 -05:00
Sam
f3c5c2b5e3 Pointy trails 2022-03-03 01:11:10 -05:00
Sam
b3a19ebc00 Weapon trails now works with dual wielding 2022-03-03 01:11:08 -05:00
Sam
a967daa2f5 Trails now controlled and enabled from animation files. 2022-03-03 01:11:07 -05:00
Sam
fc1a9f3c61 Trail thinning is now smooth 2022-03-03 01:11:06 -05:00
Sam
87434c472c Trails shrinks over time 2022-03-03 01:11:05 -05:00
Sam
ab4c5dac87 Reset vertices for trails in trail manager. 2022-03-03 01:11:04 -05:00
Sam
bee16001ed Don't upload weapon trails to GPUs for entities that have only zero quds. 2022-03-03 01:11:03 -05:00
Sam
cfbb3a5bca Changed to a single dynamic model 2022-03-03 01:11:02 -05:00
Monty Marz
82def16969 visuals 2022-03-03 01:11:00 -05:00
Sam
c6dc96b795 Settings button to turn off weapon trails. 2022-03-03 01:10:59 -05:00
Sam
f4abe4f275 More tweaks 2022-03-03 01:10:58 -05:00
Sam
1f2ede656e Fixed tests 2022-03-03 01:10:57 -05:00
Sam
b558331b32 Finishing touches 2022-03-03 01:10:55 -05:00
Sam
d23dd6c9e9 Fixed a few errors 2022-03-03 01:10:54 -05:00
Sam
5018a9f476 Game now runs, still doesn't work 2022-03-03 01:10:53 -05:00
Sam
33419c7b4c Trails are now hackily created. 2022-03-03 01:10:51 -05:00