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,167 Commits 151 Branches 18 Tags
b7805e3ab7
Commit Graph

2167 Commits

Author SHA1 Message Date
timokoesters
f7f6fd98dd Make npcs roll correctly 2019-08-30 22:50:53 -04:00
timokoesters
8900a9e4f3 Fix rolling for the player 2019-08-30 22:50:53 -04:00
jshipsey
01105d21e5 fixed tiny feet in char creation 2019-08-30 22:50:53 -04:00
jshipsey
5a59f4bb22 readded cidle 2019-08-30 22:50:53 -04:00
jshipsey
2496256ff6 some stuff fixed, other stuff still broken 2019-08-30 22:50:53 -04:00
timokoesters
efddbcd5f9 Use movement anim as base and action anim as overwrite 2019-08-30 22:50:53 -04:00
jshipsey
737bddc15d separate static anims for feet (run/static) 2019-08-30 22:50:53 -04:00
timokoesters
7099ef99b4 Split animations 2019-08-30 22:50:53 -04:00
timokoesters
4fdc1727bd Allow non player entites to be removed again 2019-08-30 22:47:39 -04:00
Timo Koesters
4a2f0fdf57 Merge branch 'timo-inventory' into 'master' 
Timo inventory

See merge request
2019-08-30 22:37:40 +00:00
timokoesters
ade4bd8887
Rename controller main, alt to primary, secondary 2019-08-31 00:13:45 +02:00
timokoesters
82a8a4bc7e
Remove inventory::swap and improve inventory::insert 2019-08-31 00:09:25 +02:00
timokoesters
e7c112fec1
Make boost RMB go upward again 2019-08-31 00:08:44 +02:00
timokoesters
2b0f6a1d9c
Rename activate_inventory_slot to use_inventory_slot 2019-08-30 22:46:45 +02:00
timokoesters
5d1ffdfcce
Make inventory::get return a reference 2019-08-30 22:42:43 +02:00
timokoesters
5fe2b81ec8
Avoid right-ward shift 2019-08-30 22:32:47 +02:00
timokoesters
1c7beaedae
Return the item again if slot was not wrong 2019-08-30 21:03:49 +02:00
timokoesters
891c4cc99c
Implement icons based on weapon 2019-08-29 21:48:05 +02:00
timokoesters
0e64c13996
Remove warnings 2019-08-29 19:54:53 +02:00
timokoesters
9eff8fc0c4
Rename Teleport to Boost 2019-08-29 19:44:30 +02:00
timokoesters
a51c20bd31
Use RMB to boost away again 2019-08-29 19:44:30 +02:00
Pfauenauge90
7c188c8900
Axe offset 2019-08-29 19:44:29 +02:00
Pfauenauge90
987a179119
fmt 2019-08-29 19:44:29 +02:00
Pfauenauge90
77205f7a8f
changed debug wand visuals, added icons for 2h sword main and alt attack 2019-08-29 19:44:29 +02:00
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
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 

See merge request
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
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
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
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