Skip to content
Snippets Groups Projects
Commit 0d3c1cc0 authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/153-find-an-alternative-to-collision-shapes-for-object-picking-2' into main

# Conflicts:
#	source/arviz_godot/project/root.tscn
parents e0cc815a e796e842
Branches 142-crash-when-object-xml-file-does-not-exist
No related tags found
1 merge request!78Resolve "Find an alternative to collision shapes for object picking"
......@@ -154,6 +154,8 @@ avi_camera_playful={
[physics]
common/enable_pause_aware_picking=true
3d/physics_engine="GodotPhysics"
3d/active_soft_world=false
[rendering]
......
[gd_scene load_steps=69 format=2]
[gd_scene load_steps=71 format=2]
[ext_resource path="res://bin/app/main.gdns" type="Script" id=1]
[ext_resource path="res://bin/gui/user_interface.gdns" type="Script" id=2]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment