Commit Graph

5350 Commits

Author SHA1 Message Date
Michael Droogleever Fortuyn
a3c4040063 Scene terrain worker refactor
Simplify ChunkMeshState's active worker tracking to a bool,
as the tick value was never being used.
2020-09-19 16:13:29 +02:00
Joshua Barretto
f22ee945ec Merge branch 'scott-c/projectiles' into 'master'
align first person projectiles with first person camera and crosshair

See merge request veloren/veloren!1073
2020-09-19 12:04:14 +00:00
scott-c
2686598f1f Improve first-person projectile aiming 2020-09-19 19:14:23 +08:00
Joshua Yanovski
b2dc95239d Merge branch 'martin-t/dust' into 'master'
Fix typo: velorite dusk->dust

See merge request veloren/veloren!1390
2020-09-18 23:54:17 +00:00
Monty Marz
d50b63c103 Merge branch 'pfau/char_creation_additions' into 'master'
Multiple UI Additions

See merge request veloren/veloren!1389
2020-09-18 23:17:47 +00:00
Monty Marz
5fe79e1c6a new loading screen bgs (part 1)
Add a basic random feature to char creation

loading screen bg (part 2)

loading screen changes, random button graphics
Random appearance also pick a random npc name
2020-09-18 23:17:47 +00:00
Martin Taibr
a9756607a3 fix typo: velorite dusk->dust 2020-09-19 00:43:29 +02:00
Justin Shipsey
6f2161c740 Merge branch 'slipped/betterthings' into 'master'
better quad anims, new animals, theropods, golem

See merge request veloren/veloren!1384
2020-09-18 18:10:28 +00:00
Snowram
f9fada87cf Addresses comments 2020-09-18 18:45:03 +02:00
jshipsey
8330d087e6 clippy 2020-09-17 22:58:02 -04:00
jshipsey
90e5bbaac0 rebase 2020-09-17 22:41:40 -04:00
jshipsey
fff6a6fb0a finish odonto 2020-09-17 22:32:11 -04:00
jshipsey
b0767cb7a5 minor anim fix 2020-09-17 22:32:11 -04:00
jshipsey
5bb45a4861 spawn tweaks, improved odonto 2020-09-17 22:32:11 -04:00
Snowram
fecc40ad8e Better quadmed legs/feet ratio 2020-09-17 22:32:11 -04:00
jshipsey
8a43cba3b6 quadsmall manifest changes 2020-09-17 22:32:11 -04:00
Snowram
62f6a5799a Initial quadmed feed animation 2020-09-17 22:32:10 -04:00
jshipsey
789d93b52f new models, shockwave anim 2020-09-17 22:32:10 -04:00
jshipsey
03b7320b4b general housekeeping 2020-09-17 22:32:10 -04:00
jshipsey
06b39b9072 species specific improvement 2020-09-17 22:32:10 -04:00
Snowram
6a16268ff0 Quadmed run anim tweaks and deers offsets tweaks 2020-09-17 22:32:10 -04:00
jshipsey
b781a1765b theropod run 2020-09-17 22:32:10 -04:00
jshipsey
2589c0cfc6 thropod manifest changes 2020-09-17 22:32:10 -04:00
Snowram
9308cabeb8 add deer, beaver and porcupine npcs 2020-09-17 22:32:10 -04:00
jshipsey
3eeaf7e8c9 idle for theropod, corrections to swimming 2020-09-17 22:32:10 -04:00
Snowram
ee95550355 Tweak offsets for theropods 2020-09-17 22:32:10 -04:00
jshipsey
cd6e1ad45f haul out the critter skele, add theropod 2020-09-17 22:32:10 -04:00
jshipsey
aa440c02bb proper cycles on quadmed movement 2020-09-17 22:32:09 -04:00
Snowram
1097dbcc25 Improve adaptative quadmed run 2020-09-17 22:32:09 -04:00
jshipsey
883aa1754b refining pace setup. refined species anim variables 2020-09-17 22:32:09 -04:00
jshipsey
47d5c635de first attempt at adaptive stride system 2020-09-17 22:32:09 -04:00
jshipsey
b514fb4159 fix for animal attack motion bug 2020-09-17 22:32:09 -04:00
jshipsey
ecae71c016 gliders as items. anim improvements 2020-09-17 22:32:09 -04:00
jshipsey
7525479a4c fit dt issue 2020-09-17 22:18:49 -04:00
jshipsey
412495e5fc assets/manifests 2020-09-17 22:18:49 -04:00
jshipsey
bd1984bf28 golem addition, fix for axe attack 2020-09-17 22:18:49 -04:00
Joshua Yanovski
4e07258319 Merge branch 'xvar/item-persistence' into 'master'
Persistence overhaul

Closes #678

See merge request veloren/veloren!1342
2020-09-17 23:02:14 +00:00
Ben Wallis
712f2e9c97 * Moved migrations to beginning of server initialisation
* Added migrations for entity ID changes to existing tables
2020-09-17 23:02:14 +00:00
Marcel
3ce5a9d0e7 Merge branch 'reenable_ci' into 'master'
partially fix pages

See merge request veloren/veloren!1388
2020-09-17 10:40:03 +00:00
Marcel Märtens
b12af1d00c partially fix pages 2020-09-17 12:03:50 +02:00
Marcel
74caa01185 Merge branch 'fix_metrics' into 'master'
fix client stats, difference client/player

See merge request veloren/veloren!1387
2020-09-16 23:07:32 +00:00
Marcel Märtens
cb6fa52eae fix client stats, difference client/player 2020-09-17 00:19:48 +02:00
Marcel
95fcea086b Merge branch 'xMAC94x/better-metrics' into 'master'
Better Metrics for Server

See merge request veloren/veloren!1381
2020-09-16 16:58:22 +00:00
Marcel Märtens
3c58b64689 add detailed information on state tick timings 2020-09-16 18:24:18 +02:00
Marcel Märtens
184d405f10 Better Metrics for Server
- Player online is now seperated into players connected and disconnected and is event driven
 - Metrics for ChunkGeneration: this is the server side for tracking actuall generation
 - Metrics for Chunk Network Requests
2020-09-16 18:14:04 +02:00
Marcel
00598e6d4b Merge branch 'fix_tracing_spam' into 'master'
fix spam due to mio tracing

See merge request veloren/veloren!1385
2020-09-16 09:32:54 +00:00
Marcel Märtens
9833ec91ea fix spam due to mio tracing 2020-09-16 10:13:37 +02:00
Joshua Yanovski
8d829f9c69 Merge branch 'tylerlowrey/add-ban-unban-kick-cmds' into 'master'
Tylerlowrey/add ban unban kick cmds

See merge request veloren/veloren!1382
2020-09-14 07:18:33 +00:00
Joshua Yanovski
19485b6a00 Add a DisconnectReason enum. 2020-09-14 08:16:09 +02:00
tylerlowrey
bdff4bc04c Prevent client from ignoring Kicked event 2020-09-14 07:54:05 +02:00