juliancoffee
|
7d5698dcb4
|
Ignore local neovim rc
|
2021-04-29 20:49:35 +03:00 |
|
Ben Wallis
|
8165cc4169
|
Merge branch 'xvar/reduce-timeofday-sync-frequency' into 'master'
Reduced frequency of TimeOfDay message being sent to clients
See merge request veloren/veloren!2218
|
2021-04-29 13:50:08 +00:00 |
|
Imbris
|
cba19b4386
|
Merge branch 'synis/beam-aura-spatial-grid' into 'master'
Use SpatialGrid for Beam and Aura
See merge request veloren/veloren!2214
|
2021-04-29 13:00:55 +00:00 |
|
Synis
|
7bde80e1f3
|
Query spatial grid for beam and aura system
fmt
|
2021-04-29 14:23:02 +02:00 |
|
Ben Wallis
|
ad2f7bbfa5
|
Reduced sync of TimeOfDay to once per 100 ticks
|
2021-04-29 12:34:27 +01:00 |
|
Imbris
|
b4522f4ee2
|
Merge branch 'yusdacra/chore/nix' into 'master'
chore(deps): update nix flake deps
See merge request veloren/veloren!2210
|
2021-04-29 02:13:18 +00:00 |
|
Yusuf Bera Ertan
|
dc8d889703
|
chore(deps): update nix flake deps
|
2021-04-29 05:01:05 +03:00 |
|
Ben Wallis
|
933de6b023
|
Merge branch 'xvar/item-serialization' into 'master'
Changed Item serialization to not send ItemDef struct across the network
See merge request veloren/veloren!2215
|
2021-04-28 20:50:32 +00:00 |
|
Ben Wallis
|
0eb1f62cd2
|
Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef
|
2021-04-28 21:00:25 +01:00 |
|
Snowram
|
e6b8a79e0e
|
Merge branch 'bronson-master-patch-18766' into 'master'
Fix spelling in seashells.ron
See merge request veloren/veloren!2213
|
2021-04-28 18:54:11 +00:00 |
|
Scott Bronson
|
612bc25f54
|
Fix spelling in seashells.ron
|
2021-04-28 16:32:19 +00:00 |
|
Justin Shipsey
|
3ecec779ea
|
Merge branch 'DaforLynx/town-music' into 'master'
Town music
See merge request veloren/veloren!2208
|
2021-04-28 05:08:00 +00:00 |
|
DaforLynx
|
5f8c7e54b5
|
Town music
|
2021-04-28 05:07:59 +00:00 |
|
Samuel Keiffer
|
20176b1bf2
|
Merge branch 'james/fix-bird-auto-fly' into 'master'
Set bird default to not flying and give non-strafing NPCs a larger attack angle
See merge request veloren/veloren!2209
|
2021-04-28 02:31:51 +00:00 |
|
James Melkonian
|
124a684e47
|
Set bird default to not flying and give non-strafing NPCs a larger attack angle
|
2021-04-28 02:31:51 +00:00 |
|
Marcel
|
2abbd1cdda
|
Merge branch 'james/sound-unwraps' into 'master'
Remove an unwrap and move outcome sfx to ron
See merge request veloren/veloren!2206
|
2021-04-27 21:01:06 +00:00 |
|
James Melkonian
|
3ae25b8348
|
Remove an unwrap and move outcome sfx to ron
|
2021-04-27 21:01:06 +00:00 |
|
Marcel
|
134ee907bb
|
Merge branch 'yusdacra/chore/nix' into 'master'
build(nix): update flake deps, switch buildPlatform to use crate2nix
See merge request veloren/veloren!2202
|
2021-04-27 20:55:55 +00:00 |
|
Marcel
|
0a8a0452f5
|
Merge branch 'duelsik/translations-PL-27-04-2021' into 'master'
Polish translations update.
See merge request veloren/veloren!2205
|
2021-04-27 20:54:48 +00:00 |
|
Joshua Barretto
|
f9020490ec
|
Merge branch 'james/fix-wolf-ai' into 'master'
Partially fixes wolf AI
See merge request veloren/veloren!2167
|
2021-04-27 17:57:32 +00:00 |
|
James Melkonian
|
1e47652741
|
Partially fixes wolf AI
|
2021-04-27 17:57:31 +00:00 |
|
Daniel Mizerski
|
7aa309fa06
|
Polish translations update.
|
2021-04-27 17:33:30 +02:00 |
|
Joshua Barretto
|
5f3ac34f4a
|
Merge branch 'lboklin/glider-physics' into 'master'
Glider physics
See merge request veloren/veloren!1665
|
2021-04-27 14:41:48 +00:00 |
|
Ludvig Böklin
|
b389806d2e
|
Glider physics
|
2021-04-27 14:41:48 +00:00 |
|
Justin Shipsey
|
3c822c2be5
|
Merge branch 'slipped/quickfix' into 'master'
fix glide wield
See merge request veloren/veloren!2203
|
2021-04-27 03:54:55 +00:00 |
|
jshipsey
|
60e31e90d9
|
fix glide wield
|
2021-04-26 23:17:04 -04:00 |
|
Yusuf Bera Ertan
|
78b1773c05
|
build(nix): switch to crate2nix
|
2021-04-27 05:18:12 +03:00 |
|
Justin Shipsey
|
90eb8635da
|
Merge branch 'slipped/combatstuff' into 'master'
combat ori changes
See merge request veloren/veloren!2198
|
2021-04-26 02:54:44 +00:00 |
|
Sam
|
201fe2a19c
|
Added angle check for new npcs.
|
2021-04-25 22:19:30 -04:00 |
|
jshipsey
|
aa344baa45
|
comments
|
2021-04-25 22:02:32 -04:00 |
|
jshipsey
|
585e468de1
|
skill adjustments, ori changes
|
2021-04-25 22:02:32 -04:00 |
|
Sam
|
77f05ec53d
|
Added an angle check to all agent attacks.
|
2021-04-25 22:02:31 -04:00 |
|
jshipsey
|
4f3c766757
|
ori fixes
|
2021-04-25 22:02:30 -04:00 |
|
Marcel
|
ccafc3f9e8
|
Merge branch 'aweinstock/deflate-downgrade-20210425' into 'master'
Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's...
See merge request veloren/veloren!2199
|
2021-04-25 23:35:43 +00:00 |
|
Samuel Keiffer
|
06d9ec1d8a
|
Merge branch 'juliancoffee/fix_campfire_heal_message' into 'master'
Fix campfire heal buff description
See merge request veloren/veloren!2165
|
2021-04-25 23:06:48 +00:00 |
|
Illia Denysenko
|
8cc6469626
|
Fix campfire heal buff description
|
2021-04-25 23:06:47 +00:00 |
|
Joshua Barretto
|
0637816ab0
|
Merge branch 'zesterer/small-fixes' into 'master'
Small fixes
See merge request veloren/veloren!2201
|
2021-04-25 23:03:23 +00:00 |
|
Joshua Barretto
|
a785fb13a8
|
Apply flat earth hack to mist
|
2021-04-25 23:28:19 +01:00 |
|
Joshua Barretto
|
9bba3acfbe
|
Don't use movement efficiency for orientation
|
2021-04-25 23:00:30 +01:00 |
|
Joshua Barretto
|
430d75b67b
|
Capped light access
|
2021-04-25 22:49:20 +01:00 |
|
Joshua Barretto
|
2281c6f189
|
Minor control over velocity when in the air
|
2021-04-25 22:37:25 +01:00 |
|
Joshua Barretto
|
4626b7e95d
|
More realistic cloud light extinction model
|
2021-04-25 22:26:07 +01:00 |
|
Samuel Keiffer
|
c67995d240
|
Merge branch 'holychowders/fix_villagers_spamming_messages_in_safezones' into 'master'
Prevent safezoned villagers from spamming messages upon seeing an enemy
See merge request veloren/veloren!2190
|
2021-04-25 21:24:06 +00:00 |
|
holychowders
|
dd36d1aab5
|
Prevent safezoned villagers from spamming messages upon seeing an enemy
|
2021-04-25 21:24:06 +00:00 |
|
Marcel
|
31098ad75b
|
Merge branch 'xMAC94x/reduce_deps' into 'master'
remove some unused deps Yuri found
See merge request veloren/veloren!2197
|
2021-04-25 20:22:31 +00:00 |
|
Avi Weinstock
|
553dcc45dc
|
Downgrade deflate from level 5 to level 1 in the terrain system to match LZ4's worst-case encoding time.
|
2021-04-25 16:18:57 -04:00 |
|
Joshua Barretto
|
d00348cbd2
|
Rebalanced arrow speed
|
2021-04-25 20:06:29 +01:00 |
|
Joshua Barretto
|
5c469b99d2
|
Fixed near cloud bug
|
2021-04-25 20:04:00 +01:00 |
|
Marcel
|
1948507085
|
Merge branch 'tormeh/rtsim-first' into 'master'
Tormeh/rtsim first
See merge request veloren/veloren!2053
|
2021-04-25 18:53:39 +00:00 |
|
Samuel Keiffer
|
17492dc0fa
|
Merge branch 'sam/block-parry' into 'master'
Blocking/Parrying
Closes #646 and #416
See merge request veloren/veloren!2153
|
2021-04-25 18:25:24 +00:00 |
|