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

3045 Commits

Author SHA1 Message Date
Avi Weinstock
0a6461f2b9 Add colors for buy/sell tooltips based on site prices. 2021-04-02 17:44:02 -04:00
Marcel
eeb9e76902 Revert "Merge branch 'animtweaks' into 'master'" 
This reverts merge request !2039
 2021-04-01 18:45:03 +00:00
jshipsey
99930f13c8 small anim tweaks 2021-04-01 03:08:33 -04:00
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click. 
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
 2021-03-30 18:39:10 -04:00
Marcel Märtens
7afa77a06f move tracing code to own crate 2021-03-30 16:35:36 +02:00
Joshua Barretto
bb88d42295 Merge branch 'zesterer/sprite-text' into 'master' 
Added text prompts to sprites

See merge request veloren/veloren!2034
 2021-03-30 11:41:14 +00:00
Joshua Barretto
97e5c26838 Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
Joshua Barretto
6ca8cd9bb2 Fixed training dummy hitbox 2021-03-29 21:52:05 +01:00
Joshua Barretto
8ecc0d5231 Improved hit particles 2021-03-29 21:52:05 +01:00
Joshua Barretto
6f72e53295 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
843f295eef Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
58b5e5fcee Changelog, cleanup, clippy 2021-03-29 18:35:10 +02:00
Snowram
a7064fdbbd Skillbar uses item tooltip 2021-03-29 18:34:45 +02:00
Snowram
2fe2d91ab0 Add several new i18n lines 2021-03-29 18:34:45 +02:00
Snowram
a5c125fdef Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
6451caf15b Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
f6715c8217 Use a dummy item for the new() function 2021-03-29 18:34:45 +02:00
Snowram
a3f0589dcc Kinda working tooltip height but not really 2021-03-29 18:34:45 +02:00
Snowram
12c1e47b89 More item tooltip UI layout 2021-03-29 18:34:45 +02:00
Snowram
71fabb1637 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Snowram
763cf70b70 New tooltip 2021-03-29 18:34:45 +02:00
Marcel Märtens
1db475e1dc do a clear teardown of tokio runtime 2021-03-29 10:34:33 +02:00
Marcel Märtens
ac9734bee5 display error when rodio panic is fixed 2021-03-28 20:40:07 +02:00
Sam
d5c44cd2a2 Fixed offset of decayed health 2021-03-27 21:06:21 -04:00
Monty
8d0b1e201a decay display for groups and overhead bars 2021-03-27 21:05:17 -04:00
Sam
1df8260208 Removed experimental group health decay 2021-03-27 21:05:17 -04:00
jshipsey
094fb4ee95 flayer anims 2021-03-27 21:05:16 -04:00
Sam
c40ad922de Particles for summoned minions 2021-03-27 21:05:15 -04:00
Monty Marz
25f4f15c37 decayed health texture 2021-03-27 21:05:14 -04:00
Monty Marz
ee0214317f WIP animation 2021-03-27 21:05:13 -04:00
Sam
42ca607eab Initial work to show decayed health in healthbars 2021-03-27 21:05:13 -04:00
Sam
75c0e3f4eb Added particles for lifesteal effect 2021-03-27 21:05:12 -04:00
Sam
e0ed4ca4d2 Particles for blink 2021-03-27 21:05:09 -04:00
Snowram
5b83b912f3 Adds husk npc 2021-03-27 21:05:09 -04:00
Sam
17eab079ee Gave mindflayer AI. 
Fixed particles and made them sync across network.
 2021-03-27 21:05:06 -04:00
Sam
90e33cafb5 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Sam
c2e66c949c Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
3452857d5c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Marcel
54e29cc2e1 Merge branch 'swilliams/character-randomization-fix' into 'master' 
Character Creation Randomization Fix

See merge request veloren/veloren!2004
 2021-03-27 15:58:34 +00:00
Scott Williams
e0e7ab8fa2 Character Creation Randomization Fix 2021-03-27 15:58:34 +00:00
Louis Pearson
340f0437fb Add build_area_list command 
* Reworks CanBuild to use HashSet
* Removes player argument from build permission, use sudo instead
 2021-03-27 07:54:02 -06:00
Louis Pearson
584a9c3aeb Limit build mode to bounding box 2021-03-27 07:54:02 -06:00
Louis Pearson
dbb034da9b Add permit_build command 
This commit separates permission to build from building mode, allowing
build to become a NoAdmin command (since players will first need
permission from an Admin to enter build mode)
 2021-03-27 07:54:02 -06:00
Marcel
757692edb6 Merge branch 'refactor-login' into 'master' 
refactor handling of duplicate login #1015

Closes #1015

See merge request veloren/veloren!1992
 2021-03-27 13:49:09 +00:00
Marcel
e532597674 Merge branch 'aweinstock/tradepricing' into 'master' 
Get SitePricing information to clients, and use it to display coin-denominated...

See merge request veloren/veloren!1991
 2021-03-26 00:17:39 +00:00
aljazerzen
06f860e2a0 refactor handling of duplicate login 2021-03-25 12:33:56 +01:00
Avi Weinstock
6d30f17add Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Snowram
6e4c897d82 Allow Escape key to cancel trades 2021-03-25 01:42:14 +01:00
Avi Weinstock
761435e0fc Address MR 1962 review comments. 2021-03-23 18:41:13 -04:00
Avi Weinstock
db7d0af951 Add a vertical camera clamp option and toggle to voxygen. 2021-03-23 18:22:32 -04:00