Commit Graph

6939 Commits

Author SHA1 Message Date
Joshua Barretto
5e9a35a7c9 Sync controllers with clients 2021-03-13 00:26:50 +00:00
Joshua Barretto
557d165f22 Prevented block-snapping too eagerly 2021-03-12 22:46:17 +00:00
Avi Weinstock
e7c41964c0 Fix fmt and clippy, and rename {psdr,psdw} to {read,write} in physics. 2021-03-12 17:14:08 -05:00
Joshua Barretto
d81671859a Relative velocity collisions 2021-03-12 19:49:20 +00:00
Joshua Barretto
33920f31ac More relative motion changes 2021-03-12 18:53:10 +00:00
Avi Weinstock
0b954f8db8 /airship angle command and RtSim airships. 2021-03-12 13:53:06 -05:00
Joshua Barretto
64cc97ad59 Mountable airships 2021-03-12 17:08:40 +00:00
Joshua Barretto
069f259315 Fixed water collision bug 2021-03-12 15:38:48 +00:00
Joshua Barretto
2c1c07c6b8 Made airship terrain hitboxes smaller 2021-03-12 15:26:12 +00:00
Joshua Barretto
fcaf2b50d1 Smooth airship movement 2021-03-12 14:56:47 +00:00
Joshua Barretto
d3ee035449 Made animations and friction ground-relative 2021-03-12 13:26:02 +00:00
Joshua Barretto
b3c45b0114 Fixed airship collisions under rotation, added position increment for velocity when on ground 2021-03-12 11:32:19 +00:00
Avi Weinstock
d98efb391b Account for model translation in the physics. The voxel collider still needs to be north-aligned for now. 2021-03-11 23:43:55 -05:00
James Melkonian
a70e569396 Allow spawned airships to move 2021-03-11 18:58:57 -08:00
Avi Weinstock
fe4c7a3f6a Airship fixes: figure culling, player hitbox bounds w.r.t. airships, physics state unioning. 2021-03-11 19:01:16 -05:00
Avi Weinstock
6d35e7c6d0 Airship progress: now possessable, and physics kind of works (desyncs from the visuals by a shift + scale, and rotation isn't done at all yet, but the contours are correct). 2021-03-11 17:27:03 -05:00
Avi Weinstock
1d0600851b Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-11 11:48:59 -05:00
Marcel
cf46ce70cf Merge branch 'xMAC94x/update-specs' into 'master'
update specs to get rid of old deps

See merge request veloren/veloren!1871
2021-03-10 13:14:23 +00:00
Marcel Märtens
b151a246c3 update specs to get rid of old deps 2021-03-10 13:22:17 +01:00
Marcel
39f5e969ba Merge branch 'update_deps' into 'master'
Stop required euc version (was done to hold back vek version)

See merge request veloren/veloren!1870
2021-03-10 02:28:44 +00:00
Marcel
524ded586d Merge branch 'aweinstock/validate-char-create' into 'master'
Validate starting item and body type server-side.

See merge request veloren/veloren!1869
2021-03-10 01:42:42 +00:00
Marcel
81959c0a89 Merge branch 'ccgauche/move-back-register-to-system' into 'master'
Moved back register to a system

See merge request veloren/veloren!1868
2021-03-10 00:56:33 +00:00
Bryan Quigley
506adb4eec Stop requiring specfici euc version (was done to hold back vek version)
Then ran cargo update
2021-03-09 15:53:24 -08:00
Avi Weinstock
f64c29f09d Validate starting item and body type server-side. 2021-03-09 18:28:25 -05:00
Marcel
afbc810b3e Merge branch 'xMAC94x/update_deps' into 'master'
update dependencies, including removal of some tracy deps as they are get through common/tracy

See merge request veloren/veloren!1867
2021-03-09 20:42:00 +00:00
ccgauche
10e5620642 Moved back register to a system 2021-03-09 21:16:23 +01:00
Marcel Märtens
d7df741671 update dependencies, including removal of some tracy deps as they are get through common/tracy 2021-03-09 20:17:29 +01:00
Marcel
ee0ab197da Merge branch 'updated_spanish_es_strings' into 'master'
Updated strings Added missing translations in Spanish es_ES and retrieving localized text

See merge request veloren/veloren!1866
2021-03-09 12:59:03 +00:00
Marcel
f6028f4ae3 Merge branch 'xMAC94x/metrics_fixes' into 'master'
get rid of a lazy_static and update agent multithreaded metrics

See merge request veloren/veloren!1865
2021-03-09 12:59:00 +00:00
tukilo
cea895ea24 Updated strings Added missing translations in Spanish es_ES and retrieving localized text 2021-03-09 12:30:53 +01:00
Marcel
d229ab1eb9 Merge branch 'aweinstock/critical-stats' into 'master'
Add critical chance and critical multiplier stats to weapons.

See merge request veloren/veloren!1864
2021-03-09 10:55:36 +00:00
Marcel Märtens
77dea4980c get rid of a lazy_static and update agent multithreaded metrics 2021-03-09 11:52:57 +01:00
Marcel
8c868aebc7 Merge branch 'xMAC94x/common_ecs' into 'master'
Move Specs code to own common_ecs create, put tracy and macros into common_base

See merge request veloren/veloren!1863
2021-03-09 09:48:53 +00:00
Avi Weinstock
d8f0a1c426 Add critical chance and critical multiplier stats to weapons. 2021-03-08 23:27:25 -05:00
Marcel Märtens
4ebfbdde0f Move Specs code to own common_ecs create, put tracy and macros into common_base 2021-03-09 00:54:01 +01:00
Marcel
19d55b1da3 Merge branch 'Frinksy/reset-button' into 'master'
Add reset button to graphics settings

See merge request veloren/veloren!1861
2021-03-08 22:46:18 +00:00
Adam Blanchet
16b66f9cd6 Add reset button to graphics settings 2021-03-08 18:48:38 +01:00
Marcel
8c1ac78ce3 Merge branch 'xMAC94x/advanced_systems' into 'master'
Implement a VSystem trait that can be implemented by Systems.

See merge request veloren/veloren!1858
2021-03-08 13:01:44 +00:00
Marcel Märtens
f353f14703 change Name from VSystem to System 2021-03-08 13:15:00 +01:00
Joshua Barretto
5f15037679 Merge branch 'zesterer/worldgen' into 'master'
Addressed pine tree criticism by improving generation

See merge request veloren/veloren!1859
2021-03-08 10:52:51 +00:00
Marcel Märtens
989d130692 update state to system name. This will break grafana boards and thus needs an adjustment 2021-03-08 11:51:18 +01:00
Marcel Märtens
ea94ca6656 switch server to the new Registry struct, this gets rid of RegistryFn pattern and simplyfies stuff, its a result of the Prometheus-tracy crate 2021-03-08 11:51:16 +01:00
Marcel Märtens
6b88545481 restructure server metrics
- get rid of old SysTimers for each system in favour of VSystem tracking
 - move metrics generation from lib.rs to own system
 - code cleanup
 - remove time tracking in common::sys
2021-03-08 11:51:13 +01:00
Joshua Barretto
549f89f590 Addressed pine tree criticism by improving generation 2021-03-08 10:51:06 +00:00
Marcel Märtens
c515fece28 Implement a VSystem trait that can be implemented by Systems.
It will autodo some things, like track start and time and export those in system metrics
Add a origin and implement it for all Systems in Veloren
2021-03-08 11:51:04 +01:00
Marcel
b7079b454c Merge branch 'ccgauche/moved-plugins-ecs' into 'master'
Improved ECS system for plugins to enable async execution of plugins in systems

See merge request veloren/veloren!1857
2021-03-07 23:00:07 +00:00
ccgauche
89774980b4 First commit 2021-03-07 22:32:52 +01:00
Marcel
e29964ead1 Merge branch 'sarrakitty/fireworks' into 'master'
added a white firework

See merge request veloren/veloren!1856
2021-03-07 18:37:35 +00:00
Marcel
52cfc2f301 Merge branch 'zesterer/worldgen' into 'master'
Worldgen Improvements

See merge request veloren/veloren!1768
2021-03-07 18:01:00 +00:00
Joshua Barretto
e42be14a37 Updated lockfile dependencies 2021-03-07 16:55:58 +00:00