Marcel
379b586ff7
Merge branch 'xMAC94x/keepalive' into 'master'
...
add keepalive in server-cli so we know it still ticks, ~ all 30s
See merge request veloren/veloren!1960
2021-03-21 18:34:27 +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
c01d8790be
Merge branch 'sorted-playerlist' into 'master'
...
Sort the playerlist alphabetically
See merge request veloren/veloren!1958
2021-03-21 18:34:09 +00:00
Marcel
509a380b34
Merge branch 'xMAC94x/prometheus_improvements' into 'master'
...
remove prometheus dos via protocol.
See merge request veloren/veloren!1955
2021-03-21 18:34:00 +00:00
Marcel
7cbeed7c9b
Merge branch 'falldamage-20210320' into 'master'
...
Update fall damage calculations.
See merge request veloren/veloren!1954
2021-03-21 18:33:48 +00:00
Marcel
ef533d7cc0
Merge branch 'vfoulon80/fr-custist-alarm' into 'master'
...
[FR] Translate cultist_alarm
See merge request veloren/veloren!1951
2021-03-21 18:33:34 +00:00
Marcel Märtens
13d79625f2
add keepalive in server-cli so we know it still ticks, ~ all 30s
2021-03-21 19:15:40 +01: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
973c0764fc
Disabled block selection when not wielding
2021-03-21 16:29:13 +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
e49b56847e
improve climbing icon
2021-03-21 13:26:44 +01:00
RedlineTriad
0e6c50644c
Sort the playerlist alphabetically
2021-03-21 10:22:33 +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
Marcel Märtens
1c872add96
remove prometheus dos via protocol.
...
Clean up unused labely to keep prometheus values down
2021-03-20 23:50:38 +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
Vincent Foulon
8ed66af349
fix typo in sceptre aura skill
2021-03-20 22:12:43 +01:00
Sam
73bb583235
Increased combo duration by 50%
2021-03-20 16:44:18 -04:00
Sam
5de4011221
Rebalanced a few stats
2021-03-20 16:28:03 -04:00
Sam
e18c22a197
Fixed gaining combo by shooting loot bags
2021-03-20 16:26:10 -04:00
Vincent Foulon
b45ba8f4d7
fix one line from custist_alarm vector
2021-03-20 20:53:27 +01:00
Vincent Foulon
6da415e410
Translate cultist_alarm in FR
2021-03-20 17:37:59 +01:00
Vincent Foulon
4f3c203ae1
add changelog entry
2021-03-20 17:18:32 +01:00
Vincent Foulon
902029e977
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Joshua Yanovski
d3be50b4f5
Enable allocation of new textures on atlas allocation failure.
...
This solves the problem of not being able to set the view distance too
high, especially in pathological cases like giant trees. For
simplicity, we just freeze any atlas where allocation failed and start
allocating to a new texture and atlas, letting reference counting
destroy the old one when there are no more references to it. Because of
the spatial locality of chunk allocations, chunks allocated together
will virtually always have similar lifetimes, so the odds of this
causing significant fragmentation are very low, meaning this simple
solution should not do much worse than a much fancier one.
2021-03-20 16:21:41 +01:00
Marcel
d05113ecab
Merge branch 'xMAC94x/release_numbers' into 'master'
...
Change the version number to 0.9
See merge request veloren/veloren!1948
2021-03-20 12:48:05 +00:00
Marcel Märtens
fcb00df6b8
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Marcel
8ff9787523
Merge branch 'aweinstock/fix-playerentity-20210319' into 'master'
...
Set PlayerEntity in `Client::clean_state`. This fixes several issues where...
See merge request veloren/veloren!1945
2021-03-20 11:06:42 +00:00
Avi Weinstock
5d2db1cb36
Address MR 1945 review comments.
2021-03-19 19:53:17 -04:00
Avi Weinstock
318ae962fd
Set PlayerEntity in Client::clean_state. This fixes several issues where interpolation would kick in after changing characters, causing the player to be locked in place or shoot into the sky on respawn or teleport.
2021-03-19 19:02:39 -04:00
Marcel
660fabc2e2
Merge branch 'sam/parallelize-beam' into 'master'
...
Parallelized beam
See merge request veloren/veloren!1944
2021-03-19 20:18:37 +00:00
Samuel Keiffer
c96b191e6f
Parallelized beam
2021-03-19 20:18:36 +00:00
Marcel
a3b29f431a
Merge branch 'snowram/hair-fix' into 'master'
...
Fix a missing dwarf hairstyle
See merge request veloren/veloren!1943
2021-03-19 14:11:16 +00:00
Snowram
49f0d41eb8
Fix a missing dwarf hairstyle
2021-03-19 12:45:08 +01:00
Marcel
ad75224694
Merge branch 'imbris/phys' into 'master'
...
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
See merge request veloren/veloren!1942
2021-03-19 11:12:32 +00:00
Marcel
3061630b61
Merge branch 'christof/trading_fix2' into 'master'
...
fix merchant getting stuck in non-existant trade when declining after accepting
See merge request veloren/veloren!1941
2021-03-19 09:29:45 +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
Marcel
b4126dcf9c
Merge branch 'agentflight-fix-20210318' into 'master'
...
Fix agent flight by enabling flight mode at the start of each tick of the...
See merge request veloren/veloren!1940
2021-03-18 23:48:27 +00:00
Christof Petig
102b016b2e
fix merchant getting stuck in non-existant trade when declining after accepting
2021-03-19 00:43:23 +01:00
Avi Weinstock
e71d09b68d
Fix agent flight by enabling flight mode at the start of each tick of the agent system.
2021-03-18 18:54:23 -04:00
Marcel
fec0c345d7
Merge branch 'sarrakitty/glowy-fixes' into 'master'
...
tweaking glow and shine
See merge request veloren/veloren!1926
2021-03-18 22:34:20 +00:00
Snowram
0dabf089f2
Various visual fixes
2021-03-18 22:53:06 +01:00
Sarra
6ab109221e
cleaning up some tools
2021-03-18 22:52:50 +01:00
Sarra
fc5d448e12
tweaking glow and shine
2021-03-18 22:52:40 +01:00
Marcel
269f246acc
Merge branch 'imbris/speeeeeeeeeeeeeed' into 'master'
...
Combine 5 things into 1
See merge request veloren/veloren!1938
2021-03-18 15:51:54 +00: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
