Marcel
e532597674
Merge branch 'aweinstock/tradepricing' into 'master'
...
Get SitePricing information to clients, and use it to display coin-denominated...
See merge request veloren/veloren!1991
2021-03-26 00:17:39 +00:00
Louis Pearson
6c756c336f
Use older version of Store and introduce Depot
...
Removal of items in Store can cause get to fail. It has been reverted to
an older version that did not support removal. The newer version is now
called Depot and changed so that None is returned if the item does
not exist instead of crashing.
2021-03-25 07:41:53 -06:00
Avi Weinstock
6d30f17add
Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.
2021-03-25 02:11:58 -04:00
Marcel
f01114f47a
Merge branch 'aweinstock/agent-retargetting' into 'master'
...
In `agent::Sys`, perform target selection periodically to avoid agents going...
See merge request veloren/veloren!1985
2021-03-24 22:22:04 +00:00
Christof Petig
88a6dfbaee
adapt unit test
2021-03-24 07:37:46 +01:00
Christof Petig
c207403465
loop over slots_mut instead of using an index
2021-03-24 07:37:46 +01:00
Christof Petig
d67ff9ee1d
replace an unwrap by returning an Option
2021-03-24 07:37:45 +01:00
Avi Weinstock
35e729d919
In agent::Sys, perform target selection periodically to avoid agents going after their target too singlemindedly.
2021-03-23 23:00:05 -04:00
Joshua Barretto
ee9eba542d
Merge branch 'aweinstock/enable-rtsim-airships' into 'master'
...
Enable RtSim Airships.
See merge request veloren/veloren!1973
2021-03-23 14:29:43 +00:00
Marcel
ba0a2ce63c
Merge branch 'sam/continuous-roll' into 'master'
...
Roll Tweaks
See merge request veloren/veloren!1975
2021-03-23 09:46:21 +00:00
Avi Weinstock
657f6d6185
Remove level from create_ship and CreateShip.
2021-03-23 10:44:42 +01:00
Avi Weinstock
e389c3597f
Add ServerEvent::CreateShip, and use it instead of CreateNpc for RtSim airships.
2021-03-23 10:44:37 +01:00
Avi Weinstock
503f9c087b
Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).
2021-03-23 10:44:32 +01:00
Joshua Barretto
4401230d4b
Remove eye height check for beam
2021-03-23 10:43:22 +01:00
Joshua Barretto
d09ee61834
Added raycast check to beams
2021-03-23 10:43:18 +01:00
heydabop
bc75323bb1
Fix #962 - kick old client and add new client on duplicate login
2021-03-22 19:15:24 -05:00
Sam
ce44086530
If roll input remains held, allows you to keep rolling and stay in roll state.
...
You can now jump to interrupt the recovery portion of roll.
Jumping out of roll slightly increases jump strength.
2021-03-22 18:47:13 -04:00
Marcel Märtens
8838bddefe
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel Märtens
bb8c7f46fb
warn when a single system takes longer than 500ms
2021-03-22 14:26:05 +01:00
Samuel Keiffer
639a40558f
Merge branch 'loot-tables' into 'master'
...
Loot tables
See merge request veloren/veloren!1968
2021-03-22 09:39:35 +00:00
Samuel Keiffer
b0dbdbdf9f
Loot tables
2021-03-22 09:39:35 +00:00
Justin Shipsey
fef5607829
Merge branch 'slipped/animtweaks' into 'master'
...
airship movement bits
See merge request veloren/veloren!1967
2021-03-22 08:49:04 +00:00
Samuel Keiffer
d495459a12
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
jshipsey
87b3cb8270
airship movement bits
2021-03-21 21:43:49 -04:00
Joshua Barretto
17548c3ddb
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
abdba70178
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
0f201c5e09
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Joshua Barretto
677a8d0c21
Fetch InputAttr from controller
2021-03-21 19:11:44 +00:00
Marcel
88c156a3ac
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Marcel
174c755740
Merge branch 'xMAC94x/tracing_slowjob' into 'master'
...
harden slowjob code
See merge request veloren/veloren!1961
2021-03-21 18:34:21 +00:00
Marcel Märtens
1b5aa47e03
harden slowjob code
2021-03-21 18:45:23 +01:00
Joshua Barretto
4b7f69f850
Switched to BasicMelee
2021-03-21 17:45:01 +00:00
Joshua Barretto
3aad8818fa
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Vincent Foulon
50af548636
Add skill for swimming speed
2021-03-21 15:58:38 +01:00
Vincent Foulon
d0dcf5228e
remove CharacterAbility::Climb
2021-03-21 00:35:34 +01:00
Vincent Foulon
2e76966868
move climbing skill adjustment into climb module
2021-03-21 00:22:04 +01:00
Avi Weinstock
49bf730c91
Update fall damage calculations.
2021-03-20 18:46:34 -04:00
Vincent Foulon
e35099fd84
address comments
2021-03-20 22:56:54 +01:00
Sam
73bb583235
Increased combo duration by 50%
2021-03-20 16:44:18 -04:00
Sam
e18c22a197
Fixed gaining combo by shooting loot bags
2021-03-20 16:26:10 -04:00
Vincent Foulon
902029e977
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Marcel Märtens
fcb00df6b8
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Samuel Keiffer
c96b191e6f
Parallelized beam
2021-03-19 20:18:36 +00:00
Imbris
af56fb272b
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
2021-03-18 21:20:22 -04:00
Snowram
0dabf089f2
Various visual fixes
2021-03-18 22:53:06 +01:00
Marcel Märtens
94410ddedd
cleanup faster physics calc
2021-03-18 15:22:28 +01:00
Imbris
03f02f5829
Combine 5 things into 1
2021-03-18 14:26:32 +01:00
Imbris
2072d00c7b
Merge branch 'imbris/voxel-collider-broadphase' into 'master'
...
Spatial grid for voxel colliders as well as a basic bounding sphere test
See merge request veloren/veloren!1927
2021-03-18 07:03:04 +00:00
Marcel
76fee3aa54
Merge branch 'sam/fix-dash' into 'master'
...
Fixed dash
See merge request veloren/veloren!1933
2021-03-18 03:09:46 +00:00
Joshua Barretto
dc40803f1f
Merge branch 'zesterer/network-tweaks' into 'master'
...
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
See merge request veloren/veloren!1935
2021-03-18 01:47:29 +00:00
