Ben Wallis
823120f923
Hacked in support for tokio console-subscriber
2021-09-09 11:35:07 +01:00
Samuel Keiffer
6cdc620c5d
Merge branch 'zesterer/tiny-fixes' into 'master'
...
Tiny fixes
See merge request veloren/veloren!2822
2021-09-08 17:09:38 +00:00
Joshua Barretto
78fce06b47
Allowed players to assist NPCs in fights without problems by tweaking aggro rules
2021-09-08 13:17:53 +01:00
Joshua Barretto
c442822885
Capped camera distance without privilege
2021-09-08 13:17:22 +01:00
Joshua Barretto
c3a0a1b8b5
Made the camera go dark if in a filled block and not moderator
2021-09-08 12:37:15 +01:00
Monty Marz
aaaa5a9ae9
Merge branch 'pfau/bloom_settings' into 'master'
...
Bloom settings
See merge request veloren/veloren!2821
2021-09-08 09:50:37 +00:00
Monty Marz
a23433b402
Bloom settings
2021-09-08 09:50:37 +00:00
Joshua Barretto
14bea533e7
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
c7291701e1
Sprite interaction fixes
2021-09-07 20:34:04 -04:00
Joshua Barretto
49ceb29240
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
3f31f07cc2
[ #1251 ] Code style refactoring
2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
c22104ea56
[ #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
75bbe619fd
[ #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
a19f1dfc14
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
c9e2293a6c
Server: Fix character deletion mentioned in #1327
2021-09-06 16:02:41 +03:00
Samuel Keiffer
d5bf9eb6ad
Merge branch 'slipped/changes' into 'master'
...
buff guards
See merge request veloren/veloren!2816
2021-09-06 05:06:39 +00:00
jshipsey
3c623c6801
address comments, boost village pop, lower raid chance
2021-09-06 00:01:26 -04:00
jshipsey
da9585205c
buff guards
2021-09-05 23:17:14 -04:00
Samuel Keiffer
5e3e698c2a
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
cbc6cdfad1
Use unreachable instead of panic
2021-09-05 18:13:20 -05:00
Khalid Ali
a0b78ffd16
Add RepeaterRanged and fix scaling ChargedRange
2021-09-05 18:03:54 -05:00
Khalid Ali
871a1ccbfc
Set direction using character state
2021-09-05 17:07:09 -05:00
Joshua Barretto
ce0a7852bf
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
7479bff78e
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
d256d09d28
Fixed server-cli command parsing failure on Windows
2021-09-05 16:46:20 +01:00
Sam
9675d2b45a
Cultists no longer attack the starting town.
2021-09-05 11:36:40 -04:00
Joshua Barretto
b4697555d2
Merge branch 'slipped/icons' into 'master'
...
isometric icons
See merge request veloren/veloren!2811
2021-09-05 00:42:54 +00:00
jshipsey
1a5fd6cfea
isometric icons
2021-09-04 19:51:02 -04:00
Marcel
9966e5175c
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
a1f2c46f30
Added translation for Serbian language
2021-09-04 23:44:22 +00:00
Joshua Yanovski
a7e7245019
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
5500435d2f
Revert "Replace shaderc with naga"
...
This reverts commit 446d93dda0
2021-09-04 11:59:18 -07:00
Joshua Barretto
896d9299e5
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
003b9f57ce
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
7538f29b9e
Merge branch 'slipped/tweaks' into 'master'
...
more spots
See merge request veloren/veloren!2806
2021-09-04 18:16:10 +00:00
juliancoffee
670e29a286
Better formatting
2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0
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
3fa89c7a22
Merge branch 'sam/cultist-raiders' into 'master'
...
Cultist raiders
See merge request veloren/veloren!2807
2021-09-04 17:21:38 +00:00
jshipsey
6187cb8d23
address comments
2021-09-04 13:17:56 -04:00
Bryant Deters
f8c54cbd05
added a bipedsmall variant to loot fallback
2021-09-04 12:11:09 -05:00
Sam
7b0c096a22
Changelog
2021-09-04 12:43:24 -04:00
Sam
261fd562dc
Raiders raid less often, raid for less time, and sit at their home for longer.
2021-09-04 12:42:42 -04:00
Sam
f65b3a094d
Cultists now properly raid villages.
2021-09-04 12:25:04 -04:00
Joshua Barretto
6c0c41a3bf
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
ee37c8d62d
Adds new dungeon entrances
2021-09-04 14:55:55 +02:00
Sam
f198349f61
Attempt at getting raiders to wander around village once they get there.
2021-09-04 01:10:57 -04:00
Sam
e75156e052
Hacky raid mechanics for cultist raiders.
2021-09-04 00:34:30 -04:00
jshipsey
523a15e5cc
more spots
2021-09-04 00:18:58 -04:00
Sam
57ba9a0300
Cultist enemies are now spawned by rtsim.
2021-09-04 00:05:48 -04:00
Sam
311fb251c1
Allowed specifying that rtsim entities spawn at a particular site.
2021-09-03 23:34:24 -04:00
