Monty Marz
8506d31736
Bloom settings
2021-09-08 09:50:37 +00:00
Joshua Barretto
c090d09dd8
Merge branch 'sam/fix-voxygen-sprite' into 'master'
...
Sprite interaction fixes
See merge request veloren/veloren!2820
2021-09-08 00:58:25 +00:00
Sam
c21716a1b3
Sprite interaction fixes
2021-09-07 20:34:04 -04:00
Joshua Barretto
69d972c22d
Merge branch 'specter/kill_npcs_additional_pet_argument' into 'master'
...
[#1251 ] /kill_npcs admin command does not kill player's pets now without additional argument
See merge request veloren/veloren!2819
2021-09-06 18:33:33 +00:00
Aleksandr Nariadchikov
c4c62f4c4f
[ #1251 ] Code style refactoring
2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
0de752263a
[ #1251 ] Mutable variables are removed. For killing checking non players without alignments as well as with it.
2021-09-06 19:31:12 +03:00
Aleksandr Nariadchikov
363332ec86
[ #1251 ] /kill_npcs admin command does not kill player's pets now without additional argument "--also-pets"
2021-09-06 18:21:32 +03:00
Ben Wallis
8bbf661575
Merge branch 'fixing-character-deletion' into 'master'
...
Server: Fix character deletion mentioned in #1327
See merge request veloren/veloren!2818
2021-09-06 13:40:01 +00:00
Xeriab Nabil
7115382535
Server: Fix character deletion mentioned in #1327
2021-09-06 16:02:41 +03:00
Samuel Keiffer
aed2f3d84a
Merge branch 'slipped/changes' into 'master'
...
buff guards
See merge request veloren/veloren!2816
2021-09-06 05:06:39 +00:00
jshipsey
1c8e14964d
address comments, boost village pop, lower raid chance
2021-09-06 00:01:26 -04:00
jshipsey
76e8075f8e
buff guards
2021-09-05 23:17:14 -04:00
Samuel Keiffer
f72f875124
Merge branch 'khalludi/adjust_entity_aim' into 'master'
...
Set direction using character state
Closes #1219
See merge request veloren/veloren!2815
2021-09-06 00:33:41 +00:00
Khalid Ali
bbf1dc4167
Use unreachable instead of panic
2021-09-05 18:13:20 -05:00
Khalid Ali
dfad30d7dd
Add RepeaterRanged and fix scaling ChargedRange
2021-09-05 18:03:54 -05:00
Khalid Ali
5ada9f362a
Set direction using character state
2021-09-05 17:07:09 -05:00
Joshua Barretto
e66ea71313
Merge branch 'xvar/fix-stdin-commands' into 'master'
...
Fixed server-cli command parsing failure on Windows
See merge request veloren/veloren!2814
2021-09-05 16:22:44 +00:00
Samuel Keiffer
a7856f58ed
Merge branch 'sam/safe-start' into 'master'
...
Cultists no longer attack the starting town.
See merge request veloren/veloren!2813
2021-09-05 16:17:15 +00:00
Ben Wallis
85cd510ce4
Fixed server-cli command parsing failure on Windows
2021-09-05 16:46:20 +01:00
Sam
c770545526
Cultists no longer attack the starting town.
2021-09-05 11:36:40 -04:00
Joshua Barretto
fd20736cea
Merge branch 'slipped/icons' into 'master'
...
isometric icons
See merge request veloren/veloren!2811
2021-09-05 00:42:54 +00:00
jshipsey
33b0aabe82
isometric icons
2021-09-04 19:51:02 -04:00
Marcel
baa7c93718
Merge branch 'master' into 'master'
...
Added translation for Serbian language
See merge request veloren/veloren!2795
2021-09-04 23:44:22 +00:00
komamch eros
7e91c9e922
Added translation for Serbian language
2021-09-04 23:44:22 +00:00
Joshua Yanovski
21f9af3084
Merge branch 'sharp/revert-naga' into 'master'
...
Revert "Replace shaderc with naga"
See merge request veloren/veloren!2810
2021-09-04 19:56:12 +00:00
Joshua Yanovski
81f78b43ce
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 11:59:18 -07:00
Joshua Barretto
102a6fe1f0
Merge branch 'ubruntu/fix-dungeon-loot-fallback' into 'master'
...
fix BipedSmall NPCs using fallback loot table
See merge request veloren/veloren!2809
2021-09-04 18:53:55 +00:00
Joshua Barretto
278451b6e6
Merge branch 'juliancoffee/pvp_command' into 'master'
...
Implement /battlemode command and more
See merge request veloren/veloren!2787
2021-09-04 18:37:01 +00:00
Joshua Barretto
bdb2b06d2c
Merge branch 'slipped/tweaks' into 'master'
...
more spots
See merge request veloren/veloren!2806
2021-09-04 18:16:10 +00:00
juliancoffee
69f18c8fe6
Better formatting
2021-09-04 20:56:55 +03:00
juliancoffee
134699e1db
Adress review:
...
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
plant fields, which is kinda meh)
- better error displaying
2021-09-04 20:38:53 +03:00
Samuel Keiffer
ffbf7cec73
Merge branch 'sam/cultist-raiders' into 'master'
...
Cultist raiders
See merge request veloren/veloren!2807
2021-09-04 17:21:38 +00:00
jshipsey
6919f535d4
address comments
2021-09-04 13:17:56 -04:00
Bryant Deters
23daa0e5c7
added a bipedsmall variant to loot fallback
2021-09-04 12:11:09 -05:00
Sam
e80c21bf94
Changelog
2021-09-04 12:43:24 -04:00
Sam
d98bc92be1
Raiders raid less often, raid for less time, and sit at their home for longer.
2021-09-04 12:42:42 -04:00
Sam
bfcb27db5a
Cultists now properly raid villages.
2021-09-04 12:25:04 -04:00
Joshua Barretto
1caa97d844
Merge branch 'snowram/new-dungeon-entrances' into 'master'
...
Adds new dungeon entrances by Hannibal
See merge request veloren/veloren!2808
2021-09-04 13:45:22 +00:00
Snowram
c63843bc80
Adds new dungeon entrances
2021-09-04 14:55:55 +02:00
Sam
111cab4892
Attempt at getting raiders to wander around village once they get there.
2021-09-04 01:10:57 -04:00
Sam
13192b6024
Hacky raid mechanics for cultist raiders.
2021-09-04 00:34:30 -04:00
jshipsey
78af24a4ed
more spots
2021-09-04 00:18:58 -04:00
Sam
2fae9d9b56
Cultist enemies are now spawned by rtsim.
2021-09-04 00:05:48 -04:00
Sam
7983c75911
Allowed specifying that rtsim entities spawn at a particular site.
2021-09-03 23:34:24 -04:00
juliancoffee
182d3c4815
Workaround of bug with global Player component
...
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
2021-09-04 02:29:02 +03:00
Marcel
663fe0fdbc
Merge branch 'xMAC94x/fix_macos' into 'master'
...
disable mumble-link on macos
See merge request veloren/veloren!2804
2021-09-03 23:25:40 +00:00
juliancoffee
c87905305d
Improve UX of /battlemode
2021-09-04 01:41:48 +03:00
juliancoffee
91539a3b67
Add in-memory persistence for battlemode changes
2021-09-04 01:41:48 +03:00
juliancoffee
df066f364a
Cooldowns
...
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
2021-09-04 01:41:48 +03:00
Marcel Märtens
5357ec43d6
disable mumble-link on macos
2021-09-04 00:32:16 +02:00
