Sam
|
fe1db1e9e0
|
Can move around, so character state system runs
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
|
2022-01-20 15:26:35 -05:00 |
|
Justin Shipsey
|
edb0c87c29
|
Merge branch 'fix' into 'master'
fix arthropod crash
See merge request veloren/veloren!3120
|
2022-01-20 07:48:46 +00:00 |
|
jshipsey
|
136555dbbe
|
fix crash
|
2022-01-20 02:14:49 -05:00 |
|
Imbris
|
2f45f08ef4
|
Merge branch 'zesterer/experimental-shaders' into 'master'
Added point glow, more experimental shaders
See merge request veloren/veloren!3118
|
2022-01-20 01:52:11 +00:00 |
|
Joshua Barretto
|
1ccbaac314
|
Addressed review comments, fixed perf issue
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
53574bb6ec
|
Tweaked lantern offsets
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
fcd25648fe
|
Fixed point glow with no clouds
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
fd4c4adae9
|
Fixed moving procgen LoD shader
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
c7717c165e
|
Updated changelog
|
2022-01-19 20:08:11 -05:00 |
|
Joshua Barretto
|
7506dc2a41
|
Added procedural LoD detail shader
|
2022-01-19 19:59:14 -05:00 |
|
Joshua Barretto
|
dea540222f
|
Upped bloom default
|
2022-01-19 19:59:14 -05:00 |
|
Joshua Barretto
|
391d1f6bf4
|
Added point glow
|
2022-01-19 19:59:13 -05:00 |
|
Samuel Keiffer
|
7052aad11b
|
Merge branch 'snowram/arthropods' into 'master'
Snowram/arthropods
See merge request veloren/veloren!3071
|
2022-01-20 00:20:24 +00:00 |
|
Snowram
|
a6e396e29a
|
Stunned and jump anims, stats, spawns, more IA work
|
2022-01-20 00:53:29 +01:00 |
|
Imbris
|
907b1576ca
|
Merge branch 'infrandomness/remove_utility/bomb_pile' into 'master'
Remove bomb pile item
Closes #1184
See merge request veloren/veloren!3114
|
2022-01-19 19:31:43 +00:00 |
|
InfRandomness
|
dabae7ece8
|
Remove bomb pile item
|
2022-01-19 19:31:43 +00:00 |
|
Snowram
|
f6d7ba33ef
|
Arthropods spawns and loots
|
2022-01-19 19:01:16 +01:00 |
|
jshipsey
|
82df5f23c3
|
spit anim
|
2022-01-19 19:01:16 +01:00 |
|
jshipsey
|
269b1fcd00
|
summon an
|
2022-01-19 19:01:15 +01:00 |
|
Snowram
|
fd3ed89899
|
More arthropod animations
|
2022-01-19 19:01:15 +01:00 |
|
Snowram
|
38bbd60fd2
|
Arthropod basic attack
|
2022-01-19 19:01:14 +01:00 |
|
Snowram
|
6da42e61ab
|
Arthropod jump attack, hitboxes
|
2022-01-19 19:01:14 +01:00 |
|
Snowram
|
1e6ead4005
|
Arthropod charge
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
02ed6ffd60
|
More arthropod work
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
ae71f2e4f0
|
Adds poisoned debuff (energy change over time)
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
2871fa83bc
|
Arthropod run
|
2022-01-19 19:01:12 +01:00 |
|
Snowram
|
fa549eece7
|
Adds new arthropod species
|
2022-01-19 19:01:12 +01:00 |
|
Snowram
|
f67bf2a539
|
Adds arthropod skeleton
|
2022-01-19 19:01:11 +01:00 |
|
Imbris
|
59d195b9bc
|
Merge branch 'imbris/component-sync' into 'master'
Sync some components only from the client's own entity.
See merge request veloren/veloren!3108
|
2022-01-19 07:44:14 +00:00 |
|
Samuel Keiffer
|
c3e92b6c7a
|
Merge branch 'sam/melee-constructor' into 'master'
Melee Constructor
See merge request veloren/veloren!3111
|
2022-01-19 06:36:51 +00:00 |
|
Sam
|
f93b85368d
|
Addressed review comments.
|
2022-01-19 00:56:44 -05:00 |
|
Imbris
|
13d970bf6f
|
Rename SyncFrom::AllEntities to SyncFrom::AnyEntity for more clarity, add more comments for component syncing code, address MR comment
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
3beb3c8205
|
Address review comments
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
374bd10e5d
|
Small comment fixes
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
cc40058ae2
|
Reduce extra energy updates
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
fa42be75b8
|
Fix health last change time not being set properly
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
5494bd31f2
|
Sync SkillSet from all entities for now since it is needed for some things in voxygen, fix character_behavior system always triggering energy and density modification flags
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
7f7dc5ff8a
|
Add ability to plot component update counts each tick in tracy, controlled by the PLOT_UPDATE_COUNTS env var
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
b19f780d9f
|
Make Combo also only sync for the client's entity
|
2022-01-19 00:56:42 -05:00 |
|
Imbris
|
aa122c1a18
|
Sync some components only from the client's own entity. Vastly reduce the amount of places to modify when adding/removing a component from network syncing.
|
2022-01-19 00:56:42 -05:00 |
|
Joshua Barretto
|
c4706078c4
|
Merge branch 'zesterer/experimental-shaders' into 'master'
Fixed minor shader issues, added curved world effect
See merge request veloren/veloren!3112
|
2022-01-18 17:30:49 +00:00 |
|
Joshua Barretto
|
2f3b14f2e1
|
Improved glow lighting
|
2022-01-18 16:52:35 +00:00 |
|
Samuel Keiffer
|
d40e4d3df9
|
Merge branch 'juliancoffee/remove_equiprating' into 'master'
Add lower cap to equip_time from weapon CR calculation
See merge request veloren/veloren!3116
|
2022-01-18 15:17:47 +00:00 |
|
juliancoffee
|
14cf272c8e
|
Change equip_time CR weapon calculation
|
2022-01-18 16:44:23 +02:00 |
|
Samuel Keiffer
|
e20c98189f
|
Merge branch 'roidujeu/fix_combat_rating' into 'master'
changed the combat rating equation to a simpler one, which results in a better combat rating overall
See merge request veloren/veloren!3095
|
2022-01-18 07:35:49 +00:00 |
|
roidujeu
|
7da9f7dd47
|
changed the range of CRs
|
2022-01-18 12:27:13 +05:30 |
|
roidujeu
|
85965b7161
|
let fmt/clippy do it's thing
|
2022-01-18 11:19:30 +05:30 |
|
roidujeu
|
a6a825a97f
|
gave speed more weight, reduced equip_time_weight, etc
|
2022-01-18 10:48:53 +05:30 |
|
roidujeu
|
f77baeac4b
|
normalised crit_chance, zeroed out some stats(for now)
|
2022-01-18 10:48:53 +05:30 |
|
roidujeu
|
d6ca1bfd93
|
reverted accidental change
|
2022-01-18 10:48:53 +05:30 |
|