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
9,889 Commits 151 Branches 18 Tags 2.1 GiB
d3acb9a654
Commit Graph

9889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel
e4716147a7 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
85f4e66337 Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Marcel Märtens
7913e6a9ba Change the version number to 0.11 2021-09-10 20:19:17 +02:00
Imbris
37a6ea7abc 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
a77f981b15 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
6e8ede2dda 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
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
Samuel Keiffer
6cdc620c5d 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
78fce06b47 Allowed players to assist NPCs in fights without problems by tweaking aggro rules 2021-09-08 13:17:53 +01:00
Joshua Barretto
c442822885 Capped camera distance without privilege 2021-09-08 13:17:22 +01:00
Joshua Barretto
c3a0a1b8b5 Made the camera go dark if in a filled block and not moderator 2021-09-08 12:37:15 +01:00
Monty Marz
aaaa5a9ae9 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
a23433b402 Bloom settings 2021-09-08 09:50:37 +00:00
Joshua Barretto
14bea533e7 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
c7291701e1 Sprite interaction fixes 2021-09-07 20:34:04 -04:00
Joshua Barretto
49ceb29240 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
3f31f07cc2 [#1251] Code style refactoring 2021-09-06 20:33:08 +03:00
Aleksandr Nariadchikov
c22104ea56 [#1251] Mutable variables are removed. For killing checking non players without alignments as well as with it. 2021-09-06 19:31:12 +03:00
Aleksandr Nariadchikov
75bbe619fd [#1251] /kill_npcs admin command does not kill player's pets now without additional argument "--also-pets" 2021-09-06 18:21:32 +03:00
Ben Wallis
a19f1dfc14 Merge branch 'fixing-character-deletion' into 'master' 
Server: Fix character deletion mentioned in #1327

See merge request veloren/veloren!2818
 2021-09-06 13:40:01 +00:00
Xeriab Nabil
c9e2293a6c Server: Fix character deletion mentioned in #1327 2021-09-06 16:02:41 +03:00
Samuel Keiffer
d5bf9eb6ad Merge branch 'slipped/changes' into 'master' 
buff guards

See merge request veloren/veloren!2816
 2021-09-06 05:06:39 +00:00
jshipsey
3c623c6801 address comments, boost village pop, lower raid chance 2021-09-06 00:01:26 -04:00
jshipsey
da9585205c buff guards 2021-09-05 23:17:14 -04:00
Samuel Keiffer
5e3e698c2a Merge branch 'khalludi/adjust_entity_aim' into 'master' 
Set direction using character state

Closes #1219

See merge request veloren/veloren!2815
 2021-09-06 00:33:41 +00:00
Khalid Ali
cbc6cdfad1 Use unreachable instead of panic 2021-09-05 18:13:20 -05:00
Khalid Ali
a0b78ffd16 Add RepeaterRanged and fix scaling ChargedRange 2021-09-05 18:03:54 -05:00