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

3429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AdamWhitehurst
a66d6322e6 ore responsive oreintating 2020-03-26 14:48:51 -07:00
AdamWhitehurst
7b3a203b2a Prevent transition if failed hit 2020-03-26 14:44:39 -07:00
Shane Handley
2a5f50512f Regen energy when sitting. 2020-03-26 18:23:57 +11:00
jshipsey
6123d0bf63 more cleanup, WIP fake swimming 2020-03-26 01:35:25 -04:00
Imbris
cf48db6050 Replace uses of normalized() to avoid setting ori to NaN values, tweak triple strike code 2020-03-25 18:49:15 -04:00
timokoesters
09deabf244 Allow holding ability keys again 2020-03-25 23:10:50 +01:00
timokoesters
07ff464361 fix "Npcs can't be healed anymore" 2020-03-25 22:57:14 +01:00
Pfauenauge90
e1ae7a7081 adjusted foot step sounds, inventory space above bag 2020-03-25 21:06:01 +01:00
Pfauenauge90
0ee6f33d4e assset cleanup, transparency, new icons 2020-03-25 16:47:48 +01:00
AdamWhitehurst
7897008ec3 batter loadout swap logic 2020-03-25 07:58:26 -07:00
AdamWhitehurst
9f984998c9 Update triple_strike: 
* add knockback
* prevent infinite repeat
* more dashes
 2020-03-25 07:24:55 -07:00
Imbris
e1b0206740 climbing tweaks, fix triple strike overflow, fix Last<CharacterState> 
not registered
 2020-03-25 02:05:28 -04:00
Imbris
a1cf04fb22 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
4bfbdf7c84 update controller tick fn 2020-03-25 01:38:25 -04:00
Imbris
a5887bae8e move character state component to section reflecting its current sync strategy 2020-03-25 01:37:56 -04:00
jshipsey
9588c6a213 fixed critter animation 2020-03-25 01:29:55 -04:00
jshipsey
e657dfe745 fixed swimming, better charge 2020-03-25 01:22:07 -04:00
jshipsey
41bd0f1a56 starting foot movement with attacks, clearing some dead code 2020-03-25 00:15:06 -04:00
Pfauenauge90
b7feca6973 new icon art 2020-03-25 01:41:43 +01:00
timokoesters
eb89507782 Npcs can't be healed anymore 2020-03-24 23:03:57 +01:00
timokoesters
f9668943e9 Healing staff 2020-03-24 22:03:11 +01:00
timokoesters
2465d7acf2 Add lights and gravity again 2020-03-24 20:31:54 +01:00
timokoesters
2b65e631f6 Better climbing, fireball impl 2020-03-24 20:09:23 +01:00
timokoesters
5960a807bf Add minimum prepare duration to fireball and bow 2020-03-24 14:42:31 +01:00
timokoesters
2e33254db7 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
jshipsey
ee05d13328 climb fix, const tweak update, trying equip anims 2020-03-24 00:24:31 -04:00
Pfauenauge90
8c5c8fabdd colors for inventory space counter 2020-03-24 01:31:14 +01:00
Pfauenauge90
7f269fe62a healing sceptre 2020-03-24 01:11:14 +01:00
timokoesters
559d0e3b28 Better inventory counter 2020-03-24 00:38:00 +01:00
timokoesters
608cd345fc Add inventory counter 2020-03-24 00:23:21 +01:00
timokoesters
7ec211ddab Even better fireballs 2020-03-23 22:52:35 +01:00
timokoesters
fa4a3f3323 Better explosions 2020-03-23 18:13:14 +01:00
timokoesters
3aad4e16a6 Move meta.dat to ron, so we don't create memory allocation errors 2020-03-23 14:18:05 +01:00
timokoesters
ab9fdbd75e Glowing fireballs, no gravity 2020-03-23 13:55:52 +01:00
timokoesters
e7c370d03b Easier swimming, better damage calculation for explosions 2020-03-23 12:50:08 +01:00
timokoesters
71a8671a4a Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Songtronix
9b7b994530 Merge branch 'capucho/panic_log_wrong_directory' into 'master' 
Fix the wrong logs directory being displayed on panic

See merge request veloren/veloren!858
 2020-03-23 08:02:16 +00:00
jshipsey
995b36b204 raised run anim speed 20% 2020-03-22 21:32:34 -04:00
Capucho
7bd4492233 Fix the wrong logs directory being displayed on panic 2020-03-22 22:06:05 +00:00
jshipsey
5b76f3f90d rewrote the whole stupid skeleton to work much smarter 2020-03-22 16:06:53 -04:00
Adam Whitehurst
79f6f1331b Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 12:50:55 -07:00
Adam Whitehurst
fb9c832284 update triple_strike 2020-03-22 12:50:52 -07:00
timokoesters
5767d31190 feat: fireball explosions 2020-03-22 20:40:16 +01:00
Pfauenauge90
494e06532c small fixes, weapon models 2020-03-22 18:51:23 +01:00
jshipsey
5a04e37f67 Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 11:55:35 -04:00
jshipsey
f488c28a12 wield idle, wield run 2020-03-22 11:55:28 -04:00
timokoesters
cd0bf0084f Better staff M1, random +1 damage, better attackrange,angle impl 2020-03-22 16:26:32 +01:00
Pfauenauge90
15dc5ebbb8 added new stuff to chests 2020-03-22 16:19:30 +01:00
Marcel
288ced16e3 Merge branch 'xMAC94x/really-fix-docker' into 'master' 
add watchtower support and fix CMD in Dockerfile

See merge request veloren/veloren!857
 2020-03-22 14:56:35 +00:00
Marcel
6376827df8 add watchtower support and fix CMD in Dockerfile 2020-03-22 14:56:14 +00:00