3854 Commits

Author SHA1 Message Date
Imbris
7fca34668a Make gitlab hightlight syntax for ron files (using rust syntax highlighting). Update changelog for credits addition. Fix clippy large variant issue. 2021-09-30 03:01:24 -04:00
Imbris
4e9007b45a Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid. 2021-09-30 02:35:59 -04:00
Imbris
065654f451 Add basic credits screen to the main menu with some example data loaded from a ron file 2021-09-29 21:06:52 -04:00
Imbris
0c214baf9b Deduplicate window resize events to remove redudant resizing of the swap chain and other render targets and to fix issues where resizing quickly can cause self reinforcing delays in tick completion 2021-09-29 10:25:59 -04:00
Imbris
aa2695e88f Merge branch 'bafon/voxel-transparency' into 'master'
Fix voxel transparency

See merge request veloren/veloren!2885
2021-09-28 04:44:29 +00:00
Bafon
5fb53ddf4e Fix voxel transparency 2021-09-28 04:44:29 +00:00
Imbris
1fa61691ce Make sure to regenerate textures when Ui::replace_graphic is used. 2021-09-27 23:35:14 -04:00
Snowram
82e98b4faf 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
e7b70e68de Add a background to debug infos 2021-09-26 23:58:38 +02:00
Marcel
64a8e3c5df 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
Samuel Keiffer
d7a89bf944 Merge branch 'sam/cr-weights' into 'master'
Changed weights of cr calculation and exp from cr formula.

See merge request veloren/veloren!2875
2021-09-26 18:21:56 +00:00
Imbris
ec5204af37 Add note on a clippy suppression pointing to relevant clippy issue 2021-09-26 11:24:30 -04:00
Sam
14cdb2b803 Changed weights of cr calculation and exp from cr formula. 2021-09-25 21:52:20 -04:00
Sam
d0c78c3d63 Made poise a float at interface of module. 2021-09-25 14:07:47 -04:00
Samuel Keiffer
fcd865a3c7 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
96bd27db62 apply some clippy fixes that comes with the new toolchain version 2021-09-24 23:18:18 +02:00
Marcel Märtens
8c0c86b192 update toolchain to nightly-2021-09-24 2021-09-24 23:18:07 +02:00
Snowram
e9a9f0a278 Merge branch 'bafon/toggle-hotkey-hints-setting' into 'master'
Add setting to disable hotkey hints

See merge request veloren/veloren!2849
2021-09-24 16:03:06 +00:00
Bafon
f5c90911ec Add setting to disable hotkey hints 2021-09-24 16:03:05 +00:00
João Capucho
40432b5c83
Fix dir is empty check when setting WGPU_TRACE_DIR 2021-09-24 15:07:12 +01:00
Imbris
c0e0d2080d Merge branch 'imbris/tex-cleanup' into 'master'
Remove old textures that aren't reused when calling replace_graphic

See merge request veloren/veloren!2869
2021-09-24 02:38:27 +00:00
Imbris
1c7b84040e Remove old textures that aren't reused when calling replace_graphic 2021-09-23 21:50:37 -04:00
Sam
961782851f 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
Imbris
51bda3f52b Avoided black hexagons when bloom is enabled by suppressing NaN/Inf pixels during the first bloom blur pass 2021-09-22 21:58:36 -04:00
Marcel
cde6126fb7 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
e2f8468016 Add crafting station icon to crafting menu sidebar 2021-09-22 13:54:32 +00:00
Snowram
8d88a29a4b Adds Xtilt to BirdLarge skeleton 2021-09-21 15:31:46 +02:00
Snowram
46021c31bd Bird large beam offset hack 2021-09-21 15:31:43 +02:00
jshipsey
7978b16820 animation tweaks 2021-09-21 15:30:43 +02:00
Snowram
cfdcf59844 Split wyvern anims from the other birdlarge anims 2021-09-21 15:30:43 +02:00
jshipsey
be53c407cb wyvern walk 2021-09-21 15:30:43 +02:00
Snowram
298c1fbccb More wyvern anim work 2021-09-21 15:30:42 +02:00
Snowram
7384868c57 Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
Marcel Märtens
636838f510 update crates 2021-09-20 14:39:01 +02:00
Ben Wallis
4349a14064 * Added new Admin Commands window to egui, including Give Items and Kits sections
* Added widgets.rs to egui for reusable widgets
* Added filterable_list egui widget
* Reworked DebugShapeAction to be a more generic EguiAction which now allows for ChatCommands (used by admin tools) as well as DebugShape drawing requests.
* Fixed egui event handling so that typing/clicking within egui windows now correctly doesn't pass these events onto the game itself
* Removed /give_item limit for stackable items
2021-09-18 16:17:42 +01:00
anomaluridae
d0629224d2 remove unneeded mut, provide default_select_pos to secondry key event handler, and use the is_filled() over the is_opaque() to be reader friendly 2021-09-17 10:34:20 -07:00
anomaluridae
dc76d5c05f is_solid() detects both solid rock and sprites (e.g. mineable ore). when in build mode, would like to be able to still mine if user cursor is over a mineable ore. so need to properly cast the build ray to use opaque (not fillable) blocks to get the proper position, vs the mineable block which may be nearer 2021-09-17 10:34:20 -07:00
anomaluridae
f3d8adf3fa choose nearest target, from a specific subset of targets, for scene highlighting vs interactable vs game primary/secondary key input 2021-09-17 10:34:20 -07:00
anomaluridae
a7cee0f11b keep MAX_TARGET_RANGE within voxygen 2021-09-17 10:34:20 -07:00
anomaluridae
2789d2ae29 intentional use of terrain targeting and select_pos as passed to the event handler. select_pos is None when not needed. 2021-09-17 10:34:20 -07:00
anomaluridae
a02488ddd9 properly use the target vs pickup range, in choosing the interactable. when finding the target_entity, use the proper limited dist range (cast_dist) with the proper upper bounds. 2021-09-17 10:34:20 -07:00
anomaluridae
0f13db9600 make the ContollerInputs.select_pos be explicitly the breakable blacks for mining 2021-09-17 10:34:20 -07:00
anomaluridae
07cfa0ef35 add comment for future direction of Interactables. 2021-09-17 10:34:20 -07:00
anomaluridae
b1adc9c4e0 build positions for place versus remove block are cleaner (less likely to fail) when apply the +0.01 modifier versus -0.01 modifier selectively. this is equivalent to current master, and is simply more explicit now 2021-09-17 10:34:20 -07:00
anomaluridae
9ddc38ba18 changes per MR feedback. simplier Option handling with zip, filter, and fewr unwraps. use kind keyword (not typed). if lets when possible. additional syntax cleanup 2021-09-17 10:34:20 -07:00
anomaluridae
946ca442ab make Target generic, over the specific typed targets 2021-09-17 10:34:20 -07:00
anomaluridae
01cfe39503 undo macro use for DRY on client event handler, and handle edge detection in mining so that we don't get Empty interactables. 2021-09-17 10:34:20 -07:00
anomaluridae
25c3d2a9e2 MR review updates. Added back the 0.01 modifiers, update naming and comments, keep interactable construction in the interactables mod, remove unneeded curry, syntax updates. only cast for mining and build if enabled. 2021-09-17 10:34:20 -07:00
anomaluridae
20c4054e6a build is working. to add and remove blocks. 2021-09-17 10:34:20 -07:00
anomaluridae
be1095632f make Target into a typed struct. delineate the clear difference in Target versus Interactable. comments and naming cleanup, for more explicitness. 2021-09-17 10:34:20 -07:00