juliancoffee
|
25b04e6ee7
|
Move common to 2021 edition
|
2022-01-26 15:17:01 +02:00 |
|
juliancoffee
|
ebe95ebe33
|
Move common-assets to 2021 edition
|
2022-01-26 15:09:00 +02:00 |
|
Dominik Broński
|
ca7b048184
|
Merge branch 'SeaCrocodile' into 'master'
Sea crocodile
See merge request veloren/veloren!3146
|
2022-01-26 01:26:38 +00:00 |
|
Sam
|
e6bef416b4
|
Fix possession for animation work purposes.
|
2022-01-25 12:29:05 -05:00 |
|
floppy
|
fb316e8f66
|
SeaCrocodile spawning in tropical Oceans
|
2022-01-24 19:36:13 +01:00 |
|
Joshua Barretto
|
bdb0fc9c16
|
Merge branch 'zesterer/underwater' into 'master'
Underwater shaders
See merge request veloren/veloren!3127
|
2022-01-23 20:36:47 +00:00 |
|
Forest Anderson
|
d3aa224f15
|
Merge branch 'tygyh/Fix-warnings' into 'master'
Fix warnings
See merge request veloren/veloren!3051
|
2022-01-23 19:25:35 +00:00 |
|
Forest Anderson
|
1bcda9da7b
|
Merge branch 'maveth/skill-improvements' into 'master'
Test for cyclic skill dependencies
See merge request veloren/veloren!3098
|
2022-01-23 18:35:58 +00:00 |
|
Dr. Dystopia
|
bb48267827
|
Fix warnings
|
2022-01-23 19:03:47 +01:00 |
|
Joshua Barretto
|
8a684973b4
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Addressing criticisms
See merge request veloren/veloren!3121
|
2022-01-22 16:44:01 +00:00 |
|
Joshua Barretto
|
3b347a2aa3
|
Improved underwater lighting on low shader settings
|
2022-01-21 13:35:40 +00:00 |
|
Samuel Keiffer
|
a00ac11e25
|
Merge branch 'sam/fix-possess' into 'master'
Fix possession bug
See merge request veloren/veloren!3123
|
2022-01-21 07:40:23 +00:00 |
|
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 |
|
Joshua Barretto
|
4f181c936d
|
Merge branch 'name_areas_based_on_biome' into 'master'
name_areas_based_on_biome
See merge request veloren/veloren!3115
|
2022-01-20 19:50:57 +00:00 |
|
Joshua Barretto
|
f8783487a8
|
Preventing gliding when mounted, allowed dancing
|
2022-01-20 12:53:08 +00:00 |
|
Snowram
|
a6e396e29a
|
Stunned and jump anims, stats, spawns, more IA work
|
2022-01-20 00:53:29 +01: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
|
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
|
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 |
|
floppy
|
51356d5fad
|
in terrain.mod.rs, return name as Option in fn name
|
2022-01-18 19:53:20 +01:00 |
|
juliancoffee
|
14cf272c8e
|
Change equip_time CR weapon calculation
|
2022-01-18 16:44:23 +02:00 |
|
floppy
|
ceb3507e50
|
-remove line breaks from biome names
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
|
2022-01-18 11:27:55 +01: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 |
|
roidujeu
|
3f43610cfd
|
made stats separate and gave them different weights
|
2022-01-18 10:48:53 +05:30 |
|
roidujeu
|
13b0ad8c0e
|
included other stats, gave constant definition for some constants
reduced weight for poise
refuced weight for equipment time
|
2022-01-18 10:48:53 +05:30 |
|
roidujeu
|
dcc6b75c1c
|
fixed equip_time reverse logic, dimished effect_power's effect on CR
|
2022-01-18 10:48:53 +05:30 |
|
roidujeu
|
773bf9d9fd
|
changed the combat rating equation to a simpler one, which results in a more accurate weapon ranting.
|
2022-01-18 10:48:52 +05:30 |
|