Marcel
121364821a
Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master'
...
xMAC94x/feuerzeugBierflasche
See merge request veloren/veloren!1478
2020-11-05 09:22:50 +00:00
Sam
c48c022f7e
Separated out health from stats component.
2020-11-04 19:22:04 -06:00
Sam
f1f5c2b21b
Added energy change server event.
2020-11-04 19:22:01 -06:00
Marcel Märtens
a7123c6e14
put cache in ECS to get rid of allocations
2020-11-04 14:19:28 +01:00
Imbris
64def3cde4
Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts
2020-10-29 18:40:11 -04:00
Sam
a7e3e55a12
Transitioned damage and healing from u32/i32s to enums.
2020-10-28 18:15:25 -05:00
Adam Whitehurst
f759895d63
add maxhealthmodifier
...
oops variable
2020-10-26 19:30:18 -05:00
Sam
f60985d733
Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now.
2020-10-26 19:30:17 -05:00
Sam
337cf6e137
Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented.
2020-10-26 19:30:10 -05:00
Sam
1a1ceb54bc
Server event used to deal damage/heal with buffs. Buff kills now award xp.
2020-10-26 19:28:20 -05:00
Sam
c50063ad0c
Move addition/removal of buffs to server event.
2020-10-26 19:28:15 -05:00
BottledByte
7ab99a3bbf
Initial WIP implementation of the Buff system
2020-10-26 19:28:14 -05:00
jiminycrick
50aac17d94
Added secondary skills to agent code (except bow)
2020-10-19 16:20:58 +02:00
Sam
d869f7e430
Moved explsion struct from within comp to common.
2020-10-14 21:06:55 -05:00
Sam
1c21362bc3
Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles.
2020-10-14 20:56:23 -05:00
Sam
cbb72363af
Reworked explosions. Tweaked staff fireball.
2020-10-14 20:56:21 -05:00
Imbris
71251ca6a6
Change admins from Vec<String> into Hashset<Uuid>, add commands to server-cli-bin for adding and removing admins
2020-10-10 02:10:32 -04:00
Sam
a8f31cbe6f
Beam tick rate now more responsive when aiming.
2020-09-29 19:48:14 -05:00
Sam
46563e7008
Added beam system. Added collision code for spherical wedge/cylinder detection.
2020-09-29 19:48:04 -05:00
Sam
717142d5ea
Started to implement shockwave system.
2020-09-19 14:29:06 -05:00
jshipsey
cd6e1ad45f
haul out the critter skele, add theropod
2020-09-17 22:32:10 -04:00
TheThirdSpartan
6dbd1bc132
adding feature requested in issue #153 - displaying your alias in game as 'you'
2020-09-06 19:42:32 +00:00
scott-c
4bc373a832
remove particle emitter component
2020-08-08 19:25:00 +08:00
scott-c
803677f0fb
Add particle velocity and ability particle emitter
2020-08-08 19:25:00 +08:00
scott-c
39b676cd8f
Add ParticleMgr
2020-08-08 19:24:55 +08:00
scott-c
42a10a6059
Add ParticleEmitter Component
2020-08-08 19:24:22 +08:00
Imbris
d856c20225
Integrate groups with chat groups
2020-08-08 01:12:35 +02:00
Imbris
10c3d01466
Add basic group functionality (no voxygen wiring yet)
2020-08-08 01:09:01 +02:00
Imbris
c2f3e1b47f
Revert "Merge branch 'BottledByte/ability_design' into 'master'"
...
This reverts merge request !1264
2020-08-06 08:04:03 +00:00
BottledByte
34c87d7a86
Add ability IDs and use them in GUI
2020-08-05 23:00:43 +02:00
Samuel Keiffer
527e7a329e
Armor fixes
2020-07-25 23:57:04 +00:00
lausek
a3326b5744
fix #611 ; add distance check when mounting pet
2020-07-15 14:54:53 +02:00
Joshua Barretto
2f6a618d5a
Added bombs, throwable items, more block kinds, weaker explosions
2020-07-05 16:15:48 +01:00
jshipsey
c5f7a60f3b
more run animation work, adjusting pivots
2020-07-05 09:38:14 -04:00
Snowram
72eb03ceb5
Add quadruped_low skeleton
2020-07-05 09:38:11 -04:00
Ben Wallis
538598eb08
Refactored Skills/SkillGroups structure and implemented JSON persistence
2020-07-04 15:25:21 +01:00
Ben Wallis
60871461ea
Moved skills stuff to new skills.rs file
2020-07-04 15:25:20 +01:00
CapsizeGlimmer
59db2fcd3b
Admin status added when registering; cargo fmt
2020-06-27 17:43:45 -04:00
Pfauenauge90
f83c58498f
bubble colors
2020-06-27 17:20:26 -04:00
CapsizeGlimmer
2a0f0053d4
Added chat mode icons to speech bubbles
2020-06-27 17:03:30 -04:00
CapsizeGlimmer
289ef5d6b2
Move message processing and chat bubbles to the client
2020-06-27 16:42:26 -04:00
CapsizeGlimmer
b08d717eac
Rework chat processing
2020-06-27 16:29:03 -04:00
CapsizeGlimmer
702a21302c
Base implementation of /group /faction /say /region
2020-06-27 16:26:02 -04:00
Shane Handley
802bce1698
Target the specific attack types, to handle TripeStrike etc...
...
Removed the Axe sfx until the animations show the swing
2020-06-08 10:19:41 +10:00
CapsizeGlimmer
c65967ccdb
Chatting now creates speech bubbles
2020-05-27 13:49:14 +02:00
Joshua Barretto
aac28d04d5
Added dungeon bosses, boss loot, boss arenas
2020-05-15 16:05:50 +01:00
CapsizeGlimmer
4e7f8c686a
Equipped lanterns now provide an illumination effect.
2020-05-04 15:15:31 +00:00
Joshua Barretto
8e0f40c71e
Added on_ceiling check for sticky entities
2020-04-26 17:56:09 +01:00
Joshua Barretto
eb23b0b2bd
Added Colliders, made projectiles point particles
2020-04-26 17:56:09 +01:00
Justin Shipsey
6fa13bcb7e
body/anim tweaks
2020-04-26 01:09:03 +00:00
Imbris
c1c09dce1b
Enable unequipping as well as equipping to specific slots
2020-04-12 18:41:06 +02:00
Imbris
f551c4a2c5
Move armor types to a new location, use a const for the moving cutoff in voxygen anims
2020-03-28 01:52:12 -04:00
Imbris
6ba158b7e1
Input handling changes
2020-03-25 01:38:37 -04:00
Adam Whitehurst
37ec191021
update controller tick fn
2020-03-25 01:38:25 -04:00
timokoesters
aa963b7686
Merge remote-tracking branch 'origin/master' into clientstates
2020-03-15 15:27:06 +01:00
timokoesters
598a4c6cbb
Add loadout struct for info on weapon configurations
2020-03-14 22:33:20 +01:00
timokoesters
fe19698d52
Make abilities depend on weapon
2020-03-14 16:40:29 +01:00
S Handley
b2312a0487
Check that a targeted collectible is within a certain pickup range of the character before highlighting it
2020-03-10 20:50:04 +00:00
Adam Whitehurst
096d3b691e
Merge master
2020-03-07 12:49:15 -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
Adam Whitehurst
d383abf950
Re add combat
2020-02-11 07:42:17 -08:00
timokoesters
0bc07a0835
Merge remote-tracking branch 'origin/master' into clientstates
2020-02-03 22:02:32 +01: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
feeccc2ff3
Improved patrol idling
2020-01-26 12:52:32 +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
Justin Shipsey
64690279af
new mobs
...
alligators
2020-01-26 00:22:48 +00:00
timokoesters
7b558b4542
refactor: combine actionstate and movestate
2020-01-21 23:54:59 +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
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
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
9c6ce9babd
Begin implementing combat actions
2019-12-29 15:47:42 -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
Adam Whitehurst
4e574cb29a
Inputs enhancements
2019-11-29 15:20:35 +00: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
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
2703c8afe1
Move serverside client to a component and communications into server ecs systems
2019-10-23 23:50:06 -04: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
timokoesters
460a494e77
fix(bow): Don't remove vel and use sticky component instead
2019-10-04 21:30:13 +02:00
timokoesters
e3c02f8ac1
Allow projectiles to react to triggers
2019-10-04 21:02:40 +02:00
Joshua Barretto
e22fe81a2f
Added velorite
2019-09-26 00:15:07 +01: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
timokoesters
ecbf7cad5b
Remove old code
2019-08-31 09:00:20 +02:00
timokoesters
155605841b
Use comp::Stats to store Equipment, make char weapon selection work
2019-08-29 19:44:28 +02:00
timokoesters
5d5ccd7b99
Move from state components to single CharaterState struct
...
This makes split animations easy and improves overall code quality
2019-08-26 13:12:34 +02:00
Piotr Korgól
0221de484e
Give singleplayer its own server settings
2019-08-14 17:51:59 +02:00
Piotr Korgól
6882170d6f
Add Admins field to the settings file
2019-08-14 17:30:36 +02:00
Piotr Korgól
98c0692260
Add AdminPerms component, make some commands require it
2019-08-14 17:30:36 +02:00
