ninefox
|
e6ced0577e
|
Persist interface debug checkbox
|
2022-01-25 22:47:26 -08:00 |
|
Dominik Broński
|
ca7b048184
|
Merge branch 'SeaCrocodile' into 'master'
Sea crocodile
See merge request veloren/veloren!3146
|
2022-01-26 01:26:38 +00:00 |
|
Martin
|
700f709664
|
added delete button in the settings window which deletes a server from the list
|
2022-01-25 19:48:58 +02:00 |
|
Martin
|
a86ed49293
|
added message and event for deleting a server from the list
|
2022-01-25 19:48:19 +02:00 |
|
Imbris
|
432d78a232
|
Merge branch 'imbris/screenshot-format' into 'master'
Support multiple texture formats for screenshots
See merge request veloren/veloren!3134
|
2022-01-25 14:45:54 +00:00 |
|
Imbris
|
2bada7f02a
|
Don't send egui events when it is hidden and as a result these events are also never captured by egui. This fixes issues with the mouse clicks being captured if the mouse was hovered over the egui UI when it was toggled off.
|
2022-01-25 01:23:46 -05:00 |
|
Imbris
|
c320604a36
|
Support multiple texture formats for screenshots
|
2022-01-25 00:36:08 -05:00 |
|
InfRandomness
|
df6a0002e9
|
Move alpha values calculation to CPU
|
2022-01-24 19:24:51 +00:00 |
|
floppy
|
fb316e8f66
|
SeaCrocodile spawning in tropical Oceans
|
2022-01-24 19:36:13 +01:00 |
|
Justin Shipsey
|
05d5bca72d
|
Merge branch 'slipped/roll' into 'master'
hold weapon while rolling
See merge request veloren/veloren!3135
|
2022-01-24 09:56:00 +00:00 |
|
jshipsey
|
067f06561f
|
hold weapon while rolling
|
2022-01-24 03:55:00 -05:00 |
|
Imbris
|
57781eac27
|
Only toggle egui via F7 instead of needing to also have debug toggle on with F3
|
2022-01-24 01:40:55 -05:00 |
|
Imbris
|
086b4bece8
|
Merge branch 'kalikatz/tweak_to_chat_scroll_issue' into 'master'
Kalikatz/tweak to chat scroll issue
See merge request veloren/veloren!2962
|
2022-01-24 06:14:08 +00:00 |
|
Imbris
|
fc3da4bfce
|
Merge branch 'imbris/sobel' into 'master'
Add experimental sobel filter
See merge request veloren/veloren!3113
|
2022-01-24 02:42:54 +00:00 |
|
Imbris
|
7e5a3efd02
|
Add egui window to toggle experimental shaders.
|
2022-01-23 21:14:41 -05:00 |
|
Joshua Barretto
|
d18174e0d1
|
Revert "Merge branch 'infrandomness/remove_alpha' into 'master'"
This reverts merge request !3128
|
2022-01-24 00:52:03 +00:00 |
|
Imbris
|
6cfadc4f65
|
Add sobel filter as experimental shader option
|
2022-01-23 16:32:26 -05:00 |
|
Joshua Barretto
|
470353e08c
|
Fix for translucency blocking clouds
|
2022-01-23 16:32:26 -05:00 |
|
Joshua Barretto
|
38832fadd3
|
Improved underwater lighting on low shader settings
|
2022-01-23 16:32:26 -05:00 |
|
Joshua Barretto
|
e6332c1cb5
|
Significantly improved underwater shaders
|
2022-01-23 16:32:25 -05:00 |
|
Dr. Dystopia
|
9306dc816f
|
Fix warnings
|
2022-01-23 16:32:25 -05:00 |
|
ubruntu
|
57d9283afb
|
Show HUD for campfires
|
2022-01-23 16:32:25 -05:00 |
|
Joshua Barretto
|
bdb0fc9c16
|
Merge branch 'zesterer/underwater' into 'master'
Underwater shaders
See merge request veloren/veloren!3127
|
2022-01-23 20:36:47 +00:00 |
|
Forest Anderson
|
d3aa224f15
|
Merge branch 'tygyh/Fix-warnings' into 'master'
Fix warnings
See merge request veloren/veloren!3051
|
2022-01-23 19:25:35 +00:00 |
|
Joshua Barretto
|
8504a8ab21
|
Merge branch 'ubruntu/campfire-hud' into 'master'
Show HUD for campfires
See merge request veloren/veloren!3097
|
2022-01-23 19:25:11 +00:00 |
|
ubruntu
|
ca2a81c20f
|
Show HUD for campfires
|
2022-01-23 19:25:11 +00:00 |
|
Forest Anderson
|
7c99f6eb5e
|
Merge branch 'unvariant/affix_remap_button' into 'master'
Affixed remap/clear button to top of control settings window
See merge request veloren/veloren!3119
|
2022-01-23 18:40:43 +00:00 |
|
Dr. Dystopia
|
bb48267827
|
Fix warnings
|
2022-01-23 19:03:47 +01:00 |
|
InfRandomness
|
69c3480fce
|
Move alpha values calculation
|
2022-01-23 17:16:22 +00:00 |
|
Joshua Barretto
|
8a684973b4
|
Merge branch 'zesterer/tiny-fixes' into 'master'
Addressing criticisms
See merge request veloren/veloren!3121
|
2022-01-22 16:44:01 +00:00 |
|
Joshua Barretto
|
b8df17080d
|
Merge branch 'infrandomness/waypoint_binding_customization' into 'master'
Add waypoint binding customization code
See merge request veloren/veloren!3122
|
2022-01-21 18:05:41 +00:00 |
|
InfRandomness
|
b33fda1e0c
|
Add waypoint binding customization code
|
2022-01-21 18:05:41 +00:00 |
|
Joshua Barretto
|
c0e3f0abef
|
Merge branch 'ubruntu/chest-sprite-names' into 'master'
Fix chest display names
See merge request veloren/veloren!3125
|
2022-01-21 18:05:39 +00:00 |
|
ubruntu
|
1d0c861e19
|
Fix chest display names
|
2022-01-21 18:05:39 +00:00 |
|
Joshua Barretto
|
31b9cd0565
|
Fix for translucency blocking clouds
|
2022-01-21 17:29:59 +00:00 |
|
Joshua Barretto
|
3b347a2aa3
|
Improved underwater lighting on low shader settings
|
2022-01-21 13:35:40 +00:00 |
|
Samuel Keiffer
|
a00ac11e25
|
Merge branch 'sam/fix-possess' into 'master'
Fix possession bug
See merge request veloren/veloren!3123
|
2022-01-21 07:40:23 +00:00 |
|
Joshua Barretto
|
5b606f0d50
|
Significantly improved underwater shaders
|
2022-01-21 00:42:20 +00:00 |
|
Sam
|
fe1db1e9e0
|
Can move around, so character state system runs
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
|
2022-01-20 15:26:35 -05:00 |
|
Joshua Barretto
|
4f181c936d
|
Merge branch 'name_areas_based_on_biome' into 'master'
name_areas_based_on_biome
See merge request veloren/veloren!3115
|
2022-01-20 19:50:57 +00:00 |
|
Joshua Barretto
|
5a7cd39625
|
Added point glow slider
|
2022-01-20 13:40:11 +00:00 |
|
Joshua Barretto
|
89cd58b1ac
|
Don't allow interaction with mounted entity
|
2022-01-20 11:25:53 +00:00 |
|
threadexception
|
2a65d4950d
|
Fix ghost item when trade gets declined
|
2022-01-20 09:07:47 +01:00 |
|
jshipsey
|
136555dbbe
|
fix crash
|
2022-01-20 02:14:49 -05:00 |
|
ninefox
|
3e198c5195
|
Affixed remap/clear button
|
2022-01-19 17:43:08 -08:00 |
|
Joshua Barretto
|
53574bb6ec
|
Tweaked lantern offsets
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
fcd25648fe
|
Fixed point glow with no clouds
|
2022-01-19 20:08:13 -05:00 |
|
Joshua Barretto
|
7506dc2a41
|
Added procedural LoD detail shader
|
2022-01-19 19:59:14 -05:00 |
|
Joshua Barretto
|
dea540222f
|
Upped bloom default
|
2022-01-19 19:59:14 -05:00 |
|
Joshua Barretto
|
391d1f6bf4
|
Added point glow
|
2022-01-19 19:59:13 -05:00 |
|
Snowram
|
a6e396e29a
|
Stunned and jump anims, stats, spawns, more IA work
|
2022-01-20 00:53:29 +01:00 |
|
Snowram
|
f6d7ba33ef
|
Arthropods spawns and loots
|
2022-01-19 19:01:16 +01:00 |
|
jshipsey
|
82df5f23c3
|
spit anim
|
2022-01-19 19:01:16 +01:00 |
|
jshipsey
|
269b1fcd00
|
summon an
|
2022-01-19 19:01:15 +01:00 |
|
Snowram
|
fd3ed89899
|
More arthropod animations
|
2022-01-19 19:01:15 +01:00 |
|
Snowram
|
38bbd60fd2
|
Arthropod basic attack
|
2022-01-19 19:01:14 +01:00 |
|
Snowram
|
6da42e61ab
|
Arthropod jump attack, hitboxes
|
2022-01-19 19:01:14 +01:00 |
|
Snowram
|
1e6ead4005
|
Arthropod charge
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
02ed6ffd60
|
More arthropod work
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
ae71f2e4f0
|
Adds poisoned debuff (energy change over time)
|
2022-01-19 19:01:13 +01:00 |
|
Snowram
|
2871fa83bc
|
Arthropod run
|
2022-01-19 19:01:12 +01:00 |
|
Snowram
|
fa549eece7
|
Adds new arthropod species
|
2022-01-19 19:01:12 +01:00 |
|
Snowram
|
f67bf2a539
|
Adds arthropod skeleton
|
2022-01-19 19:01:11 +01:00 |
|
Samuel Keiffer
|
c3e92b6c7a
|
Merge branch 'sam/melee-constructor' into 'master'
Melee Constructor
See merge request veloren/veloren!3111
|
2022-01-19 06:36:51 +00:00 |
|
floppy
|
51356d5fad
|
in terrain.mod.rs, return name as Option in fn name
|
2022-01-18 19:53:20 +01:00 |
|
Joshua Barretto
|
b85aac6e23
|
Fixed minor shader issues, added curved world effect
|
2022-01-18 01:47:06 +00:00 |
|
Sam
|
b0644ca767
|
Melee attacks are now created through a melee constructor.
|
2022-01-17 20:41:24 -05:00 |
|
floppy
|
fd920cea1d
|
allow enabling/disabling biome names on map
|
2022-01-17 23:47:27 +01:00 |
|
floppy
|
a836b61190
|
allow enabling/disabling biome names on map
|
2022-01-17 23:45:51 +01:00 |
|
Joshua Barretto
|
cd428d9267
|
Added support for experimental shaders
|
2022-01-17 22:20:33 +00:00 |
|
Joshua Barretto
|
9c565dadc5
|
Merge branch 'zesterer/mount-everest' into 'master'
Mount Everest
See merge request veloren/veloren!3101
|
2022-01-17 13:21:38 +00:00 |
|
jshipsey
|
1d76d484bb
|
anim tweaks
|
2022-01-17 06:45:26 -05:00 |
|
Joshua Barretto
|
d0c101ed06
|
Remove redundant orientation
|
2022-01-17 09:25:46 +00:00 |
|
jshipsey
|
41ed0f284f
|
swivel, quadsmall/quadlow offsets
|
2022-01-17 03:42:56 -05:00 |
|
Kemper
|
6f0f43917d
|
Fix negative energy stat comparisons in item tooltips
|
2022-01-17 05:18:21 +00:00 |
|
Joshua Barretto
|
3b7ea72a9c
|
Fixed review comments
|
2022-01-16 21:13:13 +00:00 |
|
jshipsey
|
0ea1e6862e
|
animation tweaking
|
2022-01-16 15:46:17 -05:00 |
|
Joshua Barretto
|
7f3d9898db
|
More sensible turn rate in air
|
2022-01-16 19:43:13 +00:00 |
|
jshipsey
|
ed9de26f27
|
jump anim, quad med
|
2022-01-16 14:09:55 -05:00 |
|
Joshua Barretto
|
bde3aade2b
|
Updated changelog, fixed incorrect hint for mineable blocks
|
2022-01-16 17:53:51 +00:00 |
|
Joshua Barretto
|
043016a433
|
Don't try to mount unmountable entities, clippy fixes and fmt
|
2022-01-16 17:53:14 +00:00 |
|
Joshua Barretto
|
504e2a38d5
|
Added overhead hints, smoother mount movement
|
2022-01-16 17:53:14 +00:00 |
|
Joshua Barretto
|
f33c12e976
|
Remove unnecessary interpolation cruft
|
2022-01-16 17:53:14 +00:00 |
|
Joshua Barretto
|
157cd6cd14
|
Fixed unusual speech bubble placement
|
2022-01-16 17:53:14 +00:00 |
|
Joshua Barretto
|
5c37786185
|
Improved interpolation for riders
|
2022-01-16 17:53:13 +00:00 |
|
Joshua Barretto
|
6931514ae5
|
Made teleport commands redirect to mount
|
2022-01-16 17:53:13 +00:00 |
|
Joshua Barretto
|
537cc38b5e
|
Fixed lantern position when mounting
|
2022-01-16 17:53:13 +00:00 |
|
Joshua Barretto
|
b3e2d825ed
|
Overhauled mounting to make it more reliable
|
2022-01-16 17:53:13 +00:00 |
|
Sam
|
7ae8ed09f6
|
Addressed MR comments.
|
2022-01-15 21:50:27 -05:00 |
|
Sam
|
4d3b0736d0
|
Fixed bug with returning to general combat skill tree.
|
2022-01-15 21:49:30 -05:00 |
|
Sam
|
aaa33c6834
|
Fixed display of some stats in dary and changelog entry.
|
2022-01-15 21:49:29 -05:00 |
|
Sam
|
745cc20c66
|
Hardened json model of ability sets and added dev panics for when conversion from database failed with dev opt mode.
|
2022-01-15 21:49:28 -05:00 |
|
Sam
|
19a1a0adb2
|
Changed to using slot maker for ability slots
|
2022-01-15 21:49:25 -05:00 |
|
Monty Marz
|
6d0913bb5e
|
visuals
|
2022-01-15 21:46:57 -05:00 |
|
Sam
|
d1c5d3e020
|
If dual wielding two of the same weapon kind, use the same ability entry to display abilities from either hand.
|
2022-01-15 21:46:56 -05:00 |
|
Sam
|
70d6f3a854
|
Scroll through all aiblities in the same pages.
|
2022-01-15 21:46:56 -05:00 |
|
Sam
|
3870688717
|
Pages to swap between weapon abilities.
|
2022-01-15 21:46:55 -05:00 |
|
Sam
|
ed38272d23
|
Diary stats now use real values.
|
2022-01-15 21:46:55 -05:00 |
|
Monty Marz
|
eb0bed39e8
|
stats window WIP
|
2022-01-15 21:46:54 -05:00 |
|
Monty Marz
|
7515c26d68
|
progress
|
2022-01-15 21:46:54 -05:00 |
|