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,746 Commits 151 Branches 18 Tags 2.1 GiB
c0bd0279fc
Commit Graph

3746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jshipsey
0ffff86e25 third attack for triple strike 2020-03-27 01:57:30 -04:00
jshipsey
1c3d1d260c small animation tweaks 2020-03-26 23:51:55 -04:00
Pfauenauge90
50b7206577 asset cleanup, map visuals 2020-03-27 04:06:27 +01:00
Shane Handley
362771be4b SFX and unit test fixes. 2020-03-27 12:06:25 +11:00
timokoesters
fe2aa7da7b Merge remote-tracking branch 'origin/master' into combat 2020-03-26 23:43:33 +01:00
timokoesters
7a9c7628db Fix triplestrike bug 2020-03-26 23:29:12 +01:00
jshipsey
7692f1d354 fixed wield feet while jumping, tweaked charge anim 2020-03-26 18:26:23 -04:00
timokoesters
2b68adff51 Balancing, make fireball not holdable, arrow knockback 2020-03-26 22:56:33 +01:00
timokoesters
8010e5afb4 Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants 2020-03-26 22:56:33 +01:00
timokoesters
e573fbbce5 Better glider physics 2020-03-26 22:56:33 +01:00
timokoesters
b9c85b9beb Balancing 2020-03-26 22:56:33 +01:00
AdamWhitehurst
8d1f93a2d1 ore responsive oreintating 2020-03-26 14:48:51 -07:00
AdamWhitehurst
7f1a90ae27 Prevent transition if failed hit 2020-03-26 14:44:39 -07:00
Imbris
63d5e196e9 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
03396eb77e Implement #505 2020-03-26 21:22:21 +00:00
Songtronix
9cb8dc1df1 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
604a6cf169 feat: log server version 2020-03-26 12:41:30 +01:00
Shane Handley
0446a56f00 Regen energy when sitting. 2020-03-26 18:23:57 +11:00
jshipsey
175fea98ef more cleanup, WIP fake swimming 2020-03-26 01:35:25 -04:00
Imbris
e6f50b4032 Replace uses of normalized() to avoid setting ori to NaN values, tweak triple strike code 2020-03-25 18:49:15 -04:00
timokoesters
ae0a3076e3 Allow holding ability keys again 2020-03-25 23:10:50 +01:00
timokoesters
74eacbe27c fix "Npcs can't be healed anymore" 2020-03-25 22:57:14 +01:00
Pfauenauge90
5f10cdf0c6 adjusted foot step sounds, inventory space above bag 2020-03-25 21:06:01 +01:00
Pfauenauge90
8b05dda1d9 assset cleanup, transparency, new icons 2020-03-25 16:47:48 +01:00
AdamWhitehurst
964256541e batter loadout swap logic 2020-03-25 07:58:26 -07:00
AdamWhitehurst
857652ee23 Update triple_strike: 
* add knockback
* prevent infinite repeat
* more dashes
 2020-03-25 07:24:55 -07:00
Capucho
7048163153 Fixed Some minor bugs on the password field 2020-03-25 12:51:43 +00:00
Imbris
3889ec7292 climbing tweaks, fix triple strike overflow, fix Last<CharacterState> 
not registered
 2020-03-25 02:05:28 -04:00
Imbris
6ba158b7e1 Input handling changes 2020-03-25 01:38:37 -04:00
Adam Whitehurst
37ec191021 update controller tick fn 2020-03-25 01:38:25 -04:00
Imbris
2897e898c2 move character state component to section reflecting its current sync strategy 2020-03-25 01:37:56 -04:00
jshipsey
c7d9b5ae0f fixed critter animation 2020-03-25 01:29:55 -04:00
jshipsey
047f6b8a01 fixed swimming, better charge 2020-03-25 01:22:07 -04:00
jshipsey
a6537ed69b starting foot movement with attacks, clearing some dead code 2020-03-25 00:15:06 -04:00
Pfauenauge90
550dd144bc new icon art 2020-03-25 01:41:43 +01:00
timokoesters
7f02f5e7d2 Npcs can't be healed anymore 2020-03-24 23:03:57 +01:00
Capucho
7851a407b1 Fix the cursor lagging behind on password field 2020-03-24 21:41:59 +00:00
timokoesters
2117bb05d0 Healing staff 2020-03-24 22:03:11 +01:00
timokoesters
f0ce088810 Add lights and gravity again 2020-03-24 20:31:54 +01:00
timokoesters
58585e0810 Better climbing, fireball impl 2020-03-24 20:09:23 +01:00
timokoesters
ea2500e7ab Add minimum prepare duration to fireball and bow 2020-03-24 14:42:31 +01:00
timokoesters
99e7e1f785 Split staff into 3 abilities 2020-03-24 14:00:22 +01:00
jshipsey
7a4f0fa9ac climb fix, const tweak update, trying equip anims 2020-03-24 00:24:31 -04:00
Pfauenauge90
7f30ec3d55 colors for inventory space counter 2020-03-24 01:31:14 +01:00
Pfauenauge90
060ebbc861 healing sceptre 2020-03-24 01:11:14 +01:00
timokoesters
43d4e8aad2 Better inventory counter 2020-03-24 00:38:00 +01:00
timokoesters
1c145e8d3a Add inventory counter 2020-03-24 00:23:21 +01:00
timokoesters
fbb24e7c8a Even better fireballs 2020-03-23 22:52:35 +01:00
timokoesters
9d47fd8c3e Better explosions 2020-03-23 18:13:14 +01:00
timokoesters
c01cd62f5f Move meta.dat to ron, so we don't create memory allocation errors 2020-03-23 14:18:05 +01:00