Marcel
|
161b5927d3
|
Merge branch 'sam/combat-balance' into 'master'
Combat Balance Tweaks
See merge request veloren/veloren!1974
|
2021-03-23 09:40:33 +00:00 |
|
Marcel
|
68e50132d0
|
Merge branch 'aweinstock/fix-agenttrade-acceptspam' into 'master'
Make merchants not virtually spamclick accept.
See merge request veloren/veloren!1976
|
2021-03-23 09:39:40 +00:00 |
|
Marcel
|
e2b98b1b77
|
Merge branch 'heydabop/962-duplicate-login' into 'master'
Fix #962 - kick old client and add new client on duplicate login
Closes #962
See merge request veloren/veloren!1952
|
2021-03-23 09:38:47 +00:00 |
|
Marcel
|
7888b64534
|
Merge branch 'xMAC94x/ci-workaround' into 'master'
ci fails sporadically, remove file so it doesnt fail that often till we have a bettter toolchain
See merge request veloren/veloren!1977
|
2021-03-23 09:38:16 +00:00 |
|
Marcel Märtens
|
c395577339
|
ci fails sporadically, remove file so it doesnt fail that often till we have a bettter toolchain
|
2021-03-23 10:30:29 +01:00 |
|
Avi Weinstock
|
8eb9e68592
|
Make merchants not virtually spamclick accept.
|
2021-03-22 22:53:53 -04:00 |
|
heydabop
|
bc75323bb1
|
Fix #962 - kick old client and add new client on duplicate login
|
2021-03-22 19:15:24 -05:00 |
|
Sam
|
19d326f962
|
Tweaked numbers
|
2021-03-22 17:26:55 -04:00 |
|
Marcel
|
fb73c5fc9b
|
Merge branch 'xMAC94x/update_toolchain' into 'master'
update toolchain to `nightly-2021-03-22`
See merge request veloren/veloren!1972
|
2021-03-22 16:07:52 +00:00 |
|
Marcel Märtens
|
8838bddefe
|
update toolchain to nightly-2021-03-22
|
2021-03-22 16:41:04 +01:00 |
|
Marcel
|
abd835e27e
|
Merge branch 'xMAC94x/slowjob_trace' into 'master'
warn when a single system takes longer than 500ms
See merge request veloren/veloren!1971
|
2021-03-22 15:07:17 +00:00 |
|
Marcel Märtens
|
bb8c7f46fb
|
warn when a single system takes longer than 500ms
|
2021-03-22 14:26:05 +01:00 |
|
Marcel
|
a4d1f3daf6
|
Merge branch 'xMAC94x/thread_names' into 'master'
xmac94x/thread names
See merge request veloren/veloren!1969
|
2021-03-22 12:56:45 +00:00 |
|
Marcel Märtens
|
2445f692c7
|
update asset_manager
|
2021-03-22 12:37:38 +01:00 |
|
Marcel Märtens
|
58e557cac7
|
give more threads a fixed name
|
2021-03-22 12:37:03 +01:00 |
|
Marcel
|
6b706c9643
|
Merge branch 'xMAC94x/net-improve' into 'master'
defer some trace, so that we wont spam the log.
See merge request veloren/veloren!1966
|
2021-03-22 10:31:56 +00: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 |
|
Marcel Märtens
|
9978d8db90
|
defer some trace, so that we wont spam the log.
|
2021-03-22 09:16:07 +01: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 |
|