Avi Weinstock
|
e2a74c5e5c
|
Enable RtSim airships.
|
2021-03-23 10:44:22 +01:00 |
|
Marcel
|
6629f0e573
|
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
|
f895b95bbe
|
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
|
a71684a003
|
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
|
8ade934db0
|
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
|
c58eb1cf50
|
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
|
833ab7f1a8
|
Make merchants not virtually spamclick accept.
|
2021-03-22 22:53:53 -04:00 |
|
heydabop
|
0e3f7625a9
|
Fix #962 - kick old client and add new client on duplicate login
|
2021-03-22 19:15:24 -05:00 |
|
Sam
|
31f4ef684d
|
Tweaked numbers
|
2021-03-22 17:26:55 -04:00 |
|
Marcel
|
f48c1e6535
|
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
|
6b23101fac
|
update toolchain to nightly-2021-03-22
|
2021-03-22 16:41:04 +01:00 |
|
Marcel
|
759c423595
|
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
|
3d45262ebb
|
warn when a single system takes longer than 500ms
|
2021-03-22 14:26:05 +01:00 |
|
Marcel
|
09c9615672
|
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
|
667faca5a5
|
update asset_manager
|
2021-03-22 12:37:38 +01:00 |
|
Marcel Märtens
|
fdc40f52d9
|
give more threads a fixed name
|
2021-03-22 12:37:03 +01:00 |
|
Marcel
|
c51a2b10a0
|
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
|
4356f67bed
|
Merge branch 'loot-tables' into 'master'
Loot tables
See merge request veloren/veloren!1968
|
2021-03-22 09:39:35 +00:00 |
|
Samuel Keiffer
|
f65cd1e771
|
Loot tables
|
2021-03-22 09:39:35 +00:00 |
|
Justin Shipsey
|
f57af6f776
|
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
|
9084ac48f1
|
defer some trace, so that we wont spam the log.
|
2021-03-22 09:16:07 +01:00 |
|
Joshua Barretto
|
6690854687
|
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
|
dc4570def5
|
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
|
1374900928
|
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
|
31747d8ff1
|
airship movement bits
|
2021-03-21 21:43:49 -04:00 |
|
Joshua Barretto
|
f9612c1c26
|
Made pickaxe obtainable
|
2021-03-22 00:24:07 +00:00 |
|
Joshua Barretto
|
7b736640f5
|
Smoother particle emission for moving objects
|
2021-03-22 00:23:25 +00:00 |
|
Marcel
|
0372e89fb8
|
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
|
7ae4230dc8
|
Merge branch 'zesterer/pick' into 'master'
Pickaxe
See merge request veloren/veloren!1959
|
2021-03-22 00:19:42 +00:00 |
|
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 |
|
Joshua Barretto
|
6ea5aa796b
|
Faster pick, less vibrant block selection
|
2021-03-21 20:38:08 +00:00 |
|
Joshua Barretto
|
fb3980e273
|
Outcome for block destruction, take select_pos from ControllerInputs
|
2021-03-21 20:10:05 +00:00 |
|
Sam
|
f342be71a1
|
Fixed pick animation
|
2021-03-21 15:29:17 -04:00 |
|
Joshua Barretto
|
003e76113f
|
Fetch InputAttr from controller
|
2021-03-21 19:11:44 +00: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 |
|
Joshua Barretto
|
b45df7fe10
|
Switched to BasicMelee
|
2021-03-21 17:45:01 +00:00 |
|
Joshua Barretto
|
b1026296cb
|
Disabled block selection when not wielding
|
2021-03-21 16:29:13 +00:00 |
|
Joshua Barretto
|
347e1022a0
|
Initial implementation of pickaxe
|
2021-03-21 16:09:16 +00: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 |
|