Samuel Keiffer
92b32b4c36
Merge branch 'ygor/fix-axe-energy-reward' into 'master'
...
Allow axe combo to reward energy without skillpoint
See merge request veloren/veloren!2722
2021-08-05 00:38:41 +00:00
Imbris
97f87be44f
Merge branch 'capucho/derivative-fix' into 'master'
...
Don't use derivatives in vertex shader
See merge request veloren/veloren!2731
2021-08-05 00:37:04 +00:00
João Capucho
c4214fedbe
Don't use derivatives in vertex shader
2021-08-04 23:14:08 +01:00
Joshua Barretto
a465813965
Merge branch 'zesterer/agent-fixes' into 'master'
...
Added action timer system for agent code
See merge request veloren/veloren!2726
2021-08-04 16:17:49 +00:00
Joshua Barretto
665951946f
Fixed block snapping
2021-08-04 14:12:10 +01:00
Joshua Barretto
31a49d26a9
Added action timer system for agent code
2021-08-04 14:04:56 +01:00
Joshua Barretto
33e9bc79e3
Merge branch 'zesterer/fix-pets' into 'master'
...
Fix pets without agency
See merge request veloren/veloren!2728
2021-08-04 00:25:04 +00:00
Joshua Barretto
8822c6409e
Fix pets without agency
2021-08-04 00:22:03 +01:00
Joshua Barretto
f4e04ecefc
Merge branch 'juliancoffee/handle_pvp' into 'master'
...
Handle PvP/PvE
See merge request veloren/veloren!2686
2021-08-03 21:09:09 +00:00
Marcel
c316960b3f
Merge branch 'umr1352/fix#1260' into 'master'
...
fix issue #1260 : give a warning if an error occurs on language files load
Closes #1260
See merge request veloren/veloren!2724
2021-08-03 21:09:06 +00:00
Enrico Marconi
cae8005a18
fix issue #1260 : give a warning if an error occurs on language files load
2021-08-03 21:09:05 +00:00
Marcel
32894065e9
Merge branch 'yusdacra/chore/nix' into 'master'
...
build(nix): fix nix builds
Closes #1132
See merge request veloren/veloren!2720
2021-08-03 21:09:04 +00:00
juliancoffee
4766450258
Avoid negative bounds in harm checks
...
* disallow_harm -> allow_harm to avoid negative reasoning since it mostly
requires double negation in code
* allow_harm -> may_harm to specify side-effect free
2021-08-03 18:57:53 +03:00
Yusuf Bera Ertan
aa371147e7
build: update keyboard-keynames
2021-08-03 18:16:55 +03:00
Yusuf Bera Ertan
88eca50c36
docs(nix): add notice for vulkan driver error potentially relating to nixpkgs mismatches
2021-08-03 17:45:42 +03:00
Yusuf Bera Ertan
521b2bf46b
build(nix): remove useless override (upstreamed), fix crate name
2021-08-03 17:45:41 +03:00
Yusuf Bera Ertan
3952d8b86f
chore(deps): update nix flake deps
2021-08-03 17:45:41 +03:00
juliancoffee
44916383c6
continue -> filter_map to handle new players
2021-08-03 16:43:56 +03:00
juliancoffee
5e6007db03
Return self-harm
2021-08-03 16:43:56 +03:00
juliancoffee
d9e2d501cd
Prettify server/sys/msg/register.rs
2021-08-03 16:43:56 +03:00
juliancoffee
1efc3188ef
Refactor projectile system
2021-08-03 16:43:55 +03:00
juliancoffee
497a94cd7a
Post review refactoring
...
* inline `target_dodging` into struct declaration as they are named
anyway
* move `avoid_harm` check out of `Attack::apply_attack` so we don't need
to pass whole Player component.
* another cosmetic things
2021-08-03 16:43:55 +03:00
juliancoffee
7413e7fd11
Prettify aura system
2021-08-03 16:43:55 +03:00
juliancoffee
aaf2df19d4
Make Veloren compile again
2021-08-03 16:43:55 +03:00
juliancoffee
9300353c98
Use emitter.emit() in server/sys/msg/register
2021-08-03 16:43:55 +03:00
juliancoffee
229e7b9cec
Add CHANGELOG note about battle_mode setting
2021-08-03 16:43:54 +03:00
juliancoffee
61416faec3
Refactor Aura system, add avoid_harm flag
...
+ fix bug where you cast OutOfGroup on yourself and your group
2021-08-03 16:42:58 +03:00
juliancoffee
c7fdb640ac
Cleaning
2021-08-03 16:42:58 +03:00
juliancoffee
7d4a8cbfa4
Add battle_mode server setting and player flag
2021-08-03 16:42:58 +03:00
juliancoffee
328e865ed3
Add asset_tweak macros
2021-08-03 16:31:13 +03:00
juliancoffee
2ce09af2d8
Remove redundant serial_test crate
2021-08-03 16:31:13 +03:00
juliancoffee
30ebf04e96
Add ability to specify directory in asset_tweak
2021-08-03 16:31:13 +03:00
juliancoffee
99d0c2cb95
Remove clone() for creating new tweak file
2021-08-03 16:31:13 +03:00
juliancoffee
846233367f
Introduce helper functions and deduplicate docs
2021-08-03 16:31:13 +03:00
Samuel Keiffer
e6ef678c28
Merge branch 'knightresspaladin/mage-ai' into 'master'
...
Update Mage AI to Intelligently Use Shockwave
See merge request veloren/veloren!2664
2021-08-03 12:53:32 +00:00
Imbris
e23afacb81
Merge branch 'imbris/backend-error' into 'master'
...
Add custom error message when there are no compatible graphics backends available
See merge request veloren/veloren!2721
2021-08-03 09:07:01 +00:00
Knightress Paladin
b338abd761
Fix up comments relating to AI logic
2021-08-02 22:38:16 -07:00
Ygor Souza
1b5c3883a4
Allow axe combo to reward energy without skillpoint
...
When the character does not have the Double Strike Combo skill, the
ability's stage_data only contains one element, and thus the
stage_data.len() - 1 expression would set the max_energy_regen to 0.
This change forces the multiplier to 1 in this specific case, so the axe
can still reward energy without the combo skill point, to match the
other weapons.
2021-08-03 07:10:03 +02:00
Imbris
427930081a
Add custom error message when there are no compatible graphics backends available
2021-08-03 00:00:30 -04:00
Knightress Paladin
8dd2202e1a
Restyle logic in Staff AI
2021-08-02 16:22:40 -07:00
Knightress Paladin
a6acdbbfa7
Used adjusted_by_skills to correctly calculate ability values
2021-08-02 16:22:40 -07:00
Knightress Paladin
998c56c524
Removed extra Warlock skills and made sceptre cultists rarer
2021-08-02 16:22:40 -07:00
Knightress Paladin
e87bfae5cd
Allowed staff AI to queue shockwave if occupied by animation
2021-08-02 16:22:40 -07:00
Knightress Paladin
38432cc880
Restructured logic for staff AI
2021-08-02 16:22:40 -07:00
Monty Marz
a1e22df944
Merge branch 'transp---opacity-in-UI' into 'master'
...
transparency -> opacity
See merge request veloren/veloren!2714
2021-08-02 21:30:37 +00:00
Monty Marz
bceed44614
transp -> opacity
2021-08-02 22:49:10 +02:00
Marcel
b29e3c692e
Merge branch 'xMAC94x/csv_export' into 'master'
...
move translation check to seperate ci step
See merge request veloren/veloren!2716
2021-08-02 19:12:42 +00:00
Marcel Märtens
ee704e171d
move translation check to seperate ci step
...
note: TAGUUID is used to avoid sqlinjections by choosing a branch name
2021-08-02 20:11:02 +02:00
Joshua Barretto
8be625c606
Merge branch 'zesterer/better-agent-creation' into 'master'
...
Better Agent API
See merge request veloren/veloren!2719
2021-08-02 13:59:42 +00:00
Joshua Barretto
35902d45b4
Merge branch 'tygyh/buttons-refactoring' into 'master'
...
Tygyh/buttons refactoring
See merge request veloren/veloren!2718
2021-08-02 12:37:43 +00:00
