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
Joshua Barretto
2a0cff370e
Merge branch 'zesterer/better-particle-emission' into 'master'
...
Smoother particle emission for moving objects
See merge request veloren/veloren!1965
2021-03-22 06:15:20 +00:00
Marcel
242cf042ad
Merge branch 'sharp/texture-atlases' into 'master'
...
Enable allocation of new textures on atlas allocation failure.
See merge request veloren/veloren!1949
2021-03-22 04:35:41 +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
716b51c4ee
Made pickaxe obtainable
2021-03-22 00:24:07 +00:00
Joshua Barretto
0166666123
Smoother particle emission for moving objects
2021-03-22 00:23:25 +00:00
Marcel
3bf7b36fbd
Merge branch 'xMAC94x/benches' into 'master'
...
reduce benches to O2 and enable incremental
See merge request veloren/veloren!1964
2021-03-22 00:19:44 +00: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
Marcel Märtens
5fb8113d50
reduce benches to O2 and enable incremental
2021-03-21 23:25:02 +01:00
Marcel
eb5ec8a742
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
9fe28b038a
update dependencies
2021-03-21 22:53:44 +01: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
Sam
e9b5f989dc
Fixed pick animation
2021-03-21 15:29:17 -04: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
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
