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
jshipsey
d4332c3138
eagle adjustments
2020-03-07 13:26:46 -05: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
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
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
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
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
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
de96551f65
Resolved pet alignment issues, added ranged aggro
2020-01-27 15:51:07 +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
7404800999
Added neutral NPC spawning
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
feeccc2ff3
Improved patrol idling
2020-01-26 12:52:32 +00:00
Joshua Barretto
d04a595b3f
Made waypoints work, added waypoint spawning
2020-01-26 12:52:28 +00:00
Joshua Barretto
11193a692a
Better neutral AI, initial waypoint objects
2020-01-26 12:52:28 +00:00
Joshua Barretto
290cb52d0d
I don't know how much I put in this commit, but it's some stuff
2020-01-26 12:52:28 +00:00
Joshua Barretto
f92371101c
Added pauseable pathfinding, improved Chaser heuristics, etc.
2020-01-26 12:52:07 +00:00
Joshua Barretto
2d9aa21eef
Added test world, friendly NPC pathfinding
2020-01-26 12:52:07 +00:00
Justin Shipsey
64690279af
new mobs
...
alligators
2020-01-26 00:22:48 +00:00
timokoesters
6515daddce
fixes
2020-01-24 16:57:24 +01:00
timokoesters
7b558b4542
refactor: combine actionstate and movestate
2020-01-21 23:54:59 +01:00
timokoesters
28fe73825d
feat: fitness stat effects movement speed
2020-01-21 19:24:09 +01:00
Gilbert Röhrbein
4f90e6325e
feat: add endurance fitness willpower to stats
2020-01-21 18:49:17 +01:00
timokoesters
2e8bf9d212
improvement: enemy balance
2020-01-20 19:15:12 +01:00
Joshua Barretto
8f86e45a72
Enumerated Body type
2020-01-20 14:21:06 +00:00
timokoesters
8afe5fd1dd
improvement: reset character state and energy on death
2020-01-19 22:39:19 +01:00
Joseph Gerardot
c10c31043c
Make charging take a discrete amount of energy and change energy
...
regeneration to use floats so it is smoother and tickrate-independent.
2020-01-19 22:39:17 +01:00
Joseph Gerardot
b4337e57aa
Add energy comsumption on rolling and charging, and accelerating
...
regeneration when idle.
2020-01-19 22:39:17 +01:00
AdamWhitehurst
976eface66
Update from MR comments
2020-01-17 08:39:21 -08:00
Adam Whitehurst
5959d2a5c7
Fix SFX and Assets
2020-01-16 05:28:45 -08:00
Adam Whitehurst
d82e93b39f
Merge master and build
2020-01-16 05:27:30 -08:00
AdamWhitehurst
1816d4b805
Move states/ to common/src/
2020-01-12 15:06:52 -08:00
Gilbert Röhrbein
28060e7b6e
fixing #405 - Energy as its own component
2020-01-12 22:25:04 +01:00
AdamWhitehurst
563e50b67d
Move utils file
2020-01-09 08:23:20 -08:00
AdamWhitehurst
de36e75264
Fix imports, update matches
2020-01-08 11:31:42 -08:00
AdamWhitehurst
5527d83a0e
Update mod imports
2020-01-08 08:56:36 -08:00
Adam Whitehurst
8cdf06e3e2
Swim pulsing
2020-01-08 05:17:36 -08:00
Adam Whitehurst
8648641362
Grooming
2020-01-07 07:49:08 -08:00
Adam Whitehurst
dc33f6ad6a
Ruin them again (the comments)
2020-01-05 15:28:20 -08:00
Adam Whitehurst
4e18ffe6c2
RUIN the comments
2020-01-05 15:26:04 -08:00
Adam Whitehurst
5bba0a96fc
Fix refs
2020-01-05 15:21:37 -08:00
Adam Whitehurst
542f06eef4
Add new() to states
2020-01-05 15:17:22 -08:00
Adam Whitehurst
8bf35a197b
Update weapon .ron
2020-01-05 11:26:22 -08:00
Adam Whitehurst
8fe5cec947
Clean up, make state handlers options
2020-01-05 10:19:09 -08:00
Adam Whitehurst
2f3ccbc5d6
Update Comments
2020-01-03 12:46:41 -08:00
Adam Whitehurst
2635c405fe
Ability comps and sys
2020-01-01 09:16:29 -08:00
AdamWhitehurst
b67a4835f4
Update disabled state flags
2019-12-31 05:19:23 -08:00
AdamWhitehurst
ba7ca785f6
Successful build
2019-12-30 05:56:42 -08:00
Monty Marz
8aff5faa83
assets update
...
acacia trees
updated help.png
bigger map zone name
npc levels from 0-10
boss levels from 20-50
2019-12-30 12:16:35 +00:00
AdamWhitehurst
9c6ce9babd
Begin implementing combat actions
2019-12-29 15:47:42 -08:00
AdamWhitehurst
7a4cdfb7a4
Documentation comments
2019-12-29 08:36:59 -08:00
AdamWhitehurst
ca44497258
Add movement_utils
2019-12-28 08:10:39 -08:00
AdamWhitehurst
06053faed0
Add state disables, cleanup imports
2019-12-26 10:01:19 -08:00
AdamWhitehurst
8e0317e03d
refactor states to handle update logic
2019-12-26 06:43:59 -08:00
AdamWhitehurst
c2ceabea0e
finish movment states handle() fn logic
2019-12-22 08:08:48 -08:00
AdamWhitehurst
1ab09220b0
Rudimentary Stand State handle() move
2019-12-21 07:57:15 -08:00
Imbris
934c5d6846
Various tweaks: moved radius determination to function on , comments, simplified server Destroy event code, debug assert modified components aren't removed in change tracking, etc
2019-12-20 22:51:35 -05:00
Imbris
71cce03f29
Move sync code into common submodule
2019-12-20 22:37:12 -05:00
Imbris
609e0f23bf
Stop global syncing of entity creation
2019-12-20 22:37:12 -05:00
Adam Whitehurst
e40eb2ba20
Finish Stand handle() (untested)
2019-12-20 08:50:54 -08:00
Adam Whitehurst
e074c7ce1d
begin impl state handle traits
2019-12-20 05:30:37 -08:00
Forest Anderson
d8fc7cb667
Add advanced path finding to new 'Traveler' enemy using A* algorithm
2019-12-11 05:28:45 +00:00
Adam Whitehurst
20575e0aab
Update controller
2019-12-09 14:45:10 +00:00
Adam Whitehurst
92d99af53c
feat: weapon-type dependent wield and attack durations
...
also some controller.rs cleanup
2019-12-03 06:30:08 +00:00
Adam Whitehurst
4e574cb29a
Inputs enhancements
2019-11-29 15:20:35 +00:00
Monty Marz
040e1a7535
Fix map being inverted and indicator positioning
2019-11-26 22:39:07 +00:00
Monty Marz
370e94b1ad
Loading Screen with pulsating text, 2 new hairstyles
2019-11-23 00:51:18 +00:00
Forest Anderson
5a73554aa1
Merge branch 'qwertycrackers' into 'master'
...
Add a `debug_items` chat command that gives all debug items.
See merge request veloren/veloren!641
2019-11-11 17:36:31 +00:00
Monty Marz
c38447a264
assets update
...
map image
human male hairstyles
elf male hairstyle
potion item
cheese item
removed admin items from inventory
2019-11-09 13:42:42 +00:00
Joseph Gerardot
0a44e714b4
Cargo fmt
2019-11-06 20:57:05 -05:00
Joseph Gerardot
52020e4902
Don't use the actual multiline doc comment syntax.
2019-11-06 18:02:58 -05:00
Joseph Gerardot
e73884a1d4
Respond to MR feedback.
...
Mainly clean up code with better use of iterators, and rename the debug
command to be just `debug`.
2019-11-06 17:57:54 -05:00
Joseph Gerardot
7325757066
cargo fmt the previous changes.
2019-11-05 15:57:08 -05:00
Joseph Gerardot
fab5377eed
Add interface to add stuff in bulk to inventory
...
Also includes inventory tests.
inventory API.
2019-11-05 15:57:08 -05:00
jshipsey
2b5fd372c5
streamlined body part naming scheme, swapped quadruped to quadruped_small, rewrote mesh names to reflect body type instead of npckind. finally.
2019-10-25 21:50:14 -04:00
jshipsey
25448ae2a1
body tweak
2019-10-25 21:34:29 -04:00
jshipsey
644939810f
added dragon skeleton
2019-10-25 21:33:59 -04:00
jshipsey
54fc712076
fish_medium and bird_medium skelingtons
2019-10-25 21:33:02 -04:00
timokoesters
3ceb3a9d6d
refactor: small adjustments
2019-10-25 09:47:28 +02:00
timokoesters
a6faffca4e
feat: asset glob loading, random weapons in chests
2019-10-24 23:55:25 +02:00
timokoesters
0a1e12c9ad
improvement: make debug items of type ItemKind::Tool
...
This way all items that can be held in a hand are tools
2019-10-24 23:55:24 +02:00
timokoesters
20248a4818
feat: store items as RON files
...
When a new item is created, a ron file will be used as a template
2019-10-24 23:47:26 +02:00
Imbris
a200dafd45
Fix possess bug, remove commented code, drain controller events
2019-10-24 00:00:00 -04:00
Imbris
2703c8afe1
Move serverside client to a component and communications into server ecs systems
2019-10-23 23:50:06 -04:00
Monty Marz
3e0ac48bd8
Multiple Assets and UI fixes and additions
2019-10-23 19:40:45 +00:00
Imbris
39656e92be
Merge branch '276-hotloading-armor' into 'master'
...
Resolve "Enable hotloading of different offsets for armors/weapons"
Closes #276
See merge request veloren/veloren!545
2019-10-18 00:29:09 +00:00
Monty Marz
fdfab6a807
refactor: create_projectile doesn't take a light
...
It returns a builder so the caller can just do it
2019-10-17 20:59:36 +00:00
Adam Fogle
3a4c307d38
Code cleanup, formatting changes, and fixed the cloth belt's offset.
2019-10-16 00:42:57 -04:00
heydabop
522ab2cd98
fixes #324 - changes possible modulo range from 0-29 to 1-29 to prevent mod by 0
2019-10-13 21:39:37 -05:00
Adam Fogle
a5db28113f
Redid the mainfest files to remove race/gender.
...
Now based on armor slot enum.
Added color to the manifest files.
Manifest files aren't yet being used, but will load.
2019-10-12 08:31:42 -04:00
Imbris
028d010624
Make bows give experience via giving projectiles an owner field
2019-10-11 19:33:01 -04:00
Imbris
2f9d8ee2e6
Add new debug item
2019-10-11 19:32:46 -04:00
Monty Marz
d82ec6715a
Item icons, chests and more
2019-10-09 19:28:05 +00:00
timokoesters
095e66fc01
fix: tweek hp
2019-10-08 20:36:46 +02:00
timokoesters
4e87f125a2
fix: fix level and health distribution
2019-10-08 18:12:08 +02:00
Monty Marz
b3862278af
Help window, UI fixes, asset fixes
2019-10-06 19:19:08 +00:00
timokoesters
182b98081b
feat(bow): arrows despawn after some time
2019-10-06 19:32:46 +02:00
Timo Koesters
f3787879d3
fix(bow): adds bow icon art
2019-10-05 21:51:08 +00:00
Piotr Korgól
09429b45d1
Make /adminify admin-only and /waypoint free
2019-10-05 17:37:10 +02:00
Piotr Korgól
9e10c8b700
Make enemies spawn with different levels
2019-10-05 17:37:09 +02:00
timokoesters
460a494e77
fix(bow): Don't remove vel and use sticky component instead
2019-10-04 21:30:13 +02:00
Pfauenauge90
f1c4e7040a
rebase fix
2019-10-04 21:02:45 +02:00
timokoesters
d876215012
feat(combat): melee combat damage depends on power of the weapon
...
Normal NPCs have a weapon of power 5 so they do 5 damage if the attack
is not blocked. Bosses and players have power 10.
2019-10-04 21:02:44 +02:00
timokoesters
ba3db852f7
feat(bow): make arrows stick to walls
2019-10-04 21:02:44 +02:00
timokoesters
fc97c27b65
feat(bow): sticky arrows
2019-10-04 21:02:43 +02:00
timokoesters
fe17b4952c
Remove warnings
2019-10-04 21:02:42 +02:00
timokoesters
2ba143a514
Make arrows deal damage
2019-10-04 21:02:41 +02:00
timokoesters
e3c02f8ac1
Allow projectiles to react to triggers
2019-10-04 21:02:40 +02:00
timokoesters
d46f1e1859
Initial bow & arrow implementation
2019-10-04 21:02:39 +02:00
Monty Marz
4c1eba1f3e
Assets update, aesthetics, minor fixes
2019-10-04 18:27:12 +00:00
Justin Shipsey
27f3bebe40
Char overhaul and asset update
2019-10-02 10:05:17 +00:00
Monty Marz
11a022abb3
Better stepping sounds (and minor voxel model fixes)
2019-09-27 16:04:22 +00:00
Joshua Barretto
a6d5b82ef5
Prevented pickups with full inventory
2019-09-26 00:15:07 +01:00
Joshua Barretto
a2758b091c
Added flower and grass items
2019-09-26 00:15:07 +01:00
Joshua Barretto
e22fe81a2f
Added velorite
2019-09-26 00:15:07 +01:00
Joshua Barretto
f57c2ec453
Made consumable items have an effect, better damage animation
2019-09-26 00:15:07 +01:00
Joshua Barretto
a961a267f1
Added apple and mushroom collection
2019-09-26 00:15:07 +01:00
Monty Marz
3a0131306f
Character assets Part 1
2019-09-18 16:46:12 +00:00
Joshua Barretto
3f2e22f039
Exponential interpolation for linear damping
...
With an additional approximation to allow for the same size jumps given different framerates.
2019-09-09 19:11:40 +00:00
Joshua Barretto
66c58840ef
Merge branch 'scott-c/first-person-model' into 'master'
...
Add first person models
See merge request veloren/veloren!443
2019-09-06 13:02:03 +00:00
scott-c
bc1ccfc99b
Fix first person weapon visible while not wielding
2019-09-06 18:22:26 +08:00
Imbris
52d84248ec
Remove all warnings
2019-09-04 19:03:49 -04:00
Imbris
fc9c87878e
Fix some warnings, cleanup comment
2019-09-03 23:09:29 -04:00
Imbris
8a994ada8e
Remove derpy eyes :( , fix undead eye indices, fmt
2019-09-03 23:06:15 -04:00
jshipsey
ca4da22c7d
fixing eyes, cleanup on offsets
2019-09-03 23:06:13 -04:00
jshipsey
178657c871
tweaked hair colors, head offsets, skin colors
2019-09-03 23:06:11 -04:00
Imbris
0ffc534df2
Add separate eye color lists for each race
2019-09-03 23:06:02 -04:00
Pfauenauge90
bdb95be5cc
hair and skin colours
2019-09-03 23:05:59 -04:00
Imbris
c4999f5e9d
adjust how figure head coloring is done
2019-09-03 23:05:58 -04:00
Imbris
7bebffb2af
Add ron file for head offsets, segment unionizer
2019-09-03 23:05:52 -04:00
timokoesters
ecbf7cad5b
Remove old code
2019-08-31 09:00:20 +02:00
timokoesters
9a832dd56b
Move std::mem::discriminant into new method
2019-08-30 22:51:46 -04:00
timokoesters
77a48c61a1
Fix rolling for the player
2019-08-30 22:50:53 -04:00
jshipsey
e6197d4c10
separate static anims for feet (run/static)
2019-08-30 22:50:53 -04:00
timokoesters
15978d216b
Rename controller main, alt to primary, secondary
2019-08-31 00:13:45 +02:00
