e43ed3826d
Merge branch 'timo-keybinds' into 'master'
...
Timo keybinds
See merge request veloren/veloren!464
2019-08-27 14:10:56 +00:00
e2c8532958
Make respawn hint text base on key bindings
2019-08-27 14:42:53 +02:00
765391b4ee
Allow mapping the same key to multile actions (LMB = attack + respawn)
2019-08-27 14:03:40 +02:00
0960b03455
Rename attack, block to main, alt
2019-08-27 14:03:39 +02:00
66cad9b8c8
Merge branch 'timo-attack-delay' into 'master'
...
Timo attack delay
See merge request veloren/veloren!463
2019-08-27 12:01:45 +00:00
60bf484b2c
End rolling when player is in the air
2019-08-27 11:06:55 +02:00
a6a78f4d76
Add attack buildup duration (Delay before hit)
2019-08-27 11:06:54 +02:00
d7d719cf38
Make action durations constants
2019-08-27 11:06:54 +02:00
1f7e2645b8
Rename tool strength/damage to power
2019-08-26 20:05:13 +02:00
da6e9b5d10
Merge branch 'timo-components' into 'master'
...
Better component states
See merge request veloren/veloren!458
2019-08-26 15:47:43 +00:00
7d55909210
Remove vek patch, it's on crates.io now
2019-08-26 17:26:16 +02:00
dd858e8d1b
Make pipeline succeed
2019-08-26 14:05:17 +02:00
7742a3c262
Simplify code
2019-08-26 13:12:45 +02:00
34c959bef0
Update to github vek repo
2019-08-26 13:12:45 +02:00
b8bec45f9a
Remove unnecessary map
2019-08-26 13:12:44 +02:00
bc595b77f3
Prevent problems with no vel while rolling in the future
2019-08-26 13:12:44 +02:00
2522eee0ab
Add todo making glide an ability/item
2019-08-26 13:12:44 +02:00
185d2158a6
Put combat related values into constants
2019-08-26 13:12:43 +02:00
8ef1491fb5
Make falldamage local, don't use force update for local, cleanup
2019-08-26 13:12:43 +02:00
816633c3f3
fmt
2019-08-26 13:12:43 +02:00
4f1c92d4fd
Fix roll from cliff bug
2019-08-26 13:12:42 +02:00
a27dfda5fb
Implement unstoppable rolling
2019-08-26 13:12:42 +02:00
766dfcd10d
Use look_dir when blocking
2019-08-26 13:12:41 +02:00
e4dced418f
Add basis for projectiles
...
But we have no controller action to spawn them yet
2019-08-26 13:12:41 +02:00
0f32eee451
Split Events in ServerEvent and LocalEvent
2019-08-26 13:12:41 +02:00
8a3f1ffa71
Remove dbg
2019-08-26 13:12:40 +02:00
0732a20314
Only use look_dir for ori when wielded or attacking
2019-08-26 13:12:40 +02:00
b60e823ae2
Improve combat range
2019-08-26 13:12:40 +02:00
9fc5ba7d77
Clean up entity spawning code
2019-08-26 13:12:39 +02:00
f709a75619
Make aiming 2D
2019-08-26 13:12:39 +02:00
694070363a
Make aiming more precise
2019-08-26 13:12:38 +02:00
660f31ef48
Look in the direction of the camera
2019-08-26 13:12:38 +02:00
f7c43b56de
idle block animation
2019-08-26 13:12:38 +02:00
2dfe94bf0b
Block when pressing right click while looking at the attacker
2019-08-26 13:12:37 +02:00
83526eec30
Remove unnecessary components
2019-08-26 13:12:37 +02:00
d0f3ecf6ca
Make gliding the error animation
2019-08-26 13:12:37 +02:00
2f043f8404
Fix water
2019-08-26 13:12:36 +02:00
0f5bd4f9de
Remove animation warnings
2019-08-26 13:12:36 +02:00
a7a8037a43
Fix characterstate in movement.rs, not phys.rs
2019-08-26 13:12:35 +02:00
4773950ca0
Reset controller after each tick
2019-08-26 13:12:35 +02:00
36c88e0b91
Allow non player entites to be removed again
2019-08-26 13:12:35 +02:00
139628257a
Reset controller after each tick
2019-08-26 13:12:34 +02:00
019ce11d5d
Move from state components to single CharaterState struct
...
This makes split animations easy and improves overall code quality
2019-08-26 13:12:34 +02:00
1bccf3361d
Merge branch 'sharp/worldgen_tweaks' into 'master'
...
Fixes to worldgen and adding a debug command.
See merge request veloren/veloren!462
2019-08-26 10:27:25 +00:00
608685ef36
Fixes to worldgen and adding a debug command.
...
Humidity and temperature are now indexed to uniform altitude *over land
chunks* (and water chunks adjacent to land) rather than over the whole
range of altitude. This is necessary in order to satisfy the uniformity
conditions of the formula for weighted sum CDF.
Additionally, fixes the computation of whether a tree should be
generated or not. Previously, it was using a source of randomness
scaled to use much less than the full 0-1 range; this has been resolved.
This makes for much nicer and more gradual transitions between densities
and reduces the amount of completely barren landscapes, while also
making forests larger.
Finally, this commit adds a server command, debug_column, which returns
some useful debug information about a column given an x and y
coordinate. This is useful for debugging worldgen.
2019-08-26 11:52:25 +02:00
7da4d6c9c5
Merge branch 'sharp/temperature_free_chaos' into 'master'
...
Chaos doesn't depend on temperature anymore.
See merge request veloren/veloren!461
2019-08-25 17:10:15 +00:00
6cb33ba004
Fix clean code lints.
2019-08-25 18:17:51 +02:00
5dfbf86d87
Chaos doesn't depend on temperature anymore.
...
Also fix some things to use a consistent coordinate system and bump up
tree density and variation around tree density in hopes of creating more
aesthetically pleasing jungles. However, this does change worldgen a
bit, so please make sure you look through it before merging.
2019-08-25 17:49:33 +02:00
dee742bf66
Merge branch 'sharp/humidity_ignores_ocean' into 'master'
...
Make humidity ignore ocean chunks.
See merge request veloren/veloren!460
2019-08-24 19:47:22 +00:00
d926965e7c
fmt
2019-08-24 15:32:07 -04:00
