Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,011 Commits 151 Branches 18 Tags 2.1 GiB
5c0026f4a7
Commit Graph

3231 Commits

Author SHA1 Message Date
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
Joshua Barretto
8b8adcc1b8 More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
Sam
0a648e2e8f Fixed arrows dealing damage to entities if entity walked near arrow that stuck to terrain several seconds prior. 2021-08-26 19:00:28 -04:00
juliancoffee
9211b4a00a Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
54cb990d52 Move to one SKILL_MODIFIERS constant 2021-08-26 14:49:52 +03:00
juliancoffee
b1bac83319 SkillTreeModifiers data structs 2021-08-26 14:49:52 +03:00
juliancoffee
1ff99dcc34 Remove unused SkillBoost functions 2021-08-26 14:49:52 +03:00
juliancoffee
81bbc8c31f Split adjusted_by_skills by toolkind 2021-08-26 14:49:51 +03:00
Sam
790c3669a0 Fix mindflayer summoning minions inside pillars. 2021-08-22 12:21:24 -04:00
Imbris
2c3b484567 Merge branch 'imbris/some-tweaks' into 'master' 
Add comment on tuple bool field meaning in pathing

Closes #758

See merge request veloren/veloren!2778
 2021-08-21 16:56:01 +00:00
Ben Wallis
7acae057c5 Merge branch 'xvar/book-doc-gen' into 'master' 
Added cargo cmd-doc-gen to auto-generate the table of commands in the book

See merge request veloren/veloren!2776
 2021-08-21 16:14:42 +00:00
Imbris
a612631aa4 Add comment on tuple bool field meaning in pathing 2021-08-21 15:19:12 +00:00
Ben Wallis
c00bca7e93 Added cargo cmd-doc-gen to auto-generate the table of commands in the new players/commands.md page in the book 2021-08-21 13:36:55 +01:00
Ygor Souza
54c3adf9af Use all armor stats to calculate combat rating 
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
 2021-08-16 19:59:54 +02:00
juliancoffee
09e8ee2b3f Remove giants 2021-08-16 18:15:01 +03:00
juliancoffee
130ae1f429 Add ori_modifier for DashMelee and nerf it 
* 0.6 -> 0.3 ori modifier during charge in DashMelee
 2021-08-16 17:27:59 +03:00
juliancoffee
e9dde3ecec Add MakeNPC admin command 2021-08-16 16:45:36 +03:00
Imbris
1fd25c22dd Merge branch 'juliancoffee/explode_vines' into 'master' 
Make Fireballs explode EnsnaringVines

See merge request veloren/veloren!2758
 2021-08-14 19:09:05 +00:00
juliancoffee
c2247686db Make is_mid_air use on_surface().is_none() 2021-08-13 23:16:38 +03:00
Joshua Barretto
5e7e560c10 Merge branch 'min-persistent-world' into 'master' 
min-persistent-world

See merge request veloren/veloren!2662
 2021-08-13 12:30:28 +00:00
juliancoffee
a82f5ca057 Add comment about fragility of solution 2021-08-12 15:28:58 +03:00
Dr. Dystopia
94bcf5b59b Move assignment out of if-statement 2021-08-12 12:34:04 +02:00
Joshua Barretto
738e59965f Added experimental terrain persistence 2021-08-12 10:26:20 +01:00
juliancoffee
86b9e2d8e6 Make Fireballs explode EnsnaringVines 2021-08-12 01:25:55 +03:00
juliancoffee
3ac74a8259 Implement /kit all and a bit of refactoring 
+ notifying about sucessful kit application
+ notifying about case with insufficient space
+ handle case where you don't have enough free slots
+ handle quantity of non-stackable items
+ add test for items in kit manifest
 2021-08-10 13:28:38 +03:00
Samuel Keiffer
d5feca45c5 Merge branch 'pacmanmati/veloren-pacmanmati/1224-consolidate-redundant-stage-sections' into 'master' 
Consolidate redundant stage sections

See merge request veloren/veloren!2748
 2021-08-10 01:23:26 +00:00