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

4413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Shipsey
f9079beb6b Merge branch 'snowram/quadsmall-fix' into 'master' 
post-quad rewrite fixup

See merge request veloren/veloren!1161
 2020-07-06 06:07:29 +00:00
Snowram
cbf7d43fb4 post-quad rewrite fixup 2020-07-06 06:07:29 +00:00
Joshua Barretto
621c8257ce Merge branch 'zesterer/server-fixes' into 'master' 
Server bug fixes

See merge request veloren/veloren!1159
 2020-07-05 19:41:30 +00:00
Marcel
35d681eb7f Merge branch 'xMAC94x/network-small-fixes' into 'master' 
X mac94x/network small fixes

See merge request veloren/veloren!1160
 2020-07-05 19:40:22 +00:00
Joshua Barretto
5ae6582f2f Merge branch 'qutrin/another-fix' into 'master' 
Fix loot table (again)

See merge request veloren/veloren!1157
 2020-07-05 19:13:58 +00:00
Joshua Barretto
4e3d961dfc Increased network test timeouts 2020-07-05 19:56:06 +01:00
Marcel Märtens
f544ea59a2 compress everything 2020-07-05 20:14:47 +02:00
Joshua Barretto
9b5e2d7551 Fixed multiple char select bug 2020-07-05 18:05:00 +01:00
Marcel Märtens
51fc1a71f2 small fix 2020-07-05 18:54:34 +02:00
Piotr Korgól
726aba9997 Add a test for the loot table's validity 2020-07-05 18:52:36 +02:00
Piotr Korgól
1c3fdf59c7 Fix loot table (again) 2020-07-05 18:52:34 +02:00
Joshua Barretto
5e983b4b07 Merge branch 'zesterer/bombs' into 'master' 
Added bombs, training dummies, throwable items, more block kinds, weaker explosions

See merge request veloren/veloren!1155
 2020-07-05 16:45:19 +00:00
Joshua Barretto
afcf72d7e9 Removed bomb timeout 2020-07-05 16:15:51 +01:00
Joshua Barretto
4da106aec1 Added training dummies 2020-07-05 16:15:51 +01:00
Joshua Barretto
a0b3c4e9a4 Made fluids block explosions 2020-07-05 16:15:51 +01:00
Joshua Barretto
d5e0a7d351 Added bombs to loot table 2020-07-05 16:15:51 +01:00
Joshua Barretto
40ff4923dc Added bombs, throwable items, more block kinds, weaker explosions 2020-07-05 16:15:48 +01:00
Justin Shipsey
58086e1788 Merge branch 'snowram/quad-rework' into 'master' 
quadruped rewrite

See merge request veloren/veloren!1116
 2020-07-05 15:00:14 +00:00
jshipsey
840d228a20 remove slowmo test mode 2020-07-05 10:00:44 -04:00
jshipsey
2bec9b418f clippy fixes 2020-07-05 09:39:56 -04:00
jshipsey
a80e636100 tweaks and fixes 2020-07-05 09:39:55 -04:00
Snowram
1acc4937a3 Various small improvements to anims and models 2020-07-05 09:38:15 -04:00
Joshua Barretto
188bdccd3c Velocity-corrected bezier pathfinding control, swimming control 2020-07-05 09:38:15 -04:00
jshipsey
b4acd76435 more latitude tilt, better attack anims, addressed aesthetic concerns, deleted dead assets 2020-07-05 09:38:15 -04:00
Joshua Barretto
fb8ab18346 Smoother pathfinding for fast animals 2020-07-05 09:38:14 -04:00
jshipsey
efad612497 remove warnings, rebase fix 2020-07-05 09:38:14 -04:00
jshipsey
b793d969c8 minor changes to account for movement speeds 2020-07-05 09:38:14 -04:00
Joshua Barretto
f55843c167 More tolerant pathfinding 2020-07-05 09:38:14 -04:00
Joshua Barretto
79d52c0662 Run tilting, per-species running speed 2020-07-05 09:38:14 -04:00
jshipsey
43eac6f898 better everything 2020-07-05 09:38:14 -04:00
Snowram
b915d8c661 Salamander model fixes 2020-07-05 09:38:14 -04:00
jshipsey
21b6b3affb simplify quadmed run, integrate dampener variable 2020-07-05 09:38:14 -04:00
Snowram
bd87b13db0 Add offset to quadmed legs + various fixes and improvements 2020-07-05 09:38:14 -04:00
jshipsey
03a9d08f8e placeholder attack anim 2020-07-05 09:38:14 -04:00
jshipsey
843a7cef4c orientation tilt, make run frequency proportional to species size 2020-07-05 09:38:14 -04:00
jshipsey
9147af165d custom scaling by species 2020-07-05 09:38:14 -04:00
jshipsey
29181be268 pangolin and special pangolin variable 2020-07-05 09:38:14 -04:00
jshipsey
c16d491a38 quadlow spawn in world, continued adjustments 2020-07-05 09:38:14 -04:00
jshipsey
fc34209243 more run animation work, adjusting pivots 2020-07-05 09:38:14 -04:00
jshipsey
0780bcf160 animation tweaks, fix some idle 2020-07-05 09:38:14 -04:00
jshipsey
3616d115c9 starting on trot, removing some warnings 2020-07-05 09:38:14 -04:00
Snowram
7ea7629d2c Add wolf, frostfang and mouflon npcs 2020-07-05 09:38:14 -04:00
Snowram
6416a4cf2f Add tarasque and grolgar improvements 2020-07-05 09:38:14 -04:00
unknown
8b2b6aa06a Makes anim hotload work for quadlow 2020-07-05 09:38:14 -04:00
Snowram
cf55973dbf Add new tusk ram model 2020-07-05 09:38:13 -04:00
Snowram
a3a55f5bb2 Add rock snapper mob 2020-07-05 09:38:13 -04:00
Snowram
32ec72cc3a Add tortoise mob 2020-07-05 09:38:13 -04:00
Snowram
caa90cbe8e Add new grolgar model 2020-07-05 09:38:13 -04:00
Snowram
aec8690cd5 Set new lion model offsets, fix some jaws 2020-07-05 09:38:13 -04:00
unknown
02b6a57063 Add asp mob 2020-07-05 09:38:13 -04:00