Commit Graph

2262 Commits

Author SHA1 Message Date
efddbcd5f9 Use movement anim as base and action anim as overwrite 2019-08-30 22:50:53 -04:00
737bddc15d separate static anims for feet (run/static) 2019-08-30 22:50:53 -04:00
7099ef99b4 Split animations 2019-08-30 22:50:53 -04:00
4fdc1727bd Allow non player entites to be removed again 2019-08-30 22:47:39 -04:00
4a2f0fdf57 Merge branch 'timo-inventory' into 'master'
Timo inventory

See merge request veloren/veloren!468
2019-08-30 22:37:40 +00:00
ade4bd8887 Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
82a8a4bc7e Remove inventory::swap and improve inventory::insert 2019-08-31 00:09:25 +02:00
e7c112fec1 Make boost RMB go upward again 2019-08-31 00:08:44 +02:00
2b0f6a1d9c Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
5d1ffdfcce Make inventory::get return a reference 2019-08-30 22:42:43 +02:00
5fe2b81ec8 Avoid right-ward shift 2019-08-30 22:32:47 +02:00
1c7beaedae Return the item again if slot was not wrong 2019-08-30 21:03:49 +02:00
891c4cc99c Implement icons based on weapon 2019-08-29 21:48:05 +02:00
0e64c13996 Remove warnings 2019-08-29 19:54:53 +02:00
9eff8fc0c4 Rename Teleport to Boost 2019-08-29 19:44:30 +02:00
a51c20bd31 Use RMB to boost away again 2019-08-29 19:44:30 +02:00
7c188c8900 Axe offset 2019-08-29 19:44:29 +02:00
987a179119 fmt 2019-08-29 19:44:29 +02:00
77205f7a8f changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
e4ca33de5b Add debug mode item giving speed boost in look_dir on click 2019-08-29 19:44:28 +02:00
af780acc84 Use comp::Stats to store Equipment, make char weapon selection work 2019-08-29 19:44:28 +02:00
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
9941d15074 common: Stop abusing wild animals for bit shifts 2019-08-29 18:06:52 +02:00
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
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
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