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

3424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
timokoesters
0eebf945fe Glowing fireballs, no gravity 2020-03-23 13:55:52 +01:00
timokoesters
5194cef03a Easier swimming, better damage calculation for explosions 2020-03-23 12:50:08 +01:00
timokoesters
fb16106960 Merge remote-tracking branch 'origin/master' into combat 2020-03-23 11:30:47 +01:00
Songtronix
30e6bbc851 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
eddf3ec658 raised run anim speed 20% 2020-03-22 21:32:34 -04:00
Capucho
0358caa173 Fix the wrong logs directory being displayed on panic 2020-03-22 22:06:05 +00:00
jshipsey
9cbbe0311f rewrote the whole stupid skeleton to work much smarter 2020-03-22 16:06:53 -04:00
Adam Whitehurst
68e3e36c6a Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 12:50:55 -07:00
Adam Whitehurst
a510283277 update triple_strike 2020-03-22 12:50:52 -07:00
timokoesters
f3ca06aa71 feat: fireball explosions 2020-03-22 20:40:16 +01:00
Pfauenauge90
1f363da248 small fixes, weapon models 2020-03-22 18:51:23 +01:00
jshipsey
3baa0471ec Merge branch 'combat' of https://gitlab.com/veloren/veloren into combat 2020-03-22 11:55:35 -04:00
jshipsey
0773524031 wield idle, wield run 2020-03-22 11:55:28 -04:00
timokoesters
0456d3cbed Better staff M1, random +1 damage, better attackrange,angle impl 2020-03-22 16:26:32 +01:00
Pfauenauge90
387ab4a57e added new stuff to chests 2020-03-22 16:19:30 +01:00
Marcel
159d8df659 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
48b5977551 add watchtower support and fix CMD in Dockerfile 2020-03-22 14:56:14 +00:00
Pfauenauge90
662f5b1037 removed warnings and item test values 2020-03-22 14:55:08 +01:00
Pfauenauge90
61e2a986f2 item images 2020-03-22 14:38:21 +01:00
Adam Whitehurst
5016b8da3a consistent naming 2020-03-22 05:49:48 -07:00
Adam Whitehurst
db8d89a4d9 * rename CharacterState equals() -> same_variant() 2020-03-22 05:46:09 -07:00
Adam Whitehurst
afa6e43dd5 * remove Component Trait from CharacterAbility 2020-03-22 05:45:39 -07:00