timokoesters
155605841b
Use comp::Stats to store Equipment, make char weapon selection work
2019-08-29 19:44:28 +02:00
Joshua Barretto
b53c882dc7
Merge branch 'haslersn/no-cheetah' into 'master'
...
common: Stop abusing wild animals for bit shifts
See merge request veloren/veloren!467
2019-08-29 17:07:52 +00:00
haslersn
9844e95e5f
common: Stop abusing wild animals for bit shifts
2019-08-29 18:06:52 +02:00
Joshua Barretto
2cf52b7093
Merge branch 'xp-226' into 'master'
...
Make XP a u32 rather than f32
Closes #226
See merge request veloren/veloren!465
2019-08-27 22:33:14 +00:00
yashaslokesh
be71aea20b
Changed exp type from f64 to u32 and altered exp calculations and function signatures to adhere to the new types
...
Signed-off-by: Yashas Lokesh <yashas.lokesh@gmail.com>
2019-08-27 22:33:14 +00:00
Timo Koesters
1bd3f0ab28
Merge branch 'timo-keybinds' into 'master'
...
Timo keybinds
See merge request veloren/veloren!464
2019-08-27 14:10:56 +00:00
timokoesters
cd061aba85
Make respawn hint text base on key bindings
2019-08-27 14:42:53 +02:00
timokoesters
6b4dfcc533
Allow mapping the same key to multile actions (LMB = attack + respawn)
2019-08-27 14:03:40 +02:00
timokoesters
186db16707
Rename attack, block to main, alt
2019-08-27 14:03:39 +02:00
Timo Koesters
838eab8637
Merge branch 'timo-attack-delay' into 'master'
...
Timo attack delay
See merge request veloren/veloren!463
2019-08-27 12:01:45 +00:00
timokoesters
b725b0e9ea
End rolling when player is in the air
2019-08-27 11:06:55 +02:00
timokoesters
74677784c0
Add attack buildup duration (Delay before hit)
2019-08-27 11:06:54 +02:00
timokoesters
72564cf8b4
Make action durations constants
2019-08-27 11:06:54 +02:00
timokoesters
869535e5a2
Rename tool strength/damage to power
2019-08-26 20:05:13 +02:00
Timo Koesters
e5413360b6
Merge branch 'timo-components' into 'master'
...
Better component states
See merge request veloren/veloren!458
2019-08-26 15:47:43 +00:00
timokoesters
269d179243
Remove vek patch, it's on crates.io now
2019-08-26 17:26:16 +02:00
timokoesters
84d0f61596
Make pipeline succeed
2019-08-26 14:05:17 +02:00
timokoesters
a7747fe965
Simplify code
2019-08-26 13:12:45 +02:00
timokoesters
c4879307af
Update to github vek repo
2019-08-26 13:12:45 +02:00
timokoesters
b89bfcbfc1
Remove unnecessary map
2019-08-26 13:12:44 +02:00
timokoesters
08fa6a3414
Prevent problems with no vel while rolling in the future
2019-08-26 13:12:44 +02:00
timokoesters
c278ac9927
Add todo making glide an ability/item
2019-08-26 13:12:44 +02:00
timokoesters
98f8196a16
Put combat related values into constants
2019-08-26 13:12:43 +02:00
timokoesters
05f2f168fd
Make falldamage local, don't use force update for local, cleanup
2019-08-26 13:12:43 +02:00
timokoesters
eb34e5bb27
fmt
2019-08-26 13:12:43 +02:00
timokoesters
b96557d012
Fix roll from cliff bug
2019-08-26 13:12:42 +02:00
timokoesters
a715a84ea7
Implement unstoppable rolling
2019-08-26 13:12:42 +02:00
timokoesters
01410569a4
Use look_dir when blocking
2019-08-26 13:12:41 +02:00
timokoesters
3258fa3a3c
Add basis for projectiles
...
But we have no controller action to spawn them yet
2019-08-26 13:12:41 +02:00
Songtronix
814e858720
Split Events in ServerEvent and LocalEvent
2019-08-26 13:12:41 +02:00
timokoesters
75368dbac1
Remove dbg
2019-08-26 13:12:40 +02:00
timokoesters
62745c4cad
Only use look_dir for ori when wielded or attacking
2019-08-26 13:12:40 +02:00
timokoesters
295969517c
Improve combat range
2019-08-26 13:12:40 +02:00
timokoesters
e8ccbe75fa
Clean up entity spawning code
2019-08-26 13:12:39 +02:00
timokoesters
b826edf6e8
Make aiming 2D
2019-08-26 13:12:39 +02:00
timokoesters
0912de2a26
Make aiming more precise
2019-08-26 13:12:38 +02:00
timokoesters
e90f95bc75
Look in the direction of the camera
2019-08-26 13:12:38 +02:00
jshipsey
39bd888a7c
idle block animation
2019-08-26 13:12:38 +02:00
timokoesters
e7c61c30cc
Block when pressing right click while looking at the attacker
2019-08-26 13:12:37 +02:00
timokoesters
e42ffb362a
Remove unnecessary components
2019-08-26 13:12:37 +02:00
timokoesters
b748c1a6e5
Make gliding the error animation
2019-08-26 13:12:37 +02:00
timokoesters
0bb70d8182
Fix water
2019-08-26 13:12:36 +02:00
timokoesters
5ab03abbdd
Remove animation warnings
2019-08-26 13:12:36 +02:00
timokoesters
799c73d43a
Fix characterstate in movement.rs, not phys.rs
2019-08-26 13:12:35 +02:00
timokoesters
808467c616
Reset controller after each tick
2019-08-26 13:12:35 +02:00
timokoesters
4d6a32e00f
Allow non player entites to be removed again
2019-08-26 13:12:35 +02:00
timokoesters
90c81b4759
Reset controller after each tick
2019-08-26 13:12:34 +02:00
timokoesters
5d5ccd7b99
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
Joshua Barretto
2211f79d28
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
Joshua Yanovski
c02f2a7f9e
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
