Marcel Märtens
|
3d017f6a35
|
reduce benches to O2 and enable incremental
|
2021-03-21 23:25:02 +01:00 |
|
Marcel
|
083af5599b
|
Merge branch 'xMAC94x/deps' into 'master'
update dependencies
See merge request veloren/veloren!1963
|
2021-03-21 22:24:27 +00:00 |
|
Marcel Märtens
|
2940693a76
|
update dependencies
|
2021-03-21 22:53:44 +01:00 |
|
Marcel
|
983523c463
|
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
|
b9f8aff75e
|
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
|
e64258afcf
|
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
|
732bc3378d
|
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
|
d088694281
|
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
|
a62f2ab133
|
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
|
4c42b09c3a
|
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
|
96049904a6
|
add keepalive in server-cli so we know it still ticks, ~ all 30s
|
2021-03-21 19:15:40 +01:00 |
|
Marcel Märtens
|
a77578a25b
|
harden slowjob code
|
2021-03-21 18:45:23 +01:00 |
|
Vincent Foulon
|
e06870702f
|
Add skill for swimming speed
|
2021-03-21 15:58:38 +01:00 |
|
Vincent Foulon
|
985c26dd0a
|
improve climbing icon
|
2021-03-21 13:26:44 +01:00 |
|
RedlineTriad
|
606420c5e1
|
Sort the playerlist alphabetically
|
2021-03-21 10:22:33 +01:00 |
|
Vincent Foulon
|
9e11a574d2
|
remove CharacterAbility::Climb
|
2021-03-21 00:35:34 +01:00 |
|
Vincent Foulon
|
d0df01fe51
|
move climbing skill adjustment into climb module
|
2021-03-21 00:22:04 +01:00 |
|
Marcel Märtens
|
18aefa8dbf
|
remove prometheus dos via protocol.
Clean up unused labely to keep prometheus values down
|
2021-03-20 23:50:38 +01:00 |
|
Avi Weinstock
|
1351b9515c
|
Update fall damage calculations.
|
2021-03-20 18:46:34 -04:00 |
|
Vincent Foulon
|
8b01abde67
|
address comments
|
2021-03-20 22:56:54 +01:00 |
|
Vincent Foulon
|
71d3bf5821
|
fix typo in sceptre aura skill
|
2021-03-20 22:12:43 +01:00 |
|
Vincent Foulon
|
8ef30dd2f3
|
fix one line from custist_alarm vector
|
2021-03-20 20:53:27 +01:00 |
|
Vincent Foulon
|
d4fbc78d06
|
Translate cultist_alarm in FR
|
2021-03-20 17:37:59 +01:00 |
|
Vincent Foulon
|
7dad972632
|
add changelog entry
|
2021-03-20 17:18:32 +01:00 |
|
Vincent Foulon
|
d0aa68a9d2
|
Add climbing speed and cost
|
2021-03-20 17:17:28 +01:00 |
|
Marcel
|
1afe3b7de5
|
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
|
2733ba2e27
|
Change the version number to 0.9
|
2021-03-20 13:07:09 +01:00 |
|
Marcel
|
ac4d753fc9
|
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
|
0ef42e3854
|
Address MR 1945 review comments.
|
2021-03-19 19:53:17 -04:00 |
|
Avi Weinstock
|
03d0748d40
|
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
|
bf5be892d8
|
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
|
d489ade082
|
Parallelized beam
|
2021-03-19 20:18:36 +00:00 |
|
Marcel
|
94f82960dd
|
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
|
cb3bf0c884
|
Fix a missing dwarf hairstyle
|
2021-03-19 12:45:08 +01:00 |
|
Marcel
|
2dd0fe1c02
|
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
|
eabddd7263
|
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
|
9fb44e5674
|
More voxel collision speedups by reducing the common cases from 5 to 3 voxel iterations
|
2021-03-18 21:20:22 -04:00 |
|
Marcel
|
987f2d2b34
|
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
|
fb40cd93a9
|
fix merchant getting stuck in non-existant trade when declining after accepting
|
2021-03-19 00:43:23 +01:00 |
|
Avi Weinstock
|
a770ef0f4a
|
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
|
87883d9b11
|
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
|
e5afb2fcf7
|
Various visual fixes
|
2021-03-18 22:53:06 +01:00 |
|
Sarra
|
eaaf65127d
|
cleaning up some tools
|
2021-03-18 22:52:50 +01:00 |
|
Sarra
|
d1e16a2a00
|
tweaking glow and shine
|
2021-03-18 22:52:40 +01:00 |
|
Marcel
|
587d94fceb
|
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
|
e6e56f19f9
|
cleanup faster physics calc
|
2021-03-18 15:22:28 +01:00 |
|
Imbris
|
bf383d9562
|
Combine 5 things into 1
|
2021-03-18 14:26:32 +01:00 |
|
Marcel
|
571a6689e3
|
Merge branch 'vfoulon80/loading-animations' into 'master'
Remove unwraps when asset loading fails
See merge request veloren/veloren!1939
|
2021-03-18 12:56:17 +00:00 |
|
Vincent Foulon
|
80635004a4
|
Remove unwraps when asset loading fails
|
2021-03-18 12:56:17 +00:00 |
|
Marcel
|
8afaea9af7
|
Merge branch 'zesterer/worldgen-tweaks' into 'master'
Reduced frequency of bee hives
See merge request veloren/veloren!1936
|
2021-03-18 08:27:32 +00:00 |
|