Snowram
834749353a
Adds flame wyvern npc
2021-09-21 15:30:42 +02:00
juliancoffee
6e2f9be13f
Allow aiming bombs
2021-09-20 22:29:25 +03:00
Marcel
e472075b6a
Merge branch 'xMAC94x/update_crates' into 'master'
...
update crates
See merge request veloren/veloren!2863
2021-09-20 13:31:14 +00:00
Marcel Märtens
88685cc016
update crates
2021-09-20 14:39:01 +02:00
Joshua Barretto
e098a38d8e
Merge branch 'james/rrt-pathfinding' into 'master'
...
Initial RRT flight pathfinding
See merge request veloren/veloren!2773
2021-09-19 19:30:31 +00:00
Justin Shipsey
16d9959cb4
Merge branch 'mehmetmalli/turkish-translations' into 'master'
...
Turkish translations
See merge request veloren/veloren!2861
2021-09-19 17:49:19 +00:00
Mehmet Mallı
9745e7db6c
Update buff.ron
2021-09-19 16:05:04 +00:00
Mehmet Mallı
bfb859fff1
added main Turkish translations
2021-09-19 17:36:31 +03:00
Mehmet Mallı
c001d5c0e2
added common Turkish translations
2021-09-19 17:36:05 +03:00
Mehmet Mallı
619bd5b56f
changed Turkish translations for uncanny valley in char_selection
2021-09-19 17:35:41 +03:00
Mehmet Mallı
0444a6808f
added Turkish translations for buffs
2021-09-19 17:35:08 +03:00
Joshua Barretto
f94d579c04
Merge branch 'juliancoffee/clay_gole_laser_fix' into 'master'
...
Tweak coefficient of beam_offset for clay_golem
See merge request veloren/veloren!2859
2021-09-18 17:36:08 +00:00
juliancoffee
1d8c368137
Tweak coefficient of beam_offset for clay_golem
2021-09-18 19:55:46 +03:00
Ben Wallis
cf9ff6353d
Merge branch 'xvar/egui-admin' into 'master'
...
Added new Admin Commands window to egui, including Give Items and Kits sections
See merge request veloren/veloren!2812
2021-09-18 16:02:27 +00:00
Ben Wallis
d665ce329d
* 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
Joshua Barretto
2f1fe39e04
Merge branch 'james/lava-dungeons' into 'master'
...
Prettier site2 houses
See merge request veloren/veloren!2852
2021-09-18 14:58:42 +00:00
Trung Do
2059d39c7e
Add Vietnamese translation
...
Not translate skills.ron yet.
2021-09-18 17:59:28 +07:00
Justin Shipsey
02c19aaee8
Merge branch 'zesterer/remove-unscheduled-skydives' into 'master'
...
Remove unscheduled skydives
See merge request veloren/veloren!2851
2021-09-18 04:53:22 +00:00
James Melkonian
36884d6919
Move rrt algorithm into its own function
2021-09-17 16:27:00 -07:00
James Melkonian
9875a74640
Make RRT pathfinding a cfg feature
2021-09-17 16:01:20 -07:00
James Melkonian
c2c4429750
Disable RRT pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
7ddc229728
Initial RRT flight pathfinding
2021-09-17 16:01:19 -07:00
James Melkonian
485b057d60
Prettier town houses
2021-09-17 15:49:14 -07:00
James Melkonian
42fdf0818d
Gable primitive and dungeon lava rooms
2021-09-17 15:45:26 -07:00
Joshua Barretto
a76496c339
Use previous position caches for airship collision detection
2021-09-17 22:34:28 +01:00
Imbris
bc4455afe4
Merge branch 'anomaluridae/cleanup-interactable' into 'master'
...
Seperation of targets vs interactables. Cleaner cursor interactions.
See merge request veloren/veloren!2754
2021-09-17 19:25:08 +00:00
Joshua Barretto
80f341f2b1
Merge branch 'juliancoffee/remove_level' into 'master'
...
Rename level in EntityInfo to health_scaling and small cleaning
See merge request veloren/veloren!2850
2021-09-17 17:38:10 +00:00
anomaluridae
d0bd1ddb24
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
82f3c3c3e8
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
aa86c86cb6
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
6362df4ffc
keep MAX_TARGET_RANGE within voxygen
2021-09-17 10:34:20 -07:00
anomaluridae
b4d12b7995
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
42d5836cfa
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
5c66f73bb4
make the ContollerInputs.select_pos be explicitly the breakable blacks for mining
2021-09-17 10:34:20 -07:00
anomaluridae
c5d66192fc
add comment for future direction of Interactables.
2021-09-17 10:34:20 -07:00
anomaluridae
c20dbe17dd
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
f60bd80cc2
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
8b83b48b9b
make Target generic, over the specific typed targets
2021-09-17 10:34:20 -07:00
anomaluridae
ba4af5ee8e
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
309447dced
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
84f19b408f
build is working. to add and remove blocks.
2021-09-17 10:34:20 -07:00
anomaluridae
48cc5d3b08
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
anomaluridae
51f38df169
clippy is a thing
2021-09-17 10:34:20 -07:00
anomaluridae
f20b5f0b49
make scene interaction be targeted exactly on mining blocks (removing abnormal Empty labels), and don't reset position to None in the middle of mining.
2021-09-17 10:34:20 -07:00
anomaluridae
ff91da8b52
make the concepts of targets (under cursor), separate from interactable. interactable is what is (1) indicated visually in gui as able to interact, or (2) is an entity, or (3) is a block capable of Interaction. whereas a target is what occurs under the cursor, regardless of other state and input (such as different InputKind). targets are determined first, then other factors are cosidered to determine interactable.
2021-09-17 10:34:20 -07:00
anomaluridae
582f578e61
breakout interactable into seperate file
2021-09-17 10:32:06 -07:00
juliancoffee
91dd03b745
Clean entity assets for a small bit
...
- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
2021-09-17 20:12:42 +03:00
juliancoffee
f810af4eec
Rename EntityInfo level field to health_scaling
2021-09-17 20:12:42 +03:00
Joshua Barretto
9cc70e6d22
Merge branch 'juliancoffee/capsule_prism' into 'master'
...
New CapsulePrism collider
See merge request veloren/veloren!2843
2021-09-17 11:39:57 +00:00
juliancoffee
19f0cf4ee5
Set z_min to 0 for terrain collision checks
...
This allows us have different z_min for e2e checks
2021-09-17 13:28:34 +03:00
