Knightress Paladin
|
01595e6a8d
|
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
|
2021-07-07 20:03:26 -07:00 |
|
Knightress Paladin
|
c0752cd6dc
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 20:01:00 -07:00 |
|
Knightress Paladin
|
484fc3f161
|
Clean up sceptre ai code before merge
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
64ff6c3754
|
Fixed formatting
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
4bd34d1871
|
Add check to see if cultist already has ward buff
|
2021-07-07 20:00:35 -07:00 |
|
Knightress Paladin
|
7d35383be5
|
Added sceptre tactic and sceptre cultists
|
2021-07-07 20:00:01 -07:00 |
|
Knightress Paladin
|
7200b35ca3
|
Added check to prevent sceptre AI from canceling its own ward
|
2021-07-07 19:21:30 -07:00 |
|
Knightress Paladin
|
00a05e82df
|
Clean up sceptre ai code before merge
|
2021-07-07 17:56:47 -07:00 |
|
Knightress Paladin
|
5c98d39317
|
Fixed formatting
|
2021-07-07 17:06:02 -07:00 |
|
Dominik Broński
|
3a2d615fe5
|
Merge branch 'pfau/stuff' into 'master'
Minimap modes, Danari customizations update & bald hairstyles
See merge request veloren/veloren!2576
|
2021-07-08 00:01:09 +00:00 |
|
Monty Marz
|
2a1efb4b2b
|
Minimap modes, Danari customizations update & bald hairstyles
|
2021-07-08 00:01:08 +00:00 |
|
Samuel Keiffer
|
f7fa2ce21a
|
Merge branch 'sam/energy-stat' into 'master'
Added energy efficiency stat to weapons.
See merge request veloren/veloren!2571
|
2021-07-07 22:57:58 +00:00 |
|
Joshua Barretto
|
d2325887bf
|
Merge branch 'revert-fc835f67' into 'master'
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
See merge request veloren/veloren!2575
|
2021-07-07 22:47:42 +00:00 |
|
Joshua Barretto
|
15200d48df
|
Revert "Merge branch 'xvar/wgpu-0.9' into 'master'"
This reverts merge request !2566
|
2021-07-07 22:07:00 +00:00 |
|
Joshua Barretto
|
7a6a8a741a
|
Merge branch 'DixieDev/569-fix-inventory-and-lantern-usage-while-dead' into 'master'
Fix players having inventory and lantern control while dead
Closes #569
See merge request veloren/veloren!2569
|
2021-07-07 18:44:01 +00:00 |
|
juliancoffee
|
308348e1dc
|
Revert non-ui code changes
|
2021-07-07 17:53:17 +03:00 |
|
juliancoffee
|
8b032d661b
|
Add tests
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
3feb3800d7
|
Use code-spliced values for i18n skill description
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
a380283480
|
Add support for splicing numbers into skill desc
|
2021-07-07 17:51:30 +03:00 |
|
juliancoffee
|
9f8faad329
|
Move skill boost modifiers to skills module
|
2021-07-07 17:51:30 +03:00 |
|
DixiE
|
86fd512647
|
Fix players having inventory and lantern control while dead
|
2021-07-07 13:18:24 +01:00 |
|
Marcel
|
81952483fa
|
Merge branch 'Swagazaki-master-patch-23928' into 'master'
Just updated common.ron to correct a few French translations!
See merge request veloren/veloren!2573
|
2021-07-07 11:53:01 +00:00 |
|
Swagazaki
|
b824c47d43
|
Just updated common.ron to correct a few French translations!
|
2021-07-07 10:55:15 +00:00 |
|
Knightress Paladin
|
33c4614d35
|
Add check to see if cultist already has ward buff
|
2021-07-06 21:10:33 -07:00 |
|
Sam
|
0b22953f05
|
Added energy efficiency stat to weapons. Made ability modification by tool stats exhaustive.
|
2021-07-06 22:54:23 -05:00 |
|
Samuel Keiffer
|
93af5e74a5
|
Merge branch 'snowram/dungeon-entraces-biomes' into 'master'
Spawn dungeon entrances depending on the Site origin biome
See merge request veloren/veloren!2554
|
2021-07-07 02:47:34 +00:00 |
|
Snowram
|
6d122c6ade
|
Spawn dungeon entrances depending on the Site origin biome
|
2021-07-07 00:35:50 +02:00 |
|
Samuel Keiffer
|
80fb4fc530
|
Merge branch 'aweinstock/improve-airship-pid' into 'master'
Fix integral error calculations in PID controller, and change coefficients for...
See merge request veloren/veloren!2568
|
2021-07-06 21:38:07 +00:00 |
|
Samuel Keiffer
|
8ee72466f2
|
Merge branch 'sam/fix-network-test' into 'master'
Fix network test
See merge request veloren/veloren!2567
|
2021-07-06 21:29:51 +00:00 |
|
Samuel Keiffer
|
9460d76a06
|
Merge branch 'sam/range-stat' into 'master'
Added range stat to weapons.
See merge request veloren/veloren!2563
|
2021-07-06 21:18:47 +00:00 |
|
Avi Weinstock
|
fdb5dedac1
|
Fix integral error calculations in PID controller, and change coefficients for airship and hot air balloon.
|
2021-07-06 16:52:12 -04:00 |
|
Sam
|
f2b00f965e
|
Fix test
|
2021-07-06 15:49:57 -05:00 |
|
Sam
|
572072608b
|
Addressed review comments. Removed individual stat assignments.
|
2021-07-06 15:27:49 -05:00 |
|
Marcel
|
a466b305da
|
Merge branch 'master' into 'master'
Add Hungarian translation
See merge request veloren/veloren!2559
|
2021-07-06 11:44:58 +00:00 |
|
Knightress Paladin
|
3851ef5183
|
Merge branch 'knightresspaladin/sceptre-ai' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/sceptre-ai
|
2021-07-06 01:48:11 -07:00 |
|
Knightress Paladin
|
67eff74b29
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:47:22 -07:00 |
|
Knightress Paladin
|
195341f515
|
Added sceptre tactic and sceptre cultists
|
2021-07-06 01:29:11 -07:00 |
|
Marcel
|
ffcf6360e8
|
Merge branch 'xvar/wgpu-0.9' into 'master'
Updated wgpu to 0.9.0 and egui to 0.13.0
See merge request veloren/veloren!2566
|
2021-07-06 07:27:45 +00:00 |
|
Ben Wallis
|
1f100cd3ea
|
Updated wgpu to 0.9.0 and egui to 0.13.0
|
2021-07-06 07:32:27 +01:00 |
|
Samuel Keiffer
|
9e4dde42ef
|
Merge branch 'caldog20/fix-beam-turning-rate-#1088' into 'master'
Fixed fast turning rate for BasicBeam abilities
See merge request veloren/veloren!2565
|
2021-07-06 04:23:33 +00:00 |
|
Samuel Keiffer
|
32ff7e62db
|
Merge branch 'knightresspaladin/fix-block-discoloration' into 'master'
Added check for exploding lava and glowing blocks
See merge request veloren/veloren!2564
|
2021-07-06 03:28:11 +00:00 |
|
Caleb
|
b7f7503602
|
Lowered ori_rate to 0.3 for BasicBeam abilities
|
2021-07-05 22:08:52 -05:00 |
|
Knightress Paladin
|
bd0f467b41
|
Merge branch 'knightresspaladin/fix-block-discoloration' of https://gitlab.com/veloren/dev/veloren into knightresspaladin/fix-block-discoloration
|
2021-07-05 19:43:19 -07:00 |
|
Knightress Paladin
|
f729ec3d3d
|
Formatted code to omit continue keyword
|
2021-07-05 19:41:25 -07:00 |
|
Knightress Paladin
|
a771bea612
|
Added check for exploding lava and glowing blocks
|
2021-07-05 19:41:25 -07:00 |
|
Knightress Paladin
|
f6b6470444
|
Added check for exploding lava and glowing blocks
|
2021-07-05 19:13:11 -07:00 |
|
Sam
|
aa60081ec7
|
Added range stat to weapons.
|
2021-07-05 20:32:12 -05:00 |
|
Marcel
|
bafdd1daa7
|
Merge branch 'alphyr/disable_hot_reloading' into 'master'
Add a feature to optionnally disable hot-reloading
See merge request veloren/veloren!2562
|
2021-07-06 00:11:21 +00:00 |
|
Benoît du Garreau
|
ab6105d789
|
Add a feature to optionnally disable hot-reloading
|
2021-07-06 00:27:09 +02:00 |
|
Marcel
|
b8961ce21b
|
Merge branch 'aweinstock/fix-keyedjobs-warning' into 'master'
Fix spurious warning in KeyedJobs.
See merge request veloren/veloren!2561
|
2021-07-05 21:41:00 +00:00 |
|