Sam
ddbe871b50
Placeholder animation for beam attack.
2020-09-29 19:48:03 -05:00
Sam
36762be2a7
Fixed explosion color of sceptre M2.
2020-09-29 19:47:59 -05:00
Sam
6b23af6e0b
Tweaked particles. Added skill icons.
2020-09-29 19:47:58 -05:00
Sam
8b9202710f
New sceptre M2 is functional.
2020-09-29 19:47:57 -05:00
Sam
921d224ef6
Lifesteal now works. Added particles to healing beam.
2020-09-29 19:47:57 -05:00
Forest Anderson
25ab132d73
Merge branch 'xvar/add-clone-on-ref-ptr-clippy-lint' into 'master'
...
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
See merge request veloren/veloren!1411
2020-09-28 19:32:03 +00:00
Joshua Yanovski
443f3287e4
Merge branch 'sharp/remove-spurious-vox' into 'master'
...
Remove spurious uses of Vox.
See merge request veloren/veloren!1406
2020-09-27 16:41:29 +00:00
Ben Wallis
b3dd8e8a02
Added #![deny(clippy::clone_on_ref_ptr)] to all crates and fixed resulting lint errors
2020-09-27 17:25:33 +01:00
Ben Wallis
11fc74642e
Refactored crafting to use ItemDef instead of Item
2020-09-27 14:55:31 +01:00
Joshua Yanovski
938039a56e
Remove spurious uses of Vox.
...
In the process, also try to address a few edge cases related to block
detection, such as adding back previously solid sprites and removing
filters that may be vestiges of earlier logic.
2020-09-26 16:30:40 +02:00
Marcel Märtens
b7dc17c11f
switch version to pre-alpha-2020-09-22 vs pre-alpha-v0.7.0
2020-09-22 12:04:07 +02:00
Marcel Märtens
8eec46424f
switching veloren naming scheme, to either one of the following:
...
`stable-0.7.0 (<hash>-<datetime>)` for release versions.
And
`nightly-<date> (<hash>)` for nightly and master versions
Reason is, many players only give information that they are running `0.x.0` but are not giving us the information which day, or commit they are running. So we should make master builds less confusing.
2020-09-22 11:47:18 +02:00
jshipsey
4f0faf4c56
small corrections
2020-09-21 23:57:10 -04:00
Snowram
fa2dd28587
Fixed various issues from better-things branch
2020-09-21 23:57:10 -04:00
Sam
2ff59c9f60
Addressed comments
2020-09-21 17:55:29 -05:00
Sam
8ab0d5e5e0
Added icon for skillbar ability of sword.
2020-09-21 17:40:20 -05:00
jshipsey
0796337a8c
resolve minor anim hiccup
2020-09-21 17:40:19 -05:00
Sam
1fbcf2be80
Fixed pipeline errors.
2020-09-21 17:40:19 -05:00
Sam
b4018e7d42
Made 3rd ability interruptible. Final balance tweaks.
2020-09-21 17:40:16 -05:00
jshipsey
8070a38a89
spin anim
2020-09-21 17:38:57 -05:00
jshipsey
e79cef4824
dash animation
2020-09-21 17:38:55 -05:00
Sam
a8e834e754
Initial implementation of spin attack for sword.
2020-09-21 17:38:54 -05:00
jshipsey
b0d359e29f
slightly quicker alpha, improved anims
2020-09-21 17:38:54 -05:00
Sam
fe70b7fbce
Addressed second round of feedback.
2020-09-21 17:38:53 -05:00
Sam
b06ab250cc
Addressed first round of feedback on sword overhaul.
2020-09-21 17:38:52 -05:00
Sam
c99e4c3c18
Added swing duration to dash melee. Added framework for animation to be added.
2020-09-21 17:38:51 -05:00
Sam
04af75bf8d
Initial implementation of new dash melee.
2020-09-21 17:38:48 -05:00
jshipsey
a18c23025e
stage 2 and 3 anim
2020-09-21 17:38:46 -05:00
Sam
847bddbd89
Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.
2020-09-21 17:38:46 -05:00
Sam
2ba9d1e54f
Added support for different swings in the combo melee having differnt fractions of time buildup duration is split.
2020-09-21 17:38:45 -05:00
jshipsey
2451a64b97
stage 2 animation
2020-09-21 17:38:44 -05:00
Sam
0ba5740265
Added enum for stage section instead of using 4 bools.
2020-09-21 17:38:43 -05:00
Sam
440e45f2bc
Did stuff to support addition of keyframes for combo melee animation.
2020-09-21 17:38:43 -05:00
Sam
aab56ea636
Animation time for combo melee now resets between stages.
2020-09-21 17:38:42 -05:00
Sam
cf573a42bd
Initial implementation of combo melee attack.
2020-09-21 17:38:41 -05:00
Joshua Barretto
388a899a7f
Added make_sprite command
2020-09-21 16:39:20 +01:00
Joshua Barretto
ece4a01867
Improved representation of Block for better performance, more features, and better backwards-compatibility
2020-09-20 11:46:12 +01:00
Samuel Keiffer
b2f42a117c
Merge branch 'sam/boss' into 'master'
...
Boss
Closes #769
See merge request veloren/veloren!1364
2020-09-19 20:47:07 +00:00
Joshua Yanovski
7b43752785
Merge branch 'droogmic/scene_terrain_refator' into 'master'
...
Voxygen scene terrain - minor refactor
See merge request veloren/veloren!1392
2020-09-19 20:29:02 +00:00
Sam
6deeb7fcfe
Addressed another comment.
2020-09-19 14:40:22 -05:00
Sam
45fef87f32
Addressed comments
2020-09-19 14:40:21 -05:00
Sam
e39770d1d9
Golem now spawns in dungeon.
2020-09-19 14:40:20 -05:00
Sam
6327dd18b6
Moved knockback to a server event so that it would actually be applied to the player.
2020-09-19 14:40:17 -05:00
scott-c
1f2ed53c42
Tweak particle effects
2020-09-19 14:40:15 -05:00
Sam
0c48efd445
Added particles dedicated for shockwave.
2020-09-19 14:40:15 -05:00
Sam
23fa3c2f8d
Added particles to shockwave attack.
2020-09-19 14:40:14 -05:00
Sam
717142d5ea
Started to implement shockwave system.
2020-09-19 14:29:06 -05:00
Sam
66b0fee3c7
Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.
2020-09-19 14:29:04 -05:00
Michael Droogleever Fortuyn
7fd50f36ef
Add interaction hint #615
...
Add text above dropped items hinting at
the use of the interaction control
e.g. pressing E
2020-09-19 20:38:48 +02:00
Imbris
9464fd49a9
Unify healthbar showing calculation, move bubble acquisition into closure
2020-09-19 13:54:05 -04:00
Imbris
ca2aad0080
Make chat bubbles show up even if nametags are not displayed
2020-09-19 13:54:05 -04:00
Imbris
b31df2f34e
Use proper fps in voxygen graphics settings tab
2020-09-19 13:54:05 -04:00
Michael Droogleever Fortuyn
a3c4040063
Scene terrain worker refactor
...
Simplify ChunkMeshState's active worker tracking to a bool,
as the tick value was never being used.
2020-09-19 16:13:29 +02:00
scott-c
2686598f1f
Improve first-person projectile aiming
2020-09-19 19:14:23 +08:00
Monty Marz
5fe79e1c6a
new loading screen bgs (part 1)
...
Add a basic random feature to char creation
loading screen bg (part 2)
loading screen changes, random button graphics
Random appearance also pick a random npc name
2020-09-18 23:17:47 +00:00
Snowram
f9fada87cf
Addresses comments
2020-09-18 18:45:03 +02:00
jshipsey
8330d087e6
clippy
2020-09-17 22:58:02 -04:00
jshipsey
fff6a6fb0a
finish odonto
2020-09-17 22:32:11 -04:00
jshipsey
b0767cb7a5
minor anim fix
2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861
spawn tweaks, improved odonto
2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e
Better quadmed legs/feet ratio
2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a
Initial quadmed feed animation
2020-09-17 22:32:10 -04:00
jshipsey
789d93b52f
new models, shockwave anim
2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b
general housekeeping
2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072
species specific improvement
2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0
Quadmed run anim tweaks and deers offsets tweaks
2020-09-17 22:32:10 -04:00
jshipsey
b781a1765b
theropod run
2020-09-17 22:32:10 -04:00
Snowram
9308cabeb8
add deer, beaver and porcupine npcs
2020-09-17 22:32:10 -04:00
jshipsey
3eeaf7e8c9
idle for theropod, corrections to swimming
2020-09-17 22:32:10 -04:00
Snowram
ee95550355
Tweak offsets for theropods
2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f
haul out the critter skele, add theropod
2020-09-17 22:32:10 -04:00
jshipsey
aa440c02bb
proper cycles on quadmed movement
2020-09-17 22:32:09 -04:00
Snowram
1097dbcc25
Improve adaptative quadmed run
2020-09-17 22:32:09 -04:00
jshipsey
883aa1754b
refining pace setup. refined species anim variables
2020-09-17 22:32:09 -04:00
jshipsey
47d5c635de
first attempt at adaptive stride system
2020-09-17 22:32:09 -04:00
jshipsey
b514fb4159
fix for animal attack motion bug
2020-09-17 22:32:09 -04:00
jshipsey
ecae71c016
gliders as items. anim improvements
2020-09-17 22:32:09 -04:00
jshipsey
7525479a4c
fit dt issue
2020-09-17 22:18:49 -04:00
jshipsey
bd1984bf28
golem addition, fix for axe attack
2020-09-17 22:18:49 -04:00
Ben Wallis
712f2e9c97
* Moved migrations to beginning of server initialisation
...
* Added migrations for entity ID changes to existing tables
2020-09-17 23:02:14 +00:00
tylerlowrey
2b0c1e89f3
Refactored kicking the player into its own function + ran fmt on project
2020-09-14 07:54:05 +02:00
tylerlowrey
b64f3fa8a9
Removed unnecessary kicked error enum
2020-09-14 07:54:05 +02:00
tylerlowrey
30c3146682
Added main menu kick message with kick reason after player is kicked
2020-09-14 07:52:31 +02:00
tylerlowrey
fee79720ee
Added ban message with reason when banned user attempts to login to server
2020-09-14 07:52:31 +02:00
Imbris
75761b60d9
Merge branch 'imbris/fix-mesh-panic' into 'master'
...
Fix #746 and misc cleanup
Closes #746
See merge request veloren/veloren!1380
2020-09-13 01:48:27 +00:00
Imbris
3fbf8d7ca0
Remove chunk from mesh todo if neighbour is deleted, be more careful with z_start and z_end in terrain meshing
2020-09-12 21:02:00 -04:00
Marcel Märtens
ad63c65d2f
fix windows result check
2020-09-11 16:24:15 +02:00
Imbris
c3ae641fbb
Merge branch 'imbris/tracy' into 'master'
...
Add more tracing instrumentation and tracy support
See merge request veloren/veloren!1359
2020-09-10 05:07:51 +00:00
TheThirdSpartan
7fd673ecb2
Added localization config options for new death messages
2020-09-09 20:26:20 +00:00
Marcel Märtens
018d03d860
fix panic for macos
2020-09-09 12:11:56 +02:00
Marcel Märtens
68168b0ae4
replace heavy msgbox with light native-dialog
2020-09-08 23:49:49 +02:00
Raiyan Sayeed
906da2f0c7
added option for borderless fullscreen in setting -> graphics menu
2020-09-07 05:12:15 +00:00
Imbris
f39d1e9bb5
Use less verbose span names when the tracy feature is off
2020-09-07 00:59:16 -04:00
Imbris
7efbc74551
remove duplicate tracing filter code, fix compiling voxygen with the
...
tracy feature
2020-09-06 22:28:14 -04:00
Imbris
0683a40741
Use finish_continuous_frame directly
2020-09-06 22:28:14 -04:00
Imbris
4f68a6df27
Update tracy crates, reduce overhead of timing, add more misc instrumentation
2020-09-06 22:28:14 -04:00
Imbris
e37a01be9d
Sprinkle instrumentation in common crate,in particular in the ecs systems
2020-09-06 22:28:14 -04:00
Imbris
50ceb1c93e
Add workaround for spans with winit loop, configure filtering when the tracy feature is on, spinkle some spans in the codebase
2020-09-06 22:28:14 -04:00
Imbris
d95e539495
Intial setup of tracy
2020-09-06 22:28:14 -04:00
TheThirdSpartan
6dbd1bc132
adding feature requested in issue #153 - displaying your alias in game as 'you'
2020-09-06 19:42:32 +00:00
