Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,093 Commits 151 Branches 18 Tags
Commit Graph

2093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
timokoesters
e4ca33de5b
Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
timokoesters
af780acc84
Use comp::Stats to store Equipment, make char weapon selection work 2019-08-29 19:44:28 +02:00
Joshua Barretto
91a8fd55f6 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
9941d15074 common: Stop abusing wild animals for bit shifts 2019-08-29 18:06:52 +02:00
Joshua Barretto
f42d261f6d 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
11678fb952 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
e43ed3826d Merge branch 'timo-keybinds' into 'master' 
Timo keybinds

See merge request veloren/veloren!464
 2019-08-27 14:10:56 +00:00
timokoesters
e2c8532958
Make respawn hint text base on key bindings 2019-08-27 14:42:53 +02:00
timokoesters
765391b4ee
Allow mapping the same key to multile actions (LMB = attack + respawn) 2019-08-27 14:03:40 +02:00
timokoesters
0960b03455
Rename attack, block to main, alt 2019-08-27 14:03:39 +02:00
Timo Koesters
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
timokoesters
60bf484b2c
End rolling when player is in the air 2019-08-27 11:06:55 +02:00
timokoesters
a6a78f4d76
Add attack buildup duration (Delay before hit) 2019-08-27 11:06:54 +02:00
timokoesters
d7d719cf38
Make action durations constants 2019-08-27 11:06:54 +02:00
timokoesters
1f7e2645b8
Rename tool strength/damage to power 2019-08-26 20:05:13 +02:00
Timo Koesters
da6e9b5d10 Merge branch 'timo-components' into 'master' 
Better component states

See merge request veloren/veloren!458
 2019-08-26 15:47:43 +00:00
timokoesters
7d55909210
Remove vek patch, it's on crates.io now 2019-08-26 17:26:16 +02:00
timokoesters
dd858e8d1b
Make pipeline succeed 2019-08-26 14:05:17 +02:00
timokoesters
7742a3c262
Simplify code 2019-08-26 13:12:45 +02:00
timokoesters
34c959bef0
Update to github vek repo 2019-08-26 13:12:45 +02:00
timokoesters
b8bec45f9a
Remove unnecessary map 2019-08-26 13:12:44 +02:00
timokoesters
bc595b77f3
Prevent problems with no vel while rolling in the future 2019-08-26 13:12:44 +02:00
timokoesters
2522eee0ab
Add todo making glide an ability/item 2019-08-26 13:12:44 +02:00
timokoesters
185d2158a6
Put combat related values into constants 2019-08-26 13:12:43 +02:00
timokoesters
8ef1491fb5
Make falldamage local, don't use force update for local, cleanup 2019-08-26 13:12:43 +02:00
timokoesters
816633c3f3
fmt 2019-08-26 13:12:43 +02:00
timokoesters
4f1c92d4fd
Fix roll from cliff bug 2019-08-26 13:12:42 +02:00
timokoesters
a27dfda5fb
Implement unstoppable rolling 2019-08-26 13:12:42 +02:00
timokoesters
766dfcd10d
Use look_dir when blocking 2019-08-26 13:12:41 +02:00
timokoesters
e4dced418f
Add basis for projectiles 
But we have no controller action to spawn them yet
 2019-08-26 13:12:41 +02:00
Songtronix
0f32eee451
Split Events in ServerEvent and LocalEvent 2019-08-26 13:12:41 +02:00
timokoesters
8a3f1ffa71
Remove dbg 2019-08-26 13:12:40 +02:00
timokoesters
0732a20314
Only use look_dir for ori when wielded or attacking 2019-08-26 13:12:40 +02:00
timokoesters
b60e823ae2
Improve combat range 2019-08-26 13:12:40 +02:00
timokoesters
9fc5ba7d77
Clean up entity spawning code 2019-08-26 13:12:39 +02:00
timokoesters
f709a75619
Make aiming 2D 2019-08-26 13:12:39 +02:00
timokoesters
694070363a
Make aiming more precise 2019-08-26 13:12:38 +02:00
timokoesters
660f31ef48
Look in the direction of the camera 2019-08-26 13:12:38 +02:00
jshipsey
f7c43b56de
idle block animation 2019-08-26 13:12:38 +02:00
timokoesters
2dfe94bf0b
Block when pressing right click while looking at the attacker 2019-08-26 13:12:37 +02:00
timokoesters
83526eec30
Remove unnecessary components 2019-08-26 13:12:37 +02:00
timokoesters
d0f3ecf6ca
Make gliding the error animation 2019-08-26 13:12:37 +02:00
timokoesters
2f043f8404
Fix water 2019-08-26 13:12:36 +02:00
timokoesters
0f5bd4f9de
Remove animation warnings 2019-08-26 13:12:36 +02:00
timokoesters
a7a8037a43
Fix characterstate in movement.rs, not phys.rs 2019-08-26 13:12:35 +02:00
timokoesters
4773950ca0
Reset controller after each tick 2019-08-26 13:12:35 +02:00
timokoesters
36c88e0b91
Allow non player entites to be removed again 2019-08-26 13:12:35 +02:00
timokoesters
139628257a
Reset controller after each tick 2019-08-26 13:12:34 +02:00
timokoesters
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
Joshua Barretto
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