3898 Commits

Author SHA1 Message Date
juliancoffee
e56478204e Adress feedback
- Rewrite 2 * PI to TAU
- Some comment formatting
2021-09-17 13:28:34 +03:00
juliancoffee
58a4659c47 Remove body::Shape enum, make npc use CapsulePrism 2021-09-17 13:28:34 +03:00
juliancoffee
feefd36036 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
Imbris
699abadc95 Merge branch 'capucho/iced-checkbox' into 'master'
Add checkbox rendering logic for iced

See merge request 
2021-09-15 17:30:57 +00:00
João Capucho
763f2b261c
Improve naming of checkbox images related methods 2021-09-15 15:41:31 +01:00
João Capucho
4bcdc31556
Add option for a hovered and checked background 2021-09-15 15:15:03 +01:00
Monty Marz
ad28b2837d Merge branch 'bafon/always-show-bars-setting' into 'master'
Add setting to always show energy bars

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

See merge request 
2021-09-14 22:19:31 +00:00
Bafon
75ecfaef83 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
01e3ddd6b8 Fixed health ui in few places and xp scaling from health. 2021-09-14 10:55:14 -04:00
Joshua Barretto
dcd0c47247 Fixed incorrect winding order for debug cylinder triangles 2021-09-13 18:15:12 +00:00
Samuel Keiffer
0f7cd1baa4 Merge branch 'sam/health-float' into 'master'
Turned Health into a Float

See merge request 
2021-09-13 15:23:18 +00:00
Sam
e331082a97 Removed a few unnecessary casts. 2021-09-13 10:41:55 -04:00
João Capucho
841d8d6a77
Add checkbox rendering logic for iced 2021-09-10 21:17:06 +01:00
Sam
727c5f107c Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Marcel Märtens
215b20fa92 Change the version number to 0.11 2021-09-10 20:19:17 +02:00
Imbris
8ef5c60b72 Disable visuals that block seeing camera clipping since they cause flickering, raise max zoom cap with camera, fix overflow issue 2021-09-10 12:16:55 -04:00
Monty Marz
0e0cbae08c 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
a4c6621fa0 Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Joshua Barretto
00062bd6e0 Capped camera distance without privilege 2021-09-08 13:17:22 +01:00
Joshua Barretto
1a55468f59 Made the camera go dark if in a filled block and not moderator 2021-09-08 12:37:15 +01:00
Monty Marz
8506d31736 Bloom settings 2021-09-08 09:50:37 +00:00
Joshua Yanovski
81f78b43ce Revert "Replace shaderc with naga"
This reverts commit 446d93dda0db486d65ec9374946205cc5bf35a59.
2021-09-04 11:59:18 -07:00
jshipsey
6919f535d4 address comments 2021-09-04 13:17:56 -04:00
jshipsey
78af24a4ed more spots 2021-09-04 00:18:58 -04:00
Marcel Märtens
5357ec43d6 disable mumble-link on macos 2021-09-04 00:32:16 +02:00
juliancoffee
29d91cdd6a 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
a7e08abec6 Merge branch 'juliancoffee/skill_boost_rework' into 'master'
ECS & Diary info synchronization

See merge request 
2021-09-02 16:04:23 +00:00
Marcel Märtens
71604e0f6d switch to SharedLink and unset context 2021-09-02 12:29:01 +02:00
Imbris
0b922deed6 Merge branch 'capucho/naga' into 'master'
Replace shaderc with naga

See merge request 
2021-08-31 22:38:17 +00:00
João Capucho
0476f9ce0b
Replace shaderc with naga 2021-08-31 22:53:10 +01:00
jshipsey
0acd5c6d92 finished anim 2021-08-31 13:37:35 -04:00
Sam
ac6f00cbae Added attack hook event, attacks now cancel item use and sprite interaction. 2021-08-31 13:37:32 -04:00
Sam
0f7e0b4152 Fixed compile error when importing sprite position. 2021-08-31 13:36:05 -04:00
jshipsey
c7690958b6 anim basics 2021-08-31 13:36:04 -04:00
Joshua Barretto
ea04c17cf7 Merge branch 'xvar/fix-egui-toggle' into 'master'
Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled

See merge request 
2021-08-31 17:07:13 +00:00
Ben Wallis
3a27787b21 Fixed egui maintain() running when only F3 debug is toggled rather than only when F7 is toggled 2021-08-31 17:21:13 +01:00
Joshua Barretto
ab3c6989b4 Fixed first-person zoom, added fixation to allow more precise mouse movement when zoomed 2021-08-31 13:31:52 +01:00
Monty Marz
2e5414d3e0 fix witch hut smoke 2021-08-30 12:03:13 +02:00
Joshua Barretto
a66f1922aa More block particles, changes ore vein colour 2021-08-28 14:53:30 +01:00
juliancoffee
c3b72fa562 Rewrite multiplier_to_percentage to return f32 2021-08-28 02:36:26 +03:00
juliancoffee
ee17345648 Handle some skill description in special way 2021-08-26 14:49:52 +03:00
juliancoffee
122345e307 Declarative skill icons 2021-08-26 14:49:52 +03:00
juliancoffee
f5dde393d3 Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
217e1a4cb3 Inline redundant functions 2021-08-26 14:49:52 +03:00
juliancoffee
56846c63df Split skilltree window handling per tree 2021-08-26 14:49:52 +03:00
juliancoffee
6ead29a2a3 Use PositionSpecifier for skill position 2021-08-26 14:49:52 +03:00
juliancoffee
2f01951613 Inline create_new_text 2021-08-26 14:49:52 +03:00
juliancoffee
beba850353 Diary refactoring 2021-08-26 14:49:52 +03:00