juliancoffee
|
58a4659c47
|
Remove body::Shape enum, make npc use CapsulePrism
|
2021-09-17 13:28:34 +03:00 |
|
juliancoffee
|
944e9263cb
|
Implement CapsulePrism collisions
|
2021-09-17 13:28:34 +03:00 |
|
juliancoffee
|
1bb1b9c34e
|
Refactor box_voxel_collision function
|
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 |
|
Samuel Keiffer
|
3f55337461
|
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
|
db090c8112
|
Another trade fix
|
2021-09-16 22:06:30 +00:00 |
|
Imbris
|
699abadc95
|
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
|
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 |
|
Joshua Barretto
|
a78893862a
|
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
|
46a6d21d63
|
Fixed exp fix mistake and fixed lava, campfire, and bomb damage.
|
2021-09-15 08:32:44 -04:00 |
|
Monty Marz
|
ad28b2837d
|
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
|
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 veloren/veloren!2837
|
2021-09-14 22:19:31 +00:00 |
|
Samuel Keiffer
|
388086a420
|
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
|
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
|
b30cde7f0e
|
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
|
7433994fca
|
Fixed fall damage and sceptre regen.
|
2021-09-14 06:53:01 -04:00 |
|
Marcel
|
447efa5a2c
|
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
|
fa431cebab
|
Update to the Italian translations
|
2021-09-14 09:07:38 +00:00 |
|
Marcel
|
df74d9fa45
|
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
|
4ffae084e8
|
Fix trade/merchant bugs
|
2021-09-14 07:31:06 +00:00 |
|
Joshua Barretto
|
a98303b9c2
|
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
|
dbb6d75427
|
fixing_1328_set_waypoint_when_on_ground_and_not_going_down
|
2021-09-13 16:51:02 -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 veloren/veloren!2824
|
2021-09-13 15:23:18 +00:00 |
|
Sam
|
e331082a97
|
Removed a few unnecessary casts.
|
2021-09-13 10:41:55 -04:00 |
|
Sam
|
a7714b5120
|
Fixed plugin tests with hack.
|
2021-09-13 10:34:40 -04:00 |
|
Samuel Keiffer
|
4ede8995fb
|
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
|
4338d4db26
|
Balanced frequency of dungeons.
|
2021-09-11 18:59:04 -04:00 |
|
João Capucho
|
841d8d6a77
|
Add checkbox rendering logic for iced
|
2021-09-10 21:17:06 +01:00 |
|
Marcel
|
1d1d7c9e32
|
Merge branch 'xMAC94x/release-numbers' into 'master'
Change the version number to 0.11
See merge request veloren/veloren!2826
|
2021-09-10 20:02:36 +00: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
|
15db53e120
|
Merge branch 'imbris/camera-hotfixes' into 'master'
Camera hot fixes
See merge request veloren/veloren!2825
|
2021-09-10 16:38:29 +00: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
|
1f9d21f277
|
Merge branch 'pfau/0.11_bg' into 'master'
0.11 Background images and more
See merge request veloren/veloren!2823
|
2021-09-10 08:34:01 +00: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 |
|
Samuel Keiffer
|
c71a144a66
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Tiny fixes
See merge request veloren/veloren!2822
|
2021-09-08 17:09:38 +00:00 |
|
Joshua Barretto
|
003e071e91
|
Allowed players to assist NPCs in fights without problems by tweaking aggro rules
|
2021-09-08 13:17:53 +01: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
|
06f2dd40f5
|
Merge branch 'pfau/bloom_settings' into 'master'
Bloom settings
See merge request veloren/veloren!2821
|
2021-09-08 09:50:37 +00:00 |
|
Monty Marz
|
8506d31736
|
Bloom settings
|
2021-09-08 09:50:37 +00:00 |
|
Joshua Barretto
|
c090d09dd8
|
Merge branch 'sam/fix-voxygen-sprite' into 'master'
Sprite interaction fixes
See merge request veloren/veloren!2820
|
2021-09-08 00:58:25 +00:00 |
|
Sam
|
c21716a1b3
|
Sprite interaction fixes
|
2021-09-07 20:34:04 -04:00 |
|
Joshua Barretto
|
69d972c22d
|
Merge branch 'specter/kill_npcs_additional_pet_argument' into 'master'
[#1251] /kill_npcs admin command does not kill player's pets now without additional argument
See merge request veloren/veloren!2819
|
2021-09-06 18:33:33 +00:00 |
|
Aleksandr Nariadchikov
|
c4c62f4c4f
|
[#1251] Code style refactoring
|
2021-09-06 20:33:08 +03:00 |
|