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,117 Commits 151 Branches 18 Tags 2.1 GiB
51f8aa06df
Commit Graph

10117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
anomaluridae
84f19b408f build is working. to add and remove blocks. 2021-09-17 10:34:20 -07:00
anomaluridae
48cc5d3b08 make Target into a typed struct. delineate the clear difference in Target versus Interactable. comments and naming cleanup, for more explicitness. 2021-09-17 10:34:20 -07:00
anomaluridae
51f38df169 clippy is a thing 2021-09-17 10:34:20 -07:00
anomaluridae
f20b5f0b49 make scene interaction be targeted exactly on mining blocks (removing abnormal Empty labels), and don't reset position to None in the middle of mining. 2021-09-17 10:34:20 -07:00
anomaluridae
ff91da8b52 make the concepts of targets (under cursor), separate from interactable. interactable is what is (1) indicated visually in gui as able to interact, or (2) is an entity, or (3) is a block capable of Interaction. whereas a target is what occurs under the cursor, regardless of other state and input (such as different InputKind). targets are determined first, then other factors are cosidered to determine interactable. 2021-09-17 10:34:20 -07:00
anomaluridae
582f578e61 breakout interactable into seperate file 2021-09-17 10:32:06 -07:00
juliancoffee
91dd03b745 Clean entity assets for a small bit 
- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
  skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
 2021-09-17 20:12:42 +03:00
juliancoffee
f810af4eec Rename EntityInfo level field to health_scaling 2021-09-17 20:12:42 +03:00
Joshua Barretto
9cc70e6d22 Merge branch 'juliancoffee/capsule_prism' into 'master' 
New CapsulePrism collider

See merge request veloren/veloren!2843
 2021-09-17 11:39:57 +00: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
Samuel Keiffer
ce29e99403 Merge branch 'ubruntu/another-trade-fix' into 'master' 
Another trade fix

See merge request veloren/veloren!2844
 2021-09-16 22:06:30 +00:00
ubruntu
56f26dc3a8 Another trade fix 2021-09-16 22:06:30 +00:00
Imbris
a3ac3b51ce Merge branch 'capucho/iced-checkbox' into 'master' 
Add checkbox rendering logic for iced

See merge request veloren/veloren!2827
 2021-09-15 17:30:57 +00:00
João Capucho
80190c408d
Improve naming of checkbox images related methods 2021-09-15 15:41:31 +01:00
João Capucho
f27a7853a3
Add option for a hovered and checked background 2021-09-15 15:15:03 +01:00
Joshua Barretto
eb70e68be8 Merge branch 'sam/exp-fix' into 'master' 
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.

See merge request veloren/veloren!2845
 2021-09-15 13:04:43 +00:00
Sam
99981338bb Fixed exp fix mistake and fixed lava, campfire, and bomb damage. 2021-09-15 08:32:44 -04:00
Monty Marz
0dfddb21b1 Merge branch 'bafon/always-show-bars-setting' into 'master' 
Add setting to always show energy bars

See merge request veloren/veloren!2836
 2021-09-15 12:04:44 +00:00
Bafon
b910c1dd9c Add setting to always show energy bars 2021-09-15 12:04:44 +00:00
Marcel
d13391f16e Merge branch 'bafon/map-mouse-events' into 'master' 
Fix HUD map mouse events

See merge request veloren/veloren!2837
 2021-09-14 22:19:31 +00:00
Samuel Keiffer
d2d6ff1f62 Merge branch 'sam/health-ui-fix' into 'master' 
Fixed health ui in few places and xp scaling from health.

See merge request veloren/veloren!2842
 2021-09-14 21:42:53 +00:00
Bafon
eecab6e9ec Fix HUD map mouse events 
Fixes dragging, scrolling, and setting the location marker when hovering player marker, location marker, group member markers, site icons, and peaks.
 2021-09-14 23:42:04 +02:00
Sam
3d31248ced Fixed health ui in few places and xp scaling from health. 2021-09-14 10:55:14 -04:00
Joshua Barretto
338e82c36c Merge branch 'sam/health-fix' into 'master' 
Fixed fall damage and sceptre regen.

See merge request veloren/veloren!2840
 2021-09-14 11:27:05 +00:00
Sam
c4c4318ac0 Fixed fall damage and sceptre regen. 2021-09-14 06:53:01 -04:00
Marcel
640d968eff Merge branch 'GiocArt/update-it_IT' into 'master' 
Update to the Italian translations

See merge request veloren/veloren!2830
 2021-09-14 09:07:38 +00:00
GiocArt
16ec718a67 Update to the Italian translations 2021-09-14 09:07:38 +00:00
Marcel
b92e07963c Merge branch 'ubruntu/trading-fix' into 'master' 
Fix trade/merchant bugs

Closes #1263

See merge request veloren/veloren!2839
 2021-09-14 07:31:06 +00:00
ubruntu
8eb61192fd Fix trade/merchant bugs 2021-09-14 07:31:06 +00:00
Joshua Barretto
350e835d7d Merge branch 'zesterer-master-patch-82877' into 'master' 
Actually a tiny fix this time

See merge request veloren/veloren!2835
 2021-09-13 21:38:21 +00:00
wolfshaman
d321d1aad4 fixing_1328_set_waypoint_when_on_ground_and_not_going_down 2021-09-13 16:51:02 -04:00
Joshua Barretto
4118835fb3 Fixed incorrect winding order for debug cylinder triangles 2021-09-13 18:15:12 +00: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
b26ceb6339 Removed a few unnecessary casts. 2021-09-13 10:41:55 -04:00
Sam
fec92c3000 Fixed plugin tests with hack. 2021-09-13 10:34:40 -04:00
Samuel Keiffer
5ce66754d2 Merge branch 'sam/dungeon-frequency' into 'master' 
Balanced frequency of dungeons.

See merge request veloren/veloren!2828
 2021-09-12 19:59:02 +00:00
Sam
9e9fba7704 Balanced frequency of dungeons. 2021-09-11 18:59:04 -04:00
João Capucho
5323bb3ce8
Add checkbox rendering logic for iced 2021-09-10 21:17:06 +01:00