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 |
|
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 |
|
Marcel
|
99d5254662
|
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
|
e1502bb732
|
Remove unwraps when asset loading fails
|
2021-03-18 12:56:17 +00:00 |
|
Marcel
|
09ad5f984a
|
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 |
|
Imbris
|
2072d00c7b
|
Merge branch 'imbris/voxel-collider-broadphase' into 'master'
Spatial grid for voxel colliders as well as a basic bounding sphere test
See merge request veloren/veloren!1927
|
2021-03-18 07:03:04 +00:00 |
|
Marcel
|
76fee3aa54
|
Merge branch 'sam/fix-dash' into 'master'
Fixed dash
See merge request veloren/veloren!1933
|
2021-03-18 03:09:46 +00:00 |
|
Marcel
|
e7ad2bf2d9
|
Merge branch 'vfoulon80/loading-animations' into 'master'
Add new random loading animations
See merge request veloren/veloren!1931
|
2021-03-18 02:28:34 +00:00 |
|
Joshua Barretto
|
dc40803f1f
|
Merge branch 'zesterer/network-tweaks' into 'master'
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
See merge request veloren/veloren!1935
|
2021-03-18 01:47:29 +00:00 |
|
Joshua Barretto
|
55bab83f5d
|
Merge branch 'sam/remove-combat-last-pos' into 'master'
Shockwaves and beams no longer use last position in calculating if they hit.
See merge request veloren/veloren!1934
|
2021-03-18 01:07:18 +00:00 |
|
Sam
|
440ccdfdd2
|
Fixed dash
|
2021-03-17 20:13:12 -04:00 |
|
Joshua Barretto
|
6d2a2fa918
|
Merge branch 'DaforLynx/aura-sfx' into 'master'
Adds sfx for Sceptre aura
See merge request veloren/veloren!1932
|
2021-03-17 23:54:50 +00:00 |
|
DaforLynx
|
53362d02ed
|
Adds sfx for Sceptre aura
|
2021-03-17 23:54:49 +00:00 |
|
Vincent Foulon
|
b5a9481a33
|
allow loading animations to be contributed from a manifest file
|
2021-03-17 23:41:28 +01:00 |
|
Joshua Barretto
|
16fd382010
|
Reduced frequency of bee hives
|
2021-03-17 21:43:08 +00:00 |
|
Joshua Barretto
|
b514f4fe92
|
Reduced rubber-banding and interpolation jerk without significantly impacting upon network usage
|
2021-03-17 21:31:07 +00:00 |
|
Sam
|
42c700bd2a
|
Shockwaves and beams no longer use last position in calculating if they hit.
|
2021-03-17 17:24:39 -04:00 |
|
Vincent Foulon
|
0b884c7099
|
Add new random loading animations
|
2021-03-17 18:15:25 +01:00 |
|
Marcel
|
55fa5839f9
|
Merge branch 'xMAC94x/harden-threads' into 'master'
add a check that at least 1 thread works for slowJobPool and for every configuration
See merge request veloren/veloren!1930
|
2021-03-17 14:24:48 +00:00 |
|
Marcel Märtens
|
65352d771d
|
add a check that at least 1 thread works for slowJobPool and for every configuration
|
2021-03-17 14:36:58 +01:00 |
|
Marcel
|
07f2cdc64e
|
Merge branch 'tormeh/add-monologue-strings' into 'master'
Add monologue strings.
See merge request veloren/veloren!1925
|
2021-03-17 08:45:27 +00:00 |
|
Marcel
|
482555453c
|
Merge branch 'xMAC94x/fix_slowjob' into 'master'
slowjob: allow at least 1 job of every type
See merge request veloren/veloren!1929
|
2021-03-17 08:08:12 +00:00 |
|
Marcel Märtens
|
0c97984a9e
|
slowjob: allow at least 1 job of every type
|
2021-03-17 08:26:43 +01:00 |
|
Imbris
|
1792068e4e
|
Remove extra instrumentation and the old voxel collider loop
|
2021-03-16 23:42:13 -04:00 |
|
Imbris
|
d3f30fbfdb
|
Spatial grid for voxel colliders as well as a basic bounding sphere test
before doing any actual expensive voxel collision checking
|
2021-03-16 23:32:03 -04:00 |
|
Marcel
|
20f24896db
|
Merge branch 'vfoulon80/fr-skills' into 'master'
[FR] translate skills.ron + missing keys
See merge request veloren/veloren!1901
|
2021-03-17 01:25:12 +00:00 |
|
Vincent Foulon
|
a7ebe97f7b
|
[FR] translate skills.ron + missing keys
|
2021-03-17 01:25:11 +00:00 |
|
Tormod G. Hellen
|
998010bd6d
|
Add monologue strings.
|
2021-03-17 01:58:12 +01:00 |
|
Marcel
|
8ac43e0847
|
Merge branch 'pfau/09BG' into 'master'
0.9 background, 10 fire staffs, improved starting gear visuals
See merge request veloren/veloren!1919
|
2021-03-16 23:23:24 +00:00 |
|
Monty Marz
|
d8d965a66a
|
new loading bg, staff models
item images
fix paths
loot tables, adjustments
Update main.ron
|
2021-03-16 23:23:24 +00:00 |
|
Marcel
|
3a66189bbc
|
Merge branch 'james/fix-npc-chat-spam' into 'master'
Correct npc chat spam
See merge request veloren/veloren!1921
|
2021-03-16 23:22:48 +00:00 |
|
James Melkonian
|
cec5dee242
|
merchants no longer run away while trading
(this time without refactoring)
|
2021-03-16 23:22:48 +00:00 |
|
Marcel
|
e0cba3928c
|
Merge branch 'fix_ci' into 'master'
fix ci
See merge request veloren/veloren!1924
|
2021-03-16 22:32:17 +00:00 |
|
Marcel Märtens
|
f5ba496cd0
|
fix ci
|
2021-03-16 23:31:40 +01:00 |
|
Marcel
|
43bac70307
|
Merge branch 'xMAC94x/bots' into 'master'
bots: add option to join the world via ingame cmd
See merge request veloren/veloren!1923
|
2021-03-16 22:25:08 +00:00 |
|
Marcel
|
4d02f8f426
|
Merge branch 'ubruntu/issue983' into 'master'
scan_fmt -> 0.2.6
Closes #983
See merge request veloren/veloren!1911
|
2021-03-16 22:23:23 +00:00 |
|
Marcel
|
03b90d67c9
|
Merge branch 'aweinstock/forcedupdate-interpolation' into 'master'
Apply ForcedUpdate messages to the interpolation system, potentially improving...
See merge request veloren/veloren!1917
|
2021-03-16 22:23:04 +00:00 |
|
Marcel
|
998b03c154
|
Merge branch 'sam/nerfs' into 'master'
Nerfs
See merge request veloren/veloren!1922
|
2021-03-16 22:22:04 +00:00 |
|
Marcel
|
61aa7660ee
|
Merge branch 'sam/invuln-fixes' into 'master'
Safezone fixes
See merge request veloren/veloren!1920
|
2021-03-16 22:20:42 +00:00 |
|
Marcel
|
a67d7c08e6
|
Merge branch 'aweinstock/fix-mounting-20210316' into 'master'
Fix mounting by making deferred {pos,vel} writes optional in physics.
See merge request veloren/veloren!1918
|
2021-03-16 22:20:16 +00:00 |
|
Sam
|
11a43f232e
|
NPCs no longer target players inside safezones (and consider them to be defeated)
Warding aura no longer sometimes bypasses safezone invulnerability
|
2021-03-16 15:17:08 -04:00 |
|