Ben Wallis
|
04228150e3
|
Merge branch 'juliancoffee/kits_update' into 'master'
Update kits
See merge request veloren/veloren!2235
|
2021-05-02 13:27:03 +00:00 |
|
Illia Denysenko
|
f46b87ffb4
|
- Split 'debug' kit to 'debug' and 'admin_cosmetics'
- Add Velorite Admin Bow to 'debug'
- Add rings, cape and necklace to cultist kit
- Add mushroom curry to 'consumables' (former 'potions')
|
2021-05-02 13:27:03 +00:00 |
|
Monty Marz
|
3114fc2f7e
|
Merge branch 'zesterer/map-marker' into 'master'
Added map marker
See merge request veloren/veloren!2217
|
2021-05-01 16:26:13 +00:00 |
|
Joshua Barretto
|
b471128ce5
|
Added map marker
|
2021-05-01 16:26:13 +00:00 |
|
Samuel Keiffer
|
fd63256e9d
|
Merge branch 'lboklin/glider-take-off' into 'master'
Fix glider pitching down when trying to take off
See merge request veloren/veloren!2233
|
2021-05-01 14:09:03 +00:00 |
|
Ludvig Böklin
|
35eab4abcc
|
Fix glider pitching down when trying to take off
|
2021-05-01 15:35:26 +02:00 |
|
Samuel Keiffer
|
4771364ca0
|
Merge branch 'lboklin/fix-ori' into 'master'
Fix ori rate cap
See merge request veloren/veloren!2230
|
2021-04-30 18:24:49 +00:00 |
|
Ludvig Böklin
|
2dbecad3fa
|
Fix ori
|
2021-04-30 17:37:51 +02:00 |
|
Joshua Barretto
|
39c61fa6cc
|
Merge branch 'zesterer/fixes' into 'master'
Fixed admin physics check exemption
See merge request veloren/veloren!2229
|
2021-04-30 13:32:47 +00:00 |
|
Joshua Barretto
|
b9c2e55660
|
Fixed admin physics check exemption
|
2021-04-30 14:06:07 +01:00 |
|
Marcel
|
7ce5816f44
|
Merge branch 'master' into 'master'
German translation
See merge request veloren/veloren!2159
|
2021-04-30 11:58:31 +00:00 |
|
Jan Dre
|
8ee37767f5
|
German translation
|
2021-04-30 11:58:31 +00:00 |
|
Samuel Keiffer
|
be8f25052f
|
Merge branch 'DaforLynx/poise-sfx' into 'master'
Poise (stun) SFX and fix for town music
See merge request veloren/veloren!2212
|
2021-04-29 23:36:22 +00:00 |
|
DaforLynx
|
5358e7346a
|
Poise (stun) SFX and fix for town music
|
2021-04-29 23:36:22 +00:00 |
|
Samuel Keiffer
|
87f056658a
|
Merge branch 'sam/deduplicate-items' into 'master'
Sam/deduplicate items
See merge request veloren/veloren!2225
|
2021-04-29 20:11:43 +00:00 |
|
Sam
|
3bc7d69446
|
Deduplicated stuff in npc_armor.
|
2021-04-29 15:45:14 -04:00 |
|
Samuel Keiffer
|
3337e463f8
|
Merge branch 'lboklin/lower-zero-lift-drag' into 'master'
Lower zero-lift drag
See merge request veloren/veloren!2223
|
2021-04-29 19:11:12 +00:00 |
|
Justin Shipsey
|
a23b60fb13
|
Merge branch 'lboklin/object-masses' into 'master'
Define more accurate masses for objects
See merge request veloren/veloren!2220
|
2021-04-29 19:04:48 +00:00 |
|
Snowram
|
51ebcd84ed
|
Merge branch 'juliancoffee/nvim_gitignore' into 'master'
Ignore local neovim rc
See merge request veloren/veloren!2224
|
2021-04-29 18:04:24 +00:00 |
|
juliancoffee
|
7d5698dcb4
|
Ignore local neovim rc
|
2021-04-29 20:49:35 +03:00 |
|
Ludvig Böklin
|
9ae65352f1
|
Lower zero-lift drag
|
2021-04-29 19:22:09 +02:00 |
|
Sam
|
90fb4f43d2
|
Removed old 2h variants of 1h weapons.
|
2021-04-29 13:18:04 -04:00 |
|
Ben Wallis
|
d10185e55e
|
Merge branch 'xvar/admins-exempt-from-physics-checks' into 'master'
Made admins exempt from the server-side position and velocity checks
See merge request veloren/veloren!2222
|
2021-04-29 17:17:42 +00:00 |
|
Ben Wallis
|
9894f72fe0
|
Made admins exempt from the server-side position and velocity checks
|
2021-04-29 17:46:40 +01: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 |
|
Ludvig Böklin
|
8b28fd873c
|
Add more specific masses to objects
|
2021-04-29 11:46:03 +02: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 |
|