DemonicOnPc
7fc57c027b
Fixes to jungle sprites and lillypads
2021-11-08 17:09:15 -05:00
DemonicOnPc
9514cd71c6
Jungle and River update
...
-Added Lillypads to rivers
-Added new types of reeds
-Added reeds to water
-Added more Ferns/Flowers/Plants to jungles
2021-11-08 17:09:11 -05:00
Joshua Barretto
e3ab8fc8ce
Added rtsim merchants to site2
2021-11-01 22:19:49 +00:00
Joshua Barretto
8e2ca9cdec
Added rtsim villagers to site2 towns
2021-11-01 22:19:49 +00:00
Oolnokk
b67558c1ba
2 new beards, four new hairstyles and 1 new eye option for dwarf males
2021-10-31 22:58:25 -04:00
Samuel Keiffer
e692f49463
Merge branch 'sam/potion-tweaks' into 'master'
...
Potion tweaks
See merge request veloren/veloren!2976
2021-10-31 21:12:08 +00:00
Sam
560f73d296
Addressed review feedback.
2021-10-31 16:39:47 -04:00
jshipsey
c2b7d3bb44
good hat rendering
2021-10-30 23:42:16 -04:00
jshipsey
a05c1ea4c5
switch to new matcell variant
2021-10-30 23:42:15 -04:00
jshipsey
3915aa7aac
support for hollow voxels ty zesterer
2021-10-30 23:42:14 -04:00
Sam
41effe61d0
Being knocked out of item use or sprite interact states forces a poise state.
2021-10-29 19:24:40 -04:00
Sam
ca292a53ea
All aspects of an attack now scale with the modifier.
2021-10-29 17:37:12 -04:00
Sam
57851b7df3
Fixed buff applied.
2021-10-29 17:37:10 -04:00
Sam
f339793911
Buffed staff firebomb a little.
2021-10-29 17:37:07 -04:00
Sam
2b447852fd
Added min fall off to explosions.
2021-10-29 17:37:02 -04:00
socksonme
2ef668a16c
removed unnecessary self
2021-10-29 15:23:49 +03:00
socksonme
42ed5c43f5
fixed code quality
2021-10-29 15:01:21 +03:00
socksonme
584e379e40
Removed beams and shockwaves from phys.rs
...
calc_z_limit doesn't use an Opyion anymore, construct_spacial_grid also doesn't check for beams or shockwaves, collider_other in apply_pushback is also required now and resolve_e2e_pushback also doesn't use Options anymore.
2021-10-29 09:43:01 +03:00
Sam
fbd742abdb
Changed crafting to only consume items after checking that the crafting would be successful instead of consuming items first and reinserting on failure.
2021-10-27 17:02:36 -04:00
Sam
4b9e9c506b
Fixed opening salvaging station not showing salvage text.
2021-10-27 17:02:35 -04:00
Monty Marz
727295aec1
text and alignment WIP
2021-10-27 17:02:35 -04:00
Sam
6ff7317e05
Added function that returns the output of salvaging an item when result just needs to be checked.
2021-10-27 17:02:32 -04:00
Sam
9fc3a9bf01
Fixed item path of leather items under hide folder.
2021-10-27 17:02:32 -04:00
Monty Marz
7aae35f286
bench
2021-10-27 17:02:31 -04:00
Sam
356057afc4
Added comments in areas that were lacking.
2021-10-27 17:02:31 -04:00
Sam
794b072d3e
Simple recipes now take a vec of slots to look in for the ingredients.
2021-10-27 17:02:30 -04:00
Sam
111abbc3bc
Added salvage tags to items, removed old salvage recipes from recipe book.
2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9
Backend stuff for salvaging.
2021-10-27 17:02:29 -04:00
Sam
cac3f00250
Lengendary crit changes.
2021-10-26 20:55:32 -04:00
Sam
4d4b7e846a
Haha, nerfs go brr
2021-10-26 18:44:45 -04:00
Joshua Barretto
37056e75f9
Merge branch 'demonic/shrubs' into 'master'
...
Added new Spots, Shrubs and Ships.
See merge request veloren/veloren!2953
2021-10-26 10:06:14 +00:00
DemonicOnPc
a74af55c46
Gemu's Revamped vox models added.
2021-10-26 05:28:05 -04:00
Kemper
b0b90744cf
Add a range limit to trading
...
Prevents initiating trades with client-side ghosts.
2021-10-25 00:47:45 +00:00
Justin Shipsey
434913b946
Merge branch 'kemper/sand-shark-hitbox' into 'master'
...
Better sand shark hitbox
See merge request veloren/veloren!2956
2021-10-24 22:03:08 +00:00
Kemper
b96c6c94ab
Adjust sand shark hitbox
2021-10-24 21:04:46 +00:00
DemonicOnPc
b1476071b1
Added new Spots, Shrubs and Ships.
...
Spots
- Gnarling Tree
- Troll Cave
- Underwater Shipwreck second variation.
Shrubs added to biomes
- Savannah Shrubs
- Taiga Shrubs
- Temperate Shrubs
Galleon ship added
2021-10-24 08:10:44 -04:00
ubruntu
e6bfce99bb
Use stealth stat on armors
2021-10-24 05:31:49 +00:00
socksonme
052e09039a
Made the pushback cache require colliders
2021-10-19 15:05:30 +03:00
Bryant Deters
b2bd43f4d3
Sneak with weapons drawn
2021-10-18 14:53:55 -05:00
Joshua Barretto
c397bfa69f
Merge branch 'socksonme/refactor_villageralarm' into 'master'
...
Socksonme/refactor villageralarm
See merge request veloren/veloren!2931
2021-10-17 12:47:19 +00:00
Joshua Barretto
3357008601
Merge branch 'zesterer/small-fixes' into 'master'
...
Caverns
See merge request veloren/veloren!2763
2021-10-16 09:33:57 +00:00
Sam
c5c70f6945
Correctly took dot product, switched to square root of dot product
2021-10-15 22:41:53 -04:00
Sam
7b2ade34c4
Removed angle between with dot product in handle_orientation.
2021-10-15 17:26:10 -04:00
socksonme
c631341da9
Refactored SoundKind and UtteranceKind
2021-10-15 22:49:25 +03:00
Imbris
f61d742d29
Fix NaNs
2021-10-15 13:17:13 -04:00
Imbris
e67c688c11
Add test for Ori::angle_between
2021-10-15 12:02:53 -04:00
Imbris
c412a96d6a
Fix issue with angle between going over PI and remove faulty test (angle between Quaternions isn't equivalent to the angle between Dir vectors since Quaternions involve rolling as well)
2021-10-15 03:20:40 -04:00
Imbris
aa1ffa9f61
Remove timings and commented code (separate from the previous commit so we can keep these notes in the git history), add potentially better version of the straight up/down case for to_horizontal as a comment for testing in the future, remove fine grained spans
2021-10-15 01:38:56 -04:00
Imbris
b0bd8cdb45
Improve Ori impl of From<Dir> and Ori::to_horizontal by avoiding acos/asin calls by constructing the quaternions in a more direct fashion
2021-10-15 01:23:00 -04:00
Imbris
457ed6ac64
Remove per entity VecDeque's of events from character StateUpdate and instead pass in external Vecs that can be pushed to (saves significant time not allocating for VecDeque::new)
2021-10-15 01:23:00 -04:00
Imbris
43e743c2bc
Rewrite Ori::to_horizontal to reduce redundant normalization and directly calculate the needed yaw instead of using the more general Ori::from(dir), fix bugs in Ori::from(dir) and optimize the up/down case, add tests for Ori::to_horizontal and Ori::angle_between
2021-10-15 01:23:00 -04:00
Imbris
d515b42eac
Improve efficiency of states::utils::handle_orientation by reducing the conversions between Ori/Dir less frequent and optimizing the conversion of Dir -> Ori, also added a method to compute the angle between two Ori so that they don't need to be converted to Dir
2021-10-15 01:23:00 -04:00
Henry Corse
e01ce2dcf4
Kaedr/pretty printing error messages
2021-10-14 18:37:51 +00:00
Sam
1e3b0dcd16
Fix block energy cost being multiplied by 10 and also slightly reduce it.
2021-10-13 10:02:28 -04:00
Imbris
4b2842da2f
Merge branch 'imbris/opt-phys-2.0' into 'master'
...
Make terrain physics faster with internal iteration
See merge request veloren/veloren!2915
2021-10-11 14:52:46 +00:00
juliancoffee
b5d9e4e4a9
Fix Traveller names
...
- Previously RtSim were created with automatic name for body generated
from EntityConfig, not from RtSim body. Now RtSim body is set for
EntityConfig.
2021-10-11 15:06:43 +03:00
Samuel Keiffer
05b85a00e2
Merge branch 'sam/wiki-all-entities' into 'master'
...
Csv export entity drops tool now has ability to export all entities at once.
See merge request veloren/veloren!2910
2021-10-10 16:56:46 +00:00
Sam
fc787d150e
Now stores a column for entity path to more easily allow searching for what drops a particular item in the future
...
Fixed excel perceiving certain csv entries as a date
2021-10-10 12:37:16 -04:00
Joshua Barretto
086097cd56
Better vines and lighting
2021-10-10 13:41:57 +01:00
Joshua Barretto
353ccc5bce
Added new cavern sprites to caverns
2021-10-10 13:41:57 +01:00
Monty Marz
14ed73ec12
cavern sprites
2021-10-10 13:41:56 +01:00
Joshua Barretto
bfc55d7b17
More cavern details
2021-10-10 13:41:56 +01:00
Joshua Barretto
5c0026f4a7
Performance improvements for terrain watcher
2021-10-10 13:41:56 +01:00
Joshua Barretto
1cfad833c7
Added caverns, fixed chunk load performance issue
2021-10-10 13:41:56 +01:00
Imbris
4f6eb286e6
Remove dead commented code, updated changelog, commented profiling spans
...
(but left in for easy reuse later), fix clippy complaint
2021-10-10 03:09:03 -04:00
Imbris
57922d9802
Rearrange iteration pattern so that x is in the inner loop in the default for_each_in (no or little perf change)
2021-10-10 02:42:07 -04:00
Imbris
11c8cf19d1
Switch to for loops in default for_each_in (small perf increase), add inline to sprite methods (no perf change)
2021-10-10 02:42:07 -04:00
Imbris
5777486f5c
Remove custom for_each_in from Chonk
2021-10-10 02:42:07 -04:00
Imbris
f65399eb00
Make LiquidKind::merge as inlineable, remove always from TerrainGrid::for_each_in inline annotation
2021-10-10 02:42:07 -04:00
Imbris
2350c08e91
Try marking VolGrid2d::for_each_in and friends as inlineable
2021-10-10 02:42:07 -04:00
Imbris
3a4c45f045
Try marking Chonk::for_each_in and related functions as inlineable
2021-10-10 02:42:07 -04:00
Imbris
7f6ba90f59
simplify water/walls check code, interally iterate in chonks (but not
...
chunks)
2021-10-10 02:42:06 -04:00
Imbris
e7b92789f9
Refactor some of the terrain collision code, failed pre-emptive liquid check experiment
2021-10-10 02:42:06 -04:00
Imbris
8987f6128e
Do iteration check for snapping after checking the other conditions
2021-10-10 02:42:06 -04:00
Imbris
798e02b9e5
Convert water/walls check to the new iteration function
2021-10-10 02:42:06 -04:00
Imbris
59bd5b4acd
Initial iterator optimization by using internal iteration at the vol_grid level, water/walls not switched over yet
2021-10-10 02:42:06 -04:00
Imbris
8987389e8a
Submit chunk requests to the generator within the terrain system right before receiving new chunks, so that duplicate work is not done for chunks that just finished but were not yet added to the terrain.
2021-10-08 16:17:31 -04:00
Sam
53c9dfcd92
Csv export entity drops tool now has ability to export all entities at once.
2021-10-07 20:28:18 -04:00
Treeco
dafa1327d0
Added mottled bark to birch
2021-10-06 02:26:43 +01:00
Samuel Keiffer
aaaf59d672
Merge branch 'sam/wiki-loot' into 'master'
...
Created csv export tool to get all item drops from an entity
See merge request veloren/veloren!2892
2021-10-05 15:45:22 +00:00
Sam
b7e2e27000
Now outputs item names instead of item asset paths.
2021-10-04 21:46:19 -04:00
ubruntu
0e2808a8fd
Interactable campfires
2021-10-05 00:55:29 +00:00
Joshua Barretto
2ae7bca9c0
Rebalanced boat speed
2021-10-05 00:02:03 +01:00
Joshua Barretto
c6d3137612
Fixed sail boat thrust, removed dead water code, added comments
2021-10-05 00:02:03 +01:00
Joshua Barretto
e8021fab2c
Cleaned up shrub implementation
2021-10-05 00:02:03 +01:00
Joshua Barretto
3b66af468a
Improved river and lake banks
2021-10-05 00:02:03 +01:00
Joshua Barretto
826aff2ea4
Better lake entrances and distance
2021-10-05 00:02:03 +01:00
Joshua Barretto
f118d15745
Fixed oceans
2021-10-05 00:02:03 +01:00
Joshua Barretto
87c7d6e982
Improved river/lake rendering
2021-10-05 00:02:03 +01:00
Joshua Barretto
bfbca3e517
Added sail boat
2021-10-05 00:02:03 +01:00
Imbris
c8b55d3dcb
Improve the warning message when USERDATA_STRATEGY was not set during compilation and the binary was moved outside the workspace/crate that it was compiled from, show a warning when an invalid VELOREN_USERDATA_STRATEGY is used, and also actually make sure warnings from userdata selection are logged in voxygen (since the userdata folder needs to be selected to set up logging we have to rerun the selection after logging is set up so that any warnings will be logged).
2021-10-04 12:23:42 -04:00
Sam
2dceadaebb
Created csv export tool to get all item drops from an entity
2021-10-02 12:08:40 -04:00
Benoît du Garreau
ef1c51332d
Update assets_manager to 0.6.0
2021-10-01 21:13:01 +02:00
Samuel Keiffer
f7161c1859
Merge branch 'sam/loot' into 'master'
...
Refactored loot table selection on entity death
See merge request veloren/veloren!2879
2021-10-01 07:06:10 +00:00
Sylvain Migaud
9b41568881
Place date at the begining of the log file name
2021-09-30 06:09:30 +00:00
juliancoffee
68aba856ec
Cleaning
2021-09-27 23:21:57 +03:00
juliancoffee
7291d32209
Make ItemDrop component with Item again
2021-09-27 20:36:18 +03:00
juliancoffee
943e7cd0e1
Fix csv tools for loot tables
2021-09-27 15:09:22 +03:00
juliancoffee
9c2fc0d962
Adress review
...
- Mention failed loot specifier during getting item from lottery
2021-09-27 15:09:22 +03:00
juliancoffee
8af4cf1a37
Make Rtsim entity config work
2021-09-27 15:09:22 +03:00
juliancoffee
ac5ea0cfe8
Hardened Loot handling part two
...
+ clippy advices
+ use LootSpec::Nothing for basic_summon explicitly
2021-09-27 15:09:22 +03:00
juliancoffee
b056cccb0c
Hardened loot table handling
...
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
2021-09-27 15:09:22 +03:00
Sam
09dd9b4813
Changed ItemDrop to use LootSpec
2021-09-27 15:09:22 +03:00
Marcel
cea927efb6
Merge branch 'xMAC94x/update-toolchain' into 'master'
...
update toolchain to `nightly-2021-09-24`
See merge request veloren/veloren!2862
2021-09-26 19:25:02 +00:00
Samuel Keiffer
ea2fa5f110
Merge branch 'sam/cr-weights' into 'master'
...
Changed weights of cr calculation and exp from cr formula.
See merge request veloren/veloren!2875
2021-09-26 18:21:56 +00:00
Sam
c62162c2d3
Changed weights of cr calculation and exp from cr formula.
2021-09-25 21:52:20 -04:00
Sam
942376f88c
Made poise a float at interface of module.
2021-09-25 14:07:47 -04:00
Marcel Märtens
e36eef99c8
apply some clippy fixes that comes with the new toolchain version
2021-09-24 23:18:18 +02:00
Marcel Märtens
2a82405df2
update toolchain to nightly-2021-09-24
2021-09-24 23:18:07 +02:00
Sam
0e5e2b46f2
Changed energy to internally use an integer with a high resolution, and externally to use a float.
2021-09-23 14:11:09 -04:00
heydabop
e2f9237f05
Fixes #1339 - Allow attacks and abilities to interrupt sprite interaction
2021-09-23 10:05:12 -05:00
Joshua Barretto
bee5b232e6
Fixed crash caused by invalid health, stated current <= maximum invariant more clearly
2021-09-23 12:36:03 +01:00
Snowram
5838a84568
Consolidates projectile offsets into utils
2021-09-22 03:05:57 +02:00
Snowram
9c2ce83430
Set projectile offsets in states instead of globally
2021-09-22 01:07:09 +02:00
Snowram
cf6bf74f7a
Set beam offset depending on body dimensions
2021-09-21 15:31:46 +02:00
Snowram
7a73e4240b
Bird large beam offset hack
2021-09-21 15:31:43 +02:00
jshipsey
1ad107f4a7
animation tweaks
2021-09-21 15:30:43 +02:00
jshipsey
aedb2e9d2b
wyvern walk
2021-09-21 15:30:43 +02:00
Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
Marcel Märtens
88685cc016
update crates
2021-09-20 14:39:01 +02:00
Joshua Barretto
e098a38d8e
Merge branch 'james/rrt-pathfinding' into 'master'
...
Initial RRT flight pathfinding
See merge request veloren/veloren!2773
2021-09-19 19:30:31 +00:00
Joshua Barretto
f94d579c04
Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master'
...
Tweak coefficient of beam_offset for clay_golem
See merge request veloren/veloren!2859
2021-09-18 17:36:08 +00:00
juliancoffee
1d8c368137
Tweak coefficient of beam_offset for clay_golem
2021-09-18 19:55:46 +03:00
Ben Wallis
d665ce329d
* Added new Admin Commands window to egui, including Give Items and Kits sections
...
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00
Joshua Barretto
2f1fe39e04
Merge branch 'james/lava-dungeons' into 'master'
...
Prettier site2 houses
See merge request veloren/veloren!2852
2021-09-18 14:58:42 +00:00
Justin Shipsey
02c19aaee8
Merge branch 'zesterer/remove-unscheduled-skydives' into 'master'
...
Remove unscheduled skydives
See merge request veloren/veloren!2851
2021-09-18 04:53:22 +00:00
James Melkonian
36884d6919
Move rrt algorithm into its own function
2021-09-17 16:27:00 -07:00
James Melkonian
9875a74640
Make RRT pathfinding a cfg feature
2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750
Disable RRT pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728
Initial RRT flight pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
42fdf0818d
Gable primitive and dungeon lava rooms
2021-09-17 15:45:26 -07:00
Joshua Barretto
a76496c339
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
anomaluridae
82f3c3c3e8
is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer
2021-09-17 10:34:20 -07:00
anomaluridae
6362df4ffc
keep MAX_TARGET_RANGE within voxygen
2021-09-17 10:34:20 -07:00
anomaluridae
42d5836cfa
properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds.
2021-09-17 10:34:20 -07:00
anomaluridae
5c66f73bb4
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
juliancoffee
f810af4eec
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
juliancoffee
19f0cf4ee5
Set z_min to 0 for terrain collision checks
...
This allows us have different z_min for e2e checks
2021-09-17 13:28:34 +03:00
juliancoffee
e5d69d153b
Adress review
...
Make sausage ascii-art have `a` line inside of stadium
2021-09-17 13:28:34 +03:00
juliancoffee
4e3fb87526
Adress review
...
- Rename Collider::get_radius to bounding_radius
- Check origin difference in CapsulePrism with EPSILON * 10.0 instead of
magic 0.00001
- Add comments for closest_points, hardnened expression against NaNs
- Add comments to try_e2e_collision function, renamed to
resolve_e2e_collision, make it return whether collision was triggered.
- Remove Collider::Box (it is Cylinder, which is subset of CapsulePrism
with p0=p1=Vec2::zero())
2021-09-17 13:28:34 +03:00
juliancoffee
3dd6aa9dea
Implement capsule2capsule collisions
2021-09-17 13:28:34 +03:00
juliancoffee
fdb4b7111a
Fix bug with zero-pushback for bigger colliders
2021-09-17 13:28:34 +03:00
juliancoffee
c069a3523d
Fix beam offsets
...
- Introduce notion of min and max radius for Body instead of old
`radius()` function (which is renamed to `max_radius()`).
2021-09-17 13:28:34 +03:00
juliancoffee
7d97fe7ec5
Fix colliding bugs
...
- Make cylinder-like capsules prisms work without NaN in origin offsets.
Just return p0 as both origins instead of getting NaN by further
normalizing required because of how we rotate offsets.
- Fix pushback direction.
Make sure that pushback is calculated as our_pos - their_pos (and not
other way around).
- Fix colliding boundary detection.
Calculate center as Vec3::new(0, 0, height) and
not as `Vec3::new(0, height, 0)`.
2021-09-17 13:28:34 +03:00
juliancoffee
eeb3bec8ad
Refactor implementation of e2e collision
...
+ Add some hopefully helpful comments
+ Extract colliding tries to separate function
+ Move to Capsule + Cylinder collider combination instead of Capsule +
Capsule.
2021-09-17 13:28:34 +03:00
juliancoffee
44962958d8
Adress feedback
...
- Rewrite 2 * PI to TAU
- Some comment formatting
2021-09-17 13:28:34 +03:00
juliancoffee
d86c9f2678
Remove body::Shape enum, make npc use CapsulePrism
2021-09-17 13:28:34 +03:00
juliancoffee
6c3b61dc25
Implement CapsulePrism collisions
2021-09-17 13:28:34 +03:00
juliancoffee
7712976b86
Refactor box_voxel_collision function
2021-09-17 13:28:34 +03:00
juliancoffee
3b308a3f6f
Add CapsulePrism collider variant
...
+ Add placeholder physics collision implementation as copy of cylinder
Box collider.
+ Display it with debug hitboxes.
2021-09-17 13:28:34 +03:00
Sam
99981338bb
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
2021-09-15 08:32:44 -04:00
Sam
3d31248ced
Fixed health ui in few places and xp scaling from health.
2021-09-14 10:55:14 -04:00
Samuel Keiffer
73d3d3e4bb
Merge branch 'sam/health-float' into 'master'
...
Turned Health into a Float
See merge request veloren/veloren!2824
2021-09-13 15:23:18 +00:00
Sam
fec92c3000
Fixed plugin tests with hack.
2021-09-13 10:34:40 -04:00
Sam
85f4e66337
Addressed MR 2824 comments
2021-09-10 15:20:14 -04:00
Monty Marz
1d94adc2e1
0.11 Background images and more
2021-09-10 08:34:01 +00:00
Sam
42012fddcb
Overhauled health component, making it a float to outer interfaces.
2021-09-09 00:10:17 -04:00
Sam
c7291701e1
Sprite interaction fixes
2021-09-07 20:34:04 -04:00
Joshua Barretto
003b9f57ce
Merge branch 'juliancoffee/pvp_command' into 'master'
...
Implement /battlemode command and more
See merge request veloren/veloren!2787
2021-09-04 18:37:01 +00:00
juliancoffee
670e29a286
Better formatting
2021-09-04 20:56:55 +03:00
juliancoffee
3cf9d0cdb0
Adress review:
...
- explanation of what pvp/pve means in /battlemode help
- check for radius from town instead of town in chunks (because it count
plant fields, which is kinda meh)
- better error displaying
2021-09-04 20:38:53 +03:00
Sam
f65b3a094d
Cultists now properly raid villages.
2021-09-04 12:25:04 -04:00
juliancoffee
43d40c4efc
Workaround of bug with global Player component
...
* Set default value of battle_mode and last_battlemode_change explicitly
if isn't found in battlemode_buffer
2021-09-04 02:29:02 +03:00
juliancoffee
1baa9e9879
Add in-memory persistence for battlemode changes
2021-09-04 01:41:48 +03:00
juliancoffee
fbe745fe1e
Cooldowns
...
- Add last_battlemode_change to Player component
- check on last_battlemode_change in handle_battlemode
- set last_battlemode_change after setting battlemode
- still are not persisted in any way
2021-09-04 01:41:48 +03:00
juliancoffee
338e81de10
Deduplicate pvp-checks
2021-09-03 17:28:34 +03:00
juliancoffee
2e79c61123
Implement /battlemode_force command
...
+ add placeholder for /battlemode command (currently can only show your
battle mode)
2021-09-03 17:28:34 +03:00
juliancoffee
6b0d016418
Don't forget about pets in PvP checks
2021-09-03 17:28:34 +03:00
Sam
0a3b541940
Removed ability to 'droideka' through dungeons.
2021-09-02 19:48:30 -04:00
Sam
5f08089bd9
Recover section no longer has 0 movement.
2021-09-02 19:27:07 -04:00
juliancoffee
6c1ecc9766
Add support for override asset folder
...
- ASSETS_OVERRIDE environment variable with asset path which has higher
priority.
2021-09-02 20:24:23 +03:00
Marcel
970d57f905
Merge branch 'juliancoffee/skill_boost_rework' into 'master'
...
ECS & Diary info synchronization
See merge request veloren/veloren!2771
2021-09-02 16:04:23 +00:00
Samuel Keiffer
a733ad00e6
Merge branch 'ubruntu/sometimes-drop-nothing' into 'master'
...
NPCs can drop nothing
See merge request veloren/veloren!2794
2021-09-01 23:17:36 +00:00
ubruntu
bbc366e1b3
NPCs can drop nothing
2021-09-01 23:17:36 +00:00
Sam
41a385c517
Turn towards center of sprite instead of corner.
2021-09-01 17:24:09 -04:00
Joshua Barretto
82886dcd3f
Merge branch 'zesterer/tiny-fixes' into 'master'
...
Worldgen hotfix
See merge request veloren/veloren!2797
2021-09-01 12:47:50 +00:00
Joshua Barretto
1b0cb40d94
Made ore streams mineable
2021-09-01 12:05:00 +01:00
Knightress Paladin
f49dc2191d
Make parrying refund the block stamina cost and cancel the recover animation
2021-08-31 23:46:33 -07:00
Sam
156820cd5c
Chest sprite interact kind changed to only check that sprite is a container rather than matching on every 'chest-like' sprite.
2021-08-31 13:57:17 -04:00
Sam
5dbc05730d
Moved pathfinding check to after distance check. Added a clear fallback for cases where sprite is not added to match statement.
2021-08-31 13:37:57 -04:00
Sam
f986176604
Sprites that are colelctible but not explciitly added to SpriteInteractKind match statement have a default value to allow collection.
2021-08-31 13:37:56 -04:00
Sam
2a3cc3d35a
No longer send collect inventory event if interactable sprite kind cannot be found.
2021-08-31 13:37:56 -04:00
Sam
6b71133c50
Fixed interaction to work underwater.
2021-08-31 13:37:55 -04:00
Sam
13fa154e55
Changelog and added arm length (body radius) to sprite pickup range.
2021-08-31 13:37:53 -04:00
Sam
6d91bae44b
Sprite interaction now uses pathfinding to check that it can be picked up.
2021-08-31 13:37:36 -04:00
Sam
28d23c89ed
Added simple distance check for sprite interaction.
2021-08-31 13:37:36 -04:00
Sam
9e5744f3ee
Entities will now attempt to orient towards the sprite they are interacting with.
2021-08-31 13:37:36 -04:00
Sam
44c3b0f153
Added attack hook event, attacks now cancel item use and sprite interaction.
2021-08-31 13:37:32 -04:00
Sam
538cb56b87
Sprites now go through a character state to be picked up.
2021-08-31 13:36:04 -04:00
Joshua Barretto
0b1a820762
Make arrows 'bonk' hanging sprites
2021-08-31 13:31:27 +01:00
Joshua Barretto
913c23e1ad
Merge branch 'zesterer/spots' into 'master'
...
Spots
See merge request veloren/veloren!2695
2021-08-31 12:03:47 +00:00
Monty Marz
13c15b3840
fix witch hut smoke
2021-08-30 12:03:13 +02:00
Joshua Barretto
0011e75526
More tree variety
2021-08-29 18:38:34 +01:00
Joshua Barretto
87f4efd65b
Added spot loot
2021-08-29 12:50:35 +01:00
Sam
7dcbd6aaf0
Renamed variable to make more explicit what it does.
2021-08-28 18:31:44 -04:00
Monty Marz
771a380e6c
witch stuff
2021-08-28 14:53:30 +01:00
Monty Marz
df0ab43bb8
taiga and savannah definitions
2021-08-28 14:53:30 +01:00
Joshua Barretto
06d85b8b10
Added index customisation for world structure models
2021-08-28 14:53:30 +01:00
Joshua Barretto
76ba3496a1
sync
2021-08-28 14:53:30 +01:00
