Commit Graph

1193 Commits

Author SHA1 Message Date
James Triantafylos
99776a6ebd Fixes #1350 - Allow players to cap the game FPS when unfocused 2021-10-10 15:33:31 +00:00
Snowram
91c7aef01a Merge branch 'snowram/debug_background' into 'master'
Add a background to debug infos

See merge request veloren/veloren!2858
2021-09-26 22:15:52 +00:00
Snowram
95bc6e3b58 Add a background to debug infos 2021-09-26 23:58:38 +02:00
Marcel
cea927efb6 Merge branch 'xMAC94x/update-toolchain' into 'master'
update toolchain to `nightly-2021-09-24`

See merge request veloren/veloren!2862
2021-09-26 19:25:02 +00:00
Sam
c62162c2d3 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Samuel Keiffer
0af6969d19 Merge branch 'sam/energy-float' into 'master'
Changed energy to a float

See merge request veloren/veloren!2838
2021-09-25 06:51:21 +00:00
Marcel Märtens
e36eef99c8 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Bafon
d53d2300a6 Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Marcel
d5b4c5549b Merge branch 'bafon/crafting-station-icons' into 'master'
Add crafting station icon to crafting menu sidebar

See merge request veloren/veloren!2848
2021-09-22 13:54:33 +00:00
Bafon
0375b973db Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
anomaluridae
51f38df169 clippy is a thing 2021-09-17 10:34:20 -07:00
anomaluridae
582f578e61 breakout interactable into seperate file 2021-09-17 10:32:06 -07: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
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
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
85f4e66337 Addressed MR 2824 comments 2021-09-10 15:20:14 -04: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
Monty Marz
a23433b402 Bloom settings 2021-09-08 09:50:37 +00:00
juliancoffee
24569b544a Rewrite multiplier_to_percentage to return f32 2021-08-28 02:36:26 +03:00
juliancoffee
75a0ce429f Handle some skill description in special way 2021-08-26 14:49:52 +03:00
juliancoffee
758fe19ccb Declarative skill icons 2021-08-26 14:49:52 +03:00
juliancoffee
9211b4a00a Inline skills::Boost to voxygen code 2021-08-26 14:49:52 +03:00
juliancoffee
74183ae5ec Inline redundant functions 2021-08-26 14:49:52 +03:00
juliancoffee
cc8b3c188e Split skilltree window handling per tree 2021-08-26 14:49:52 +03:00
juliancoffee
39b02411e9 Use PositionSpecifier for skill position 2021-08-26 14:49:52 +03:00
juliancoffee
9aacc33495 Inline create_new_text 2021-08-26 14:49:52 +03:00
juliancoffee
d76f65fc5a Diary refactoring 2021-08-26 14:49:52 +03:00
Ygor Souza
54c3adf9af Use all armor stats to calculate combat rating
- Added terms to account for poise (stun resistance), max energy bonus,
  energy reward bonus, and crit power.
- The weights were chosen to yield roughly the same CR for each of the 3
  types of armor in the same tier.
- Weapon rating multiplied by a constant to keep in the same order of
  magnitude as the other terms.
2021-08-16 19:59:54 +02:00
DanTheOne
de750e2f46 Refactor sound settings window 2021-08-14 14:24:06 +02:00
DanTheOne
9b555a52dc Add music and sfx volume numbers 2021-08-14 12:25:21 +02:00
Xeriab Nabil
05df63dd79 Small fix for trade window headers 2021-08-12 21:56:38 +03:00
Xeriab Nabil
8ce679766a Fixes the issue mentioned in #1278 2021-08-12 03:23:31 +03:00
Marcel
0bedfde53e Merge branch 'trade-window-improvements' into 'master'
UI: Fixes and enhancements to the trading window

See merge request veloren/veloren!2738
2021-08-11 09:25:17 +00:00
Illia Denysenko
2a093a9991 Localization for sprite overitem (currenly only crafting stations) 2021-08-10 23:17:25 +00:00
Snowram
dddb47a385 Makes dungeons start at level 1 visually 2021-08-09 16:36:37 +02:00
Xeriab Nabil
8e7939a921 UI: Fixes and enhancements to trading window 2021-08-08 20:11:54 +03:00
Illia Denysenko
0858279810 Gliding Debug Info 2021-08-07 13:19:58 +00:00
juliancoffee
16c72b8667 Add hotkey to toggle Egui Debug 2021-08-06 22:58:36 +03:00
Xeriab Nabil
ea5de81f9b UI: Fixes and enhancements to trading window 2021-08-06 17:11:54 +03:00
Monty Marz
a1e22df944 Merge branch 'transp---opacity-in-UI' into 'master'
transparency -> opacity

See merge request veloren/veloren!2714
2021-08-02 21:30:37 +00:00
Monty Marz
bceed44614 transp -> opacity 2021-08-02 22:49:10 +02:00
Dr. Dystopia
e62d903041 Add 'UpdateArgs import to 'buttons' file 2021-08-02 13:33:52 +02:00
Dr. Dystopia
323e3166f5 Create 'animation' file 2021-08-02 13:27:33 +02:00
Dr. Dystopia
dffc91045e Move variables closer to usage in 'buttons' file 2021-08-02 13:27:28 +02:00