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

3446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pfauenauge90
88826c9b1d asset cleanup 2020-03-27 15:27:42 +01:00
AdamWhitehurst
fc3005847c make triple strike continue without hits again 2020-03-27 07:03:26 -07:00
jshipsey
d3cfd120f7 third attack for triple strike 2020-03-27 01:57:30 -04:00
jshipsey
06d65ac72b small animation tweaks 2020-03-26 23:51:55 -04:00
Pfauenauge90
51ce452e92 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
Shane Handley
8d6a3ae82d SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
82af4766cc Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
timokoesters
2e6f85c554 Fix triplestrike bug 2020-03-26 23:29:12 +01:00
jshipsey
aca7e46bf5 fixed wield feet while jumping, tweaked charge anim 2020-03-26 18:26:23 -04:00
timokoesters
5124d3f413 Balancing, make fireball not holdable, arrow knockback 2020-03-26 22:56:33 +01:00
timokoesters
b22d383564 Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants 2020-03-26 22:56:33 +01:00
timokoesters
afcfeda5d3 Better glider physics 2020-03-26 22:56:33 +01:00
timokoesters
7039197b83 Balancing 2020-03-26 22:56:33 +01:00
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
Imbris
8ac42c396b Merge branch 'capucho/free_look' into 'master' 
Implement #505

Closes #505

See merge request veloren/veloren!854
 2020-03-26 21:22:21 +00:00
Capucho
a8673cd5e4 Implement #505 2020-03-26 21:22:21 +00:00
Songtronix
e4a732f01f Merge branch 'songtronix/log-server-version' into 'master' 
log server version

See merge request veloren/veloren!860
 2020-03-26 12:15:55 +00:00
Songtronix
43a9e47bbe feat: log server version 2020-03-26 12:41:30 +01: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