Adam Whitehurst
54a7112ad9
resolve conflicts merging master -> clientstates
2020-03-07 12:49:48 -08:00
Adam Whitehurst
096d3b691e
Merge master
2020-03-07 12:49:15 -08:00
Adam Whitehurst
c678ca9540
Re-add blocking
2020-03-07 11:55:15 -08:00
Adam Whitehurst
cb9e3859da
Rename character behavior sys
2020-03-07 11:02:54 -08:00
Adam Whitehurst
b1d1299fe6
Clean up character states
2020-03-07 10:15:02 -08:00
S Handley
b0ca85069b
Piggyback on the InventoryUpdate events and attach some additional event info so that we can detect why the inventory update was triggered, and emit an associated sfx event that matches it.
2020-03-04 10:09:48 +00:00
Caleb Cochran
219f9fa3be
Added missed comma
2020-02-25 22:01:51 -06:00
Caleb Cochran
8479230e66
Replaced commas (fmt issue)
2020-02-25 21:59:08 -06:00
Caleb Cochran
9f7aa61fbd
Fixing #504 - Enemies stop attacking after combat
2020-02-25 20:48:09 -06:00
Shane Handley
0d2b26a3b8
SFX Fixes - Reinstate run, uncomment tests and make them pass, adjust
...
config.
2020-02-25 22:03:29 +09:00
timokoesters
4cc998f92b
fix: non-humanoid npcs can attack again
2020-02-24 22:20:50 +01:00
timokoesters
d0439fdd84
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-24 21:34:17 +01:00
timokoesters
ac611f4618
fix: sync characterstates, better energy management
2020-02-24 20:57:33 +01:00
timokoesters
31f3aae75c
fix: make climbing cost stamina
2020-02-24 19:18:06 +01:00
timokoesters
2fa902270e
fix: block
2020-02-24 18:10:42 +01:00
timokoesters
1f4065ae32
fix: attacking
2020-02-24 14:32:12 +01:00
S Handley
d87061fe14
Add a volume option to SfxEvents, and use this to dispatch movement sfx for quadripeds at a volume proportionate to their size.
2020-02-23 01:26:51 +00:00
S Handley
9ab2833056
Add weapon wield/unwield sfx support
2020-02-21 02:56:54 +00:00
Monty Marz
2180040f70
Orc hairstyles, several tiny UI fixes, fixed beard warnings
2020-02-20 10:32:03 +00:00
Joshua Yanovski
8a9d4012fa
Allow spawning individual species with /spawn.
...
To get the old behavior, you now need to refer to the internal keywords
(like "bird_medium" or "quadruped_small") rather than the old friendly
names (like "duck" or "pig"), as the latter generate single species now.
2020-02-14 03:12:37 +01:00
Ben Simpson
636bf7d343
Merge branch 'expandedreality/energy-regen' into 'master'
...
Energy now does not regen when climbing,gliding,and swimming
Closes #483
See merge request veloren/veloren!800
2020-02-14 01:15:47 +00:00
Ben Simpson
c427f2298e
Energy now does not regen when climbing,gliding,and swimming
2020-02-13 18:46:01 -06:00
Ben Simpson
3343f8e5c0
Update common/src/sys/controller.rs, common/src/sys/movement.rs, common/src/comp/energy.rs files
2020-02-13 08:36:29 +00:00
Ben Simpson
bfd2f345b1
Update common/src/sys/movement.rs
2020-02-13 08:19:36 +00:00
Ben Simpson
0cd8150e98
Update common/src/sys/movement.rs
2020-02-13 08:13:36 +00:00
Ben Simpson
a49482503d
Update common/src/sys/controller.rs, common/src/sys/movement.rs files
...
Deleted energy.rs, movement.rs files
2020-02-13 07:59:54 +00:00
Ben Simpson
1aa98dbb62
Update common/src/comp/energy.rs, energy.rs, common/src/sys/controller.rs, common/src/sys/movement.rs, movement.rs files
2020-02-13 07:30:32 +00:00
Adam Whitehurst
d383abf950
Re add combat
2020-02-11 07:42:17 -08:00
Marcel Märtens
8f5e409ac4
update toolchain to
2020-02-09 22:58:01 +01:00
Marcel Märtens
90bcd87007
Reactivate Failure is allowed for benchmark and coverity
2020-02-09 20:01:44 +01:00
Imbris
fb7edd2404
Make nametag positioning slightly better
2020-02-06 17:10:52 -05:00
timokoesters
0bc07a0835
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-03 22:02:32 +01:00
timokoesters
aeb37a1f33
improvement: char speed
2020-02-03 20:43:36 +01:00
timokoesters
aa52c6fd4f
fix: jumping and attacking
2020-02-03 17:03:52 +01:00
Marcel Märtens
dae31ae5b6
apply new rustfmt - touching alot of files
2020-02-01 21:39:39 +01:00
Marcel Märtens
dd21235ff8
Apply prefixes to veloren source, espacially comments, so that reformating wont make it unreadable,
...
especially enumerations and other source code in errosions file
2020-02-01 21:37:36 +01:00
Joshua Barretto
faa86226c7
Collars
2020-01-29 12:01:28 +00:00
Joshua Yanovski
3fa21b3dc7
Per-speces NPC names!
...
Is also able to refactor some of the uglier code and introduces a
framework that (suitably extended) could be useful in removing
boilerplate elsewhere.
2020-01-29 04:41:32 +01:00
Joshua Barretto
116bc0d0b2
Fixed logic derp
2020-01-28 01:12:17 +00:00
Joshua Barretto
d87fc37aa2
Fixed watch compilation issue
2020-01-27 23:59:59 +00:00
Joshua Barretto
344eb9d45d
Added intermittent rolling to NPCs during a chase
2020-01-27 16:18:36 +00:00
Joshua Barretto
de96551f65
Resolved pet alignment issues, added ranged aggro
2020-01-27 15:51:07 +00:00
Joshua Barretto
09f0a5744f
Improved NPC spawning and names, made idle NPCs stop before hitting things
2020-01-27 10:58:33 +00:00
Monty Marz
981b55837a
fix typo in en.ron, fixed unfinished weapons dropping from chests
2020-01-26 22:57:06 +00:00
Joshua Barretto
631124f3fc
Switched to _squared(), added comments, parallelised waypoint gen
2020-01-26 12:52:32 +00:00
Joshua Barretto
7404800999
Added neutral NPC spawning
2020-01-26 12:52:32 +00:00
Joshua Barretto
723b578378
Improved pet aggression system, made waypoints rarer
2020-01-26 12:52:32 +00:00
Joshua Barretto
c9138d913c
Fixed pathfinding limit bug, improvements to idle AI
2020-01-26 12:52:32 +00:00
Joshua Barretto
7437c18b99
Various bug fixes
2020-01-26 12:52:32 +00:00
Joshua Barretto
8c7e96e313
Improved waypoint spawn locations, scaled down pathfinding cost
2020-01-26 12:52:32 +00:00
