Imbris
a545d099a2
Restore fix for dragging on windows platforms
2020-11-25 00:29:28 -05:00
Marcel
d1a9264a99
Merge branch 'angryanimals' into 'master'
...
animal attacks
See merge request veloren/veloren!1542
2020-11-25 01:33:20 +00:00
Sam
33e4448542
Replaced every unnecssary powf in the entire codebase with either powi or sqrt.
2020-11-24 18:28:24 -06:00
Sam
5461f002fe
Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body.
2020-11-24 17:56:39 -06:00
jiminycrick
aad9734055
Agent tactic refactoring
...
Lower theropods spawns
clippy, changelog
review response
2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef
More ai work
...
balance
Lavadrake AI tweaks
feedback tweaks
2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f
theropods in world, small tweaks
2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04
bunch of animations and more attacks
2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6
hoof attack, tweaks
2020-11-24 17:48:50 -06:00
jshipsey
a27b086401
placeholder for charge animal, animated leapmelee, small fixes
2020-11-24 17:48:49 -06:00
jshipsey
1f59ef92d8
species specific speeds, more animation
2020-11-24 17:48:48 -06:00
jshipsey
c07d8df58b
assigning weapons, building animations
...
ability mapping
2020-11-24 17:48:43 -06:00
jshipsey
e3e513cc11
initial quadlow ranged work
2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a
Wolf attacks and ai.
...
initial wolf dash testing
tool.rs
Wolf attack AI
2020-11-24 17:48:20 -06:00
Joshua Barretto
46dc49bc0a
Fixed bit-twiddling colour bug
2020-11-24 18:44:41 +00:00
Christof Petig
a3db20c9d6
Show caves in map
2020-11-23 19:05:17 +01:00
Joshua Barretto
26fd40c0e3
Fmt, make clippy happy
2020-11-23 15:39:03 +00:00
Treeco
8922fd949f
Make zooming in then back out return to the previous zoom level
2020-11-23 10:58:22 +00:00
Joshua Barretto
0513a41981
Iteration order fix x2
2020-11-23 10:58:22 +00:00
Imbris
7c6fe69922
Show indicator over site icons
2020-11-23 10:58:22 +00:00
Joshua Barretto
765a1ca17b
Switched light map iteration order, fire bowls in dungeons
2020-11-23 10:58:21 +00:00
Treeco
a1236d4da0
Fixed map screens for rectangular worlds
2020-11-23 10:58:21 +00:00
Monty Marz
d069eb9a57
street lamp particles, ground fire bowl, misc fixes
2020-11-23 10:58:21 +00:00
Imbris
898bba8884
Demystify map site icon placement calculations
2020-11-23 10:58:21 +00:00
Joshua Barretto
b539ecf438
More lights, minimised light and glow map data
2020-11-23 10:58:21 +00:00
Joshua Barretto
4bb0da24b6
Addressed review comments
2020-11-23 10:57:57 +00:00
Joshua Barretto
df1b19ed64
Light/glow temporal interpolation hack
2020-11-23 10:57:57 +00:00
Joshua Barretto
bb9e593a44
Fixed glow AO
2020-11-23 10:57:57 +00:00
Joshua Barretto
d7bbceca2d
Added light/glow map sample interpolation for entities
2020-11-23 10:57:56 +00:00
Joshua Barretto
27e7fd0727
Preserved light/glow maps to prevent sprites/entities being lit when they shouldn't be
2020-11-23 10:57:56 +00:00
Joshua Barretto
51d1a2ecff
Added glow
2020-11-23 10:57:56 +00:00
Monty Marz
099dfc959f
translations, fixes
2020-11-23 10:57:56 +00:00
Joshua Barretto
93a86a951e
Tweaked default graphics settings
2020-11-23 10:57:56 +00:00
Monty Marz
82da969707
fix overly long names clipping on the minimap
2020-11-23 10:57:56 +00:00
Joshua Barretto
7850b0bcaf
Added site names, dungeon difficulty, better explosions
2020-11-23 10:57:55 +00:00
Monty Marz
5b907ede9e
fix hints
2020-11-23 10:57:55 +00:00
Monty Marz
884a5d9c51
fix scrolling on non-windows OS
2020-11-23 10:57:55 +00:00
Joshua Barretto
058908f603
Made flamethrower and healing staff emit light on use
2020-11-23 10:57:55 +00:00
Monty Marz
97934d1070
map fixes
2020-11-23 10:57:55 +00:00
Joshua Barretto
5930ca4a59
Temporarily make particles opaque to avoid depth-related rendering problems
2020-11-23 10:57:55 +00:00
Joshua Barretto
7eb437501d
Fixed various particle issues
2020-11-23 10:57:55 +00:00
Joshua Barretto
bcc220804a
Added exposure to settings
2020-11-23 10:57:55 +00:00
Monty Marz
8b6c73744e
more map stuff
2020-11-23 10:57:16 +00:00
Joshua Barretto
aa59d66a76
Fixed many map problems, re-added surface mist
2020-11-23 10:57:15 +00:00
Monty Marz
99b3a4465a
WIP map zooming and dragging
2020-11-23 10:57:15 +00:00
Monty Marz
c825e33f1a
map icon options WIP
2020-11-23 10:45:02 +00:00
Joshua Barretto
1d031538f9
Added HDR
2020-11-23 10:45:02 +00:00
Joshua Barretto
49df604de0
Better scattering and scatter (of both varieties)
2020-11-23 10:45:02 +00:00
Joshua Barretto
ee65b4fb17
Improved cloud quality by improving sun access heuristic
2020-11-23 10:45:02 +00:00
Monty Marz
1864f4626c
map icons
2020-11-23 10:45:01 +00:00
Joshua Barretto
b352ef5d55
Terrain pop-in, fixed agent pathfinding in water
2020-11-23 10:45:01 +00:00
Joshua Barretto
6adfa547db
Added site icons to main map
2020-11-23 10:45:01 +00:00
Joshua Barretto
d4d4f17d3c
Added world map size icons
2020-11-23 10:45:01 +00:00
Joshua Barretto
fc26305ac8
Increases maximum sprite dimensions (if you suspect an issue, check this commit)
2020-11-23 10:37:59 +00:00
Imbris
7ba2efcde2
Attempt to fix ui bug with changing screens causing inventory slots and such to disappear, presumably due to dpi differences
2020-11-22 14:22:39 -05:00
Imbris
1355c1e8f5
Move tracy frame markers to proper locations, add a few spans
2020-11-22 14:22:39 -05:00
Imbris
82b95974f1
Log errors occuring when client keeps retrying connection to the server
2020-11-22 03:54:19 -05:00
Imbris
e72c69ca41
Merge branch 'imbris/fix-apple-bug' into 'master'
...
Fix issues with not being able to grab highlighted apples by unifying distance checking
Closes #820
See merge request veloren/veloren!1532
2020-11-21 02:55:09 +00:00
Imbris
ea275e320f
Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module
2020-11-20 20:51:44 -05:00
Samuel Keiffer
435d354dad
Merge branch 'sam/interrupting-rolls' into 'master'
...
Rolling can now interrupt any attack.
See merge request veloren/veloren!1537
2020-11-20 18:37:44 +00:00
Sam
987df30dc4
Fixed audio test, added changelog line.
2020-11-20 11:50:01 -06:00
Monty Marz
dd338eb142
Update simple.rs
2020-11-20 17:56:26 +01:00
Joshua Barretto
8981dce4c9
Merge branch 'Awkor/rotate-camera-character-selection' into 'master'
...
Implement #334 - Enable camera rotation in character selection screen
Closes #334
See merge request veloren/veloren!1377
2020-11-20 16:32:39 +00:00
jiminycrick
3ef00c4e76
Fix audio disabling
2020-11-19 10:46:31 -08:00
Snowram
d98bfa72ad
Improves bipedlarge and theropod anims, balance tweaks
2020-11-19 00:56:50 +01:00
Snowram
b48de84f8c
Adds 3 new npcs
2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3
Adds 2 new npcs, some models tweaks
2020-11-19 00:53:13 +01:00
Snowram
42d2108c39
Adds mindflayer npc
2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3
Adds new animals
2020-11-19 00:53:02 +01:00
jiminycrick
1ce3827e22
Address comment
2020-11-18 13:31:13 -08:00
jiminycrick
2d2f267907
Addressed comments and fixed pipeline
2020-11-18 13:31:13 -08:00
jiminycrick
3b47add55a
Fully move sfx away from ECS event bus
2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e
Initial work to move combat sfx to outcomes
2020-11-18 13:31:12 -08:00
jiminycrick
77d624f640
Made level up sounds use outcomes instead of emitting an event
2020-11-18 13:31:12 -08:00
jiminycrick
9c87345135
Moved functions to client out of audio and generalized non-positional ambient sfx
2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01
Beginning to address comments
2020-11-18 13:31:12 -08:00
jiminycrick
c44a9092d3
Biome definition tweaks and more sfx
2020-11-18 13:31:12 -08:00
jiminycrick
f0d14ebe20
fix rebase
2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd
Quadraped footsteps and songs in biomes
2020-11-18 13:31:12 -08:00
jiminycrick
27dc43fe18
Audio test fixes
2020-11-18 13:31:12 -08:00
jiminycrick
ddd970b986
Even more clippy fixes
2020-11-18 13:31:12 -08:00
jiminycrick
e1fcb3744e
Comment out audio device picker
2020-11-18 13:31:12 -08:00
jiminycrick
ea1bc2941b
Clippy fixes
2020-11-18 13:31:12 -08:00
jiminycrick
d47e0bbb73
Getting merge ready minus device picker
2020-11-18 13:31:12 -08:00
jiminycrick
2d088faea4
Wind transition smoothing
2020-11-18 13:31:12 -08:00
jiminycrick
f182002e38
Underwater and cave reverb
2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb
Broken wind implementation
2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41
Snow footsteps
2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974
River water sfx
2020-11-18 13:31:12 -08:00
jiminycrick
8f5a22671d
Re-added device selector to settings with new rodio
2020-11-18 13:31:12 -08:00
jiminycrick
decb0e3e24
Hackily upgraded rodio and cpal to 0.13
2020-11-18 13:31:12 -08:00
jiminycrick
d0bd5118bf
Made biome probabilities neater
2020-11-18 13:31:12 -08:00
jiminycrick
e880654f2e
Probability for biome play
2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e
Dungeon and cave specific music
2020-11-18 13:31:12 -08:00
jiminycrick
0a9f1ee11c
Remove ambient channel system in favor of sfx system
2020-11-18 13:31:12 -08:00
jiminycrick
39d4ee8a96
Owls, campfires, and better bird sfx handling
2020-11-18 13:31:12 -08:00
jiminycrick
3169562a80
Night time sfx and swimming
2020-11-18 13:31:12 -08:00
jiminycrick
aa6b7cbb65
Bird calls from trees
2020-11-18 13:31:12 -08:00
jiminycrick
9e790f6cac
Really broken block sfx pushed so others can see
2020-11-18 13:31:12 -08:00
jiminycrick
3473347742
Sfx from blocks
2020-11-18 13:31:12 -08:00
jiminycrick
0689630d98
Fading music/ambient sounds decently upon biome transition
2020-11-18 13:31:11 -08:00
jiminycrick
b5aea464f3
Switch music at biome transitions
2020-11-18 13:31:11 -08:00
jiminycrick
46d3f6f6d2
Initial biome specific music and ambient sound channel
2020-11-18 13:31:11 -08:00
Imbris
7427367d96
Fix issues with not being able to grab highlighted apples by unifying distance checking
2020-11-17 23:06:02 -05:00
Snowram
950eb1976d
Addressed more comments
2020-11-17 23:54:01 +01:00
Snowram
83b2640e02
Makes basic beam Y offset depend on body scale
2020-11-17 23:27:13 +01:00
Snowram
7af561263d
Addressed comments
2020-11-17 23:27:13 +01:00
Snowram
93642428f2
Move eye sight and scale in body.rs, mounts tweaks
2020-11-17 23:27:13 +01:00
David Fisher
b93d4bf85c
Add simple tests to utils description functions
...
I initially ended up in this file looking to take on issue #707
which I realized had been already done. Having touched the file though
I thought it good to add some basic tests to get used to the workflow
on the project and how things are setup here.
This commit adds some basic requests and cleans up some comments
which appear to have been left as placeholders for work which appears
to have been completed already.
I attempted to test the tool_desc and armor_desc functions, but realized
I wasn't sure how to best create an instance of Armor or Tool without
modifying other files to make more things public.
This is my first commit on the project, and was intentionally kept
simple accordingly.
2020-11-15 18:53:20 -05:00
Odd-Harald Lillestø Myhren
774ef72344
Merge branch 'master' into 'knarkzel/persist-combo-roll'
...
# Conflicts:
# CHANGELOG.md
2020-11-15 22:37:30 +00:00
Knarkzel
64da99a4d7
add new was_combo field to test
2020-11-15 23:49:01 +01:00
Joshua Barretto
171ef1d7b9
Upscaling support
2020-11-15 22:18:35 +00:00
Imbris
4872d285c3
Merge branch 'imbris/fix-font-selection' into 'master'
...
Properly use localization specified fonts, fix swedish translation by adding...
Closes #834
See merge request veloren/veloren!1521
2020-11-15 03:18:29 +00:00
Imbris
03c96a7c7b
Properly use localization specified fonts, fix swedish translation by adding other fonts to the font mapping list
2020-11-14 21:31:31 -05:00
Imbris
4f2512f126
Save the selected character, deselect character when deleting, auto select newly created character
2020-11-14 19:17:42 -05:00
Imbris
5dbb1aeae7
Merge branch 'imbris/fix-7' into 'master'
...
Fix panic on minimizing window before the game starts up
See merge request veloren/veloren!1514
2020-11-14 03:30:13 +00:00
Imbris
ff5b152525
Merge branch 'imbris/fix-6' into 'master'
...
Fix issue where ui scale in the login menu was not updated when changed in-game
Closes #578
See merge request veloren/veloren!1513
2020-11-14 02:49:41 +00:00
Imbris
a044981fd7
Fix panic on minimizing window before the game starts up
2020-11-13 21:09:19 -05:00
Imbris
1373b752ff
Merge branch 'imbris/fix-5' into 'master'
...
Remove randomization of species and body_type with the randomize button in char creation
See merge request veloren/veloren!1512
2020-11-14 01:56:28 +00:00
Imbris
51dd5110d0
Merge branch 'imbris/fix-3' into 'master'
...
Tweak clock related things and fix voxygen tracy feature
See merge request veloren/veloren!1506
2020-11-14 01:39:33 +00:00
Imbris
cff5439796
Fix issue where ui scale in the login menu was not updated when changed in-game
2020-11-13 20:17:59 -05:00
Imbris
1952785af2
Remove randomization of species and body_type with the randomize button in char creation
2020-11-13 19:43:32 -05:00
Samuel Keiffer
1ed90bd0bf
Merge branch 'sam/ron-abilities' into 'master'
...
Move abilities to .ron files
Closes #821
See merge request veloren/veloren!1508
2020-11-13 17:55:57 +00:00
Sam
b5f59f9cf3
Fixed tests. Addressed comments.
2020-11-13 10:41:34 -06:00
Monty Marz
7da8c71d89
radio buttons for buff position in settings
2020-11-13 14:32:15 +01:00
Monty Marz
691d1f5243
bigger buff icons above skillbar
2020-11-13 14:20:33 +01:00
Imbris
5fa2ac6e38
Handle window resizing properly to fix some bugs on startup
2020-11-12 23:56:36 -05:00
Imbris
f1ca3ccc69
Fix language and ui resolution in menus not updating when they are changed ingame
2020-11-12 23:03:44 -05:00
Imbris
37e4ea4669
Remove ability map from top level functions
2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961
Started moving loading of ability manifest to an ecs variable.
2020-11-12 21:24:34 -06:00
Imbris
27d4310498
Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds
2020-11-12 19:18:54 -05:00
Imbris
fffd5d0ef0
Fix offset issue in ui on startup
2020-11-11 23:47:07 -05:00
Imbris
c0e8298ac3
Display averaged busy dt
2020-11-11 23:26:13 -05:00
Imbris
d5dd126724
Add tracy feature that randomly disappeared back into voxygen
2020-11-11 22:33:02 -05:00
Imbris
a97b188bea
Make fps display and specification more precise
2020-11-11 21:47:22 -05:00
Snowram
af346806de
Addressed comments
2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c
Adds a speed stat to weapons
2020-11-11 22:03:53 +01:00
Joshua Barretto
7bce8b9615
More resiliant settings, better key defaults
2020-11-11 17:37:26 +00:00
Imbris
865482d768
ui: Improve login info banner gradient, smallify things, put login menu quit button at the bottom
2020-11-11 03:02:51 -05:00
Imbris
61c0780872
Remove uneeded commented code, add notes to remaining commented code, use source rect calculations from conrod backend code
2020-11-11 03:02:51 -05:00
Imbris
64d885a192
Clippy fixes
2020-11-11 03:02:51 -05:00
Imbris
584824d405
Tweak scrollbar in char select screen to look nicer, fix warnings, remove old ui code, add character loading/deleting/creating/error info popups
2020-11-11 03:02:23 -05:00
Imbris
9df8368c88
Add some tracing spans
2020-11-11 03:02:23 -05:00
Imbris
d2166fed3d
Make iced ui use scale from the settings
2020-11-11 03:02:22 -05:00
Imbris
eda7b380dd
Change glyph cache position tolerance to match changes in master
2020-11-11 03:02:22 -05:00
Imbris
469b048de9
Update iced
2020-11-11 03:02:22 -05:00
Imbris
90bfafc469
Fix tooltip positioning for tooltipped elements inside Scrollable widgets
2020-11-11 03:02:22 -05:00
Imbris
cd1a134c26
Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style
2020-11-11 03:02:22 -05:00
Imbris
7aa8412556
Add tooltips in iced char creation to species, tools, randomize button, and create button
2020-11-11 03:02:22 -05:00
Imbris
fe7d65843b
Highlight button of selected character, enter the world if character is selected when enter key is pressed
2020-11-11 03:02:22 -05:00
