go to bear level fix and vibration of controller when gate is opening

can turn "gamepad_vibration" on and off in debug mode
controller vibrate when taking damage
2026-09-03 18:20:19 +03:00 · 2026-09-03 18:04:58 +03:00 · 2026-09-03 17:53:44 +03:00 · 2026-09-03 07:53:55 +03:00 · 2026-09-03 01:38:57 +03:00 · 2026-09-03 01:01:42 +03:00
481 changed files with 44538 additions and 790 deletions
@@ -0,0 +1,5 @@
+disable:
+  - class-definitions-order
+  - no-else-return
+max-line-length: 120
+max-file-lines: 3000
@@ -0,0 +1,21 @@
+# Godot 4+ specific ignores
+.godot/
+/android/
+
+# JetBrains IDE — contains absolute paths (Godot binary, SDK dirs), varies per user
+.idea/
+
+# Blender render previews (generated by render_anim_preview.py)
+Blender/preview/
+
+Blender/*.blend1
+
+# Test output (generated screenshots, frame strips)
+tests/output/
+
+# Web export output
+build/
+
+#PRISM
+BullPrism/
+
@@ -0,0 +1,15 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/.idea.Bullosseum.iml
+/projectSettingsUpdater.xml
+/contentModel.xml
+/modules.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
@@ -1,3 +0,0 @@
-# Godot 4+ specific ignores
-.godot/
-/android/
@@ -1 +0,0 @@
-
@@ -1,192 +0,0 @@
-[editor_states]
-
-2D={
-"grid_offset": Vector2(0, 0),
-"grid_snap_active": false,
-"grid_step": Vector2(8, 8),
-"grid_visibility": 1,
-"ofs": Vector2(-166, -111),
-"primary_grid_step": Vector2i(8, 8),
-"show_group_gizmos": true,
-"show_guides": true,
-"show_helpers": false,
-"show_lock_gizmos": true,
-"show_origin": true,
-"show_position_gizmos": true,
-"show_rulers": true,
-"show_transformation_gizmos": true,
-"show_viewport": true,
-"show_zoom_control": true,
-"smart_snap_active": false,
-"snap_guides": true,
-"snap_node_anchors": true,
-"snap_node_center": true,
-"snap_node_parent": true,
-"snap_node_sides": true,
-"snap_other_nodes": true,
-"snap_pixel": true,
-"snap_relative": false,
-"snap_rotation": false,
-"snap_rotation_offset": 0.0,
-"snap_rotation_step": 0.2617994,
-"snap_scale": false,
-"snap_scale_step": 0.1,
-"zoom": 1.0
-}
-3D={
-"fov": 70.01,
-"gizmos_status": {
-"AudioListener3D": 0,
-"AudioStreamPlayer3D": 0,
-"CPUParticles3D": 0,
-"CSGShape3D": 0,
-"Camera3D": 0,
-"ChainIK3D": 0,
-"CollisionObject3D": 0,
-"CollisionPolygon3D": 0,
-"CollisionShape3D": 0,
-"Decal": 0,
-"FogVolume": 0,
-"GPUParticles3D": 0,
-"GPUParticlesCollision3D": 0,
-"Joint3D": 0,
-"Light3D": 0,
-"LightmapGI": 0,
-"LightmapProbe": 0,
-"Marker3D": 0,
-"MeshInstance3DCustomAABB": 0,
-"NavigationLink3D": 0,
-"NavigationObstacle3D": 0,
-"NavigationRegion3D": 0,
-"OccluderInstance3D": 0,
-"Particles3DEmissionShape": 0,
-"Path3D": 0,
-"PhysicalBone3D": 0,
-"RayCast3D": 0,
-"ReflectionProbe": 0,
-"ShapeCast3D": 0,
-"Skeleton3D": 0,
-"SoftBody3D": 0,
-"SpringArm3D": 0,
-"SpringBoneCollision3D": 0,
-"SpringBoneSimulator3D": 0,
-"TwoBoneIK3D": 0,
-"VehicleWheel3D": 0,
-"VisibleOnScreenNotifier3D": 0,
-"VoxelGI": 0
-},
-"local_coords": false,
-"preview_sun_env": {
-"environ_ao_enabled": false,
-"environ_enabled": true,
-"environ_energy": 1.0,
-"environ_gi_enabled": false,
-"environ_glow_enabled": true,
-"environ_ground_color": Color(0.2, 0.169, 0.133, 1),
-"environ_sky_color": Color(0.385, 0.454, 0.55, 1),
-"environ_tonemap_enabled": true,
-"sun_color": Color(1, 1, 1, 1),
-"sun_enabled": true,
-"sun_energy": 1.0,
-"sun_rotation": Vector2(-1.0471976, 2.6179938),
-"sun_shadow_max_distance": 100.0
-},
-"rotate_snap": 15.0,
-"scale_snap": 10.0,
-"show_grid": true,
-"show_origin": true,
-"snap_enabled": false,
-"translate_snap": 1.0,
-"viewport_mode": 1,
-"viewports": [{
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 1.8940029,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": true,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.28619745,
-"y_rotation": -1.0759585
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}],
-"zfar": 4000.01,
-"znear": 0.05
-}
-Anim={
-"visible": false
-}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/Player/SpringArmPivot/SpringArm3D")])
@@ -1,5 +0,0 @@
-[folding]
-
-node_unfolds=[NodePath("CubeGuy/MeshInstance3D6"), PackedStringArray("Transform"), NodePath("SpringArmPivot"), PackedStringArray("Transform"), NodePath("SpringArmPivot/SpringArm3D"), PackedStringArray("Transform", "shape"), NodePath("SpringArmPivot/Camera3D"), PackedStringArray("Transform")]
-resource_unfolds=["res://Player.tscn::BoxShape3D_xhfnw", PackedStringArray(), "res://Player.tscn::BoxMesh_0rwas", PackedStringArray(), "res://Player.tscn::SphereShape3D_kne1u", PackedStringArray()]
-nodes_folded=[NodePath("CubeGuy")]
@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()
@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()
@@ -1,8 +0,0 @@
-Node3D
-CollisionShape3D
-StaticBody3D
-DirectionalLight3D
-MeshInstance3D
-Camera3D
-SpringArm3D
-CharacterBody3D
@@ -1,73 +0,0 @@
-[docks]
-
-dock_3_selected_tab_idx=0
-dock_4_selected_tab_idx=0
-dock_5_selected_tab_idx=0
-dock_floating={}
-dock_closed=[]
-dock_split_2=0
-dock_split_3=0
-dock_hsplit_1=0
-dock_hsplit_2=188
-dock_hsplit_3=-220
-dock_hsplit_4=0
-dock_9_selected_tab_idx=0
-dock_3="Scene,Import"
-dock_4="FileSystem,History"
-dock_5="Inspector,Signals,Groups"
-dock_9="Output,Debugger,Audio,Animation,Shader Editor,Search Results,AnimationTree,ResourcePreloader,ShaderFile,SpriteFrames,Theme,Polygon,TileSet,TileMap,Replication,GridMap"
-
-[docks/FileSystem]
-
-h_split_offset=240
-v_split_offset=0
-display_mode=0
-file_sort=0
-file_list_display_mode=1
-selected_paths=PackedStringArray("res://player.gd")
-uncollapsed_paths=PackedStringArray("Favorites", "res://")
-
-[docks/History]
-
-include_scene=true
-include_global=true
-
-[EditorNode]
-
-open_scenes=PackedStringArray("res://scene.tscn", "res://Player.tscn")
-current_scene="res://Player.tscn"
-bottom_panel_offsets={
-"Audio": -450,
-"Debugger": 0,
-"Output": 0
-}
-selected_default_debugger_tab_idx=0
-selected_main_editor_idx=2
-
-[EditorWindow]
-
-screen=1
-mode="windowed"
-position=Vector2i(704, 372)
-size=Vector2i(1152, 648)
-
-[ScriptEditor]
-
-open_scripts=["res://camera_follow.gd", "res://camera_spring_arm.gd", "res://player.gd"]
-selected_script="res://player.gd"
-open_help=[]
-script_split_offset=119
-list_split_offset=0
-zoom_factor=0.7142856
-
-[GameView]
-
-floating_window_rect=Rect2i(698, 329, 1164, 697)
-floating_window_screen=1
-
-[ShaderEditor]
-
-open_shaders=[]
-split_offset=200
-selected_shader=""
-text_shader_zoom_factor=1.0
@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()
@@ -1,7 +0,0 @@
-63f7b34db8d8cdea90c76aacccf841ec
-::res://::1778310075
-icon.svg::CompressedTexture2D::2763459465653565986::1778309163::1778309170::1::::<><><>0<>0<>4494804e8dca466bb905d943ffe81fc7<>res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex::
-Player.tscn::PackedScene::6006049373094375659::1778310139::0::1::::<><><>0<>0<><>::uid://bn777gguclud5::::res://player.gd<>uid://b4td4k8yo5y78::::res://spring_arm_3d.gd
-player.gd::GDScript::3366936153611682508::1778309852::0::1::::<>CharacterBody3D<><>0<>0<><>::
-spring_arm_3d.gd::GDScript::4461354842847131345::1778310075::0::1::::<>SpringArm3D<><>0<>0<><>::
-scene.tscn::PackedScene::4632770303583398249::1778310038::0::1::::<><><>0<>0<><>::uid://crtm0xtiql3r8::::res://Player.tscn
@@ -1,5 +0,0 @@
-res://Player.tscn
-res://scene.tscn
-res://spring_arm_3d.gd
-res://camera_spring_arm.gd
-res://camera_follow.gd
@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()
@@ -1,31 +0,0 @@
-[game_view]
-
-select_mode=0
-hide_selection=false
-
-[editor_metadata]
-
-executable_path="C:/Users/siim/Desktop/Godot_v4.6.2-stable_win64.exe"
-
-[dialog_bounds]
-
-create_new_node=Rect2(830, 370, 900, 700)
-project_settings=Rect2(680, 370, 1200, 700)
-
-[quick_open_dialog]
-
-last_mode=0
-
-[recent_files]
-
-scenes=["res://Player.tscn", "res://scene.tscn"]
-scripts=["res://camera_follow.gd", "res://spring_arm_3d.gd", "res://player.gd"]
-
-[linked_properties]
-
-CollisionShape3D:scale=false
-
-[script_setup]
-
-last_selected_language="GDScript"
-create_built_in_script=false
@@ -1 +0,0 @@
-res://
@@ -1,192 +0,0 @@
-[editor_states]
-
-2D={
-"grid_offset": Vector2(0, 0),
-"grid_snap_active": false,
-"grid_step": Vector2(8, 8),
-"grid_visibility": 1,
-"ofs": Vector2(-166, -111),
-"primary_grid_step": Vector2i(8, 8),
-"show_group_gizmos": true,
-"show_guides": true,
-"show_helpers": false,
-"show_lock_gizmos": true,
-"show_origin": true,
-"show_position_gizmos": true,
-"show_rulers": true,
-"show_transformation_gizmos": true,
-"show_viewport": true,
-"show_zoom_control": true,
-"smart_snap_active": false,
-"snap_guides": true,
-"snap_node_anchors": true,
-"snap_node_center": true,
-"snap_node_parent": true,
-"snap_node_sides": true,
-"snap_other_nodes": true,
-"snap_pixel": true,
-"snap_relative": false,
-"snap_rotation": false,
-"snap_rotation_offset": 0.0,
-"snap_rotation_step": 0.2617994,
-"snap_scale": false,
-"snap_scale_step": 0.1,
-"zoom": 1.0
-}
-3D={
-"fov": 70.01,
-"gizmos_status": {
-"AudioListener3D": 0,
-"AudioStreamPlayer3D": 0,
-"CPUParticles3D": 0,
-"CSGShape3D": 0,
-"Camera3D": 0,
-"ChainIK3D": 0,
-"CollisionObject3D": 0,
-"CollisionPolygon3D": 0,
-"CollisionShape3D": 0,
-"Decal": 0,
-"FogVolume": 0,
-"GPUParticles3D": 0,
-"GPUParticlesCollision3D": 0,
-"Joint3D": 0,
-"Light3D": 0,
-"LightmapGI": 0,
-"LightmapProbe": 0,
-"Marker3D": 0,
-"MeshInstance3DCustomAABB": 0,
-"NavigationLink3D": 0,
-"NavigationObstacle3D": 0,
-"NavigationRegion3D": 0,
-"OccluderInstance3D": 0,
-"Particles3DEmissionShape": 0,
-"Path3D": 0,
-"PhysicalBone3D": 0,
-"RayCast3D": 0,
-"ReflectionProbe": 0,
-"ShapeCast3D": 0,
-"Skeleton3D": 0,
-"SoftBody3D": 0,
-"SpringArm3D": 0,
-"SpringBoneCollision3D": 0,
-"SpringBoneSimulator3D": 0,
-"TwoBoneIK3D": 0,
-"VehicleWheel3D": 0,
-"VisibleOnScreenNotifier3D": 0,
-"VoxelGI": 0
-},
-"local_coords": true,
-"preview_sun_env": {
-"environ_ao_enabled": false,
-"environ_enabled": true,
-"environ_energy": 1.0,
-"environ_gi_enabled": false,
-"environ_glow_enabled": true,
-"environ_ground_color": Color(0.2, 0.169, 0.133, 1),
-"environ_sky_color": Color(0.385, 0.454, 0.55, 1),
-"environ_tonemap_enabled": true,
-"sun_color": Color(1, 1, 1, 1),
-"sun_enabled": true,
-"sun_energy": 1.0,
-"sun_rotation": Vector2(-1.0471976, 2.6179938),
-"sun_shadow_max_distance": 100.0
-},
-"rotate_snap": 15.0,
-"scale_snap": 10.0,
-"show_grid": true,
-"show_origin": true,
-"snap_enabled": false,
-"translate_snap": 1.0,
-"viewport_mode": 1,
-"viewports": [{
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 13.553807,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": true,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 2.3040223, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.404007,
-"y_rotation": -0.55235934
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}, {
-"auto_orthogonal": false,
-"auto_orthogonal_enabled": true,
-"cinematic_preview": false,
-"display_mode": 22,
-"distance": 4.0,
-"doppler": false,
-"frame_time": false,
-"gizmos": true,
-"grid": true,
-"half_res": false,
-"information": false,
-"listener": false,
-"lock_rotation": false,
-"orthogonal": false,
-"position": Vector3(0, 0, 0),
-"transform_gizmo": true,
-"use_environment": false,
-"view_type": 0,
-"x_rotation": 0.5,
-"y_rotation": -0.5
-}],
-"zfar": 4000.01,
-"znear": 0.05
-}
-Anim={
-"visible": false
-}
-selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/scene/Player")])
@@ -1,5 +0,0 @@
-[folding]
-
-node_unfolds=[NodePath("Player"), PackedStringArray("Transform"), NodePath("DirectionalLight3D"), PackedStringArray("Shadow"), NodePath("Node3D/MeshInstance3D"), PackedStringArray("Transform"), NodePath("Node3D/StaticBody3D"), PackedStringArray("Collision", "Input", "Physics Interpolation", "Process"), NodePath("Node3D/StaticBody3D/CollisionShape3D"), PackedStringArray("Transform")]
-resource_unfolds=["res://scene.tscn::BoxMesh_nxogm", PackedStringArray(), "res://scene.tscn::BoxShape3D_ulcgi", PackedStringArray()]
-nodes_folded=[NodePath("Node3D/StaticBody3D")]
@@ -1,41 +0,0 @@
-[res://player.gd]
-
-state={
-"bookmarks": PackedInt32Array(),
-"breakpoints": PackedInt32Array(),
-"column": 0,
-"folded_lines": PackedInt32Array(),
-"h_scroll_position": 0,
-"row": 0,
-"scroll_position": 0.0,
-"selection": false,
-"syntax_highlighter": "GDScript"
-}
-
-[res://camera_spring_arm.gd]
-
-state={
-"bookmarks": PackedInt32Array(),
-"breakpoints": PackedInt32Array(),
-"column": 38,
-"folded_lines": PackedInt32Array(),
-"h_scroll_position": 0,
-"row": 7,
-"scroll_position": 0.0,
-"selection": false,
-"syntax_highlighter": "GDScript"
-}
-
-[res://camera_follow.gd]
-
-state={
-"bookmarks": PackedInt32Array(),
-"breakpoints": PackedInt32Array(),
-"column": 67,
-"folded_lines": PackedInt32Array(),
-"h_scroll_position": 0,
-"row": 8,
-"scroll_position": 0.0,
-"selection": false,
-"syntax_highlighter": "GDScript"
-}
@@ -1,3 +0,0 @@
-[folding]
-
-sections_unfolded=PackedStringArray()
@@ -1 +0,0 @@
-list=[]
@@ -1,3 +0,0 @@
-source_md5="a16f2eed1b4496c4abf03d329708ba09"
-dest_md5="b48bef1f2eefdd190e0a3e60a6188d75"
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
siim	01d6ecf475	go to bear level fix and vibration of controller when gate is opening	2026-09-03 18:20:19 +03:00
siim	931ddf0eeb	can turn "gamepad_vibration" on and off in debug mode	2026-09-03 18:04:58 +03:00
siim	50073b2574	controller vibrate when taking damage	2026-09-03 17:53:44 +03:00
siim	07f8a71f2c	torches light animation	2026-09-03 07:53:55 +03:00
richard	34dc5b026e	Lobby barrel-smash reward + roll/slam barrel destruction Bull's boulder roll now homes on and ploughs through lobby barrels, and the slam shockwave bursts them within its radius. HUD tallies barrels on load and fires a confetti "WOooOoW!" + two gold bonus HP pips when the last one breaks; gates open from run state as fights are cleared. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-03 01:38:57 +03:00
richard	5c1e881a53	Combat overhaul: charge/gore, bear ram, matador taunt reactions Bull charge damage: - Tunnel-proof swept detection (prev→now segment) for matador gore and bear ram, so a 66 m/s dash no longer skips clean over the thin HitArea. - Horns-first cone (bull_gore_arc): running into an enemy only wounds it when charging roughly at it, not a sideways brush. - Dash is a committed lunge: bypasses the horns cone AND the survival roll, so a dash connect is a guaranteed kill. Cruise charges keep a speed-scaled roll (mat_charge_pierce). Roll ability defers to its own pop (is_rolling guard). Bear: - Horns-first swept ram detection (edge-triggered: one charge = one wound); a tunnelling or point-blank charge now lands where body_entered wouldn't. - Overhead smash lane extends faster (0.1s) and further (20 m). - Leap slam launches the bull from anywhere in the circle (ring_frac 0). - Removed stray-quote syntax errors that broke the script. Matador: - Collider-driven stab (BladeHitbox) with recovery beat + taunt-after-hit so it stops machine-gunning the bull. - A taunting matador answers a charge: spear from range, sword up close. Spear projectile masks the BULL layer so throws connect. Tests: matador_charge/stab/spear/taunt_react, bear_ram/hitbox/fx (+ unified _fake_bull stand-in). Trimmed verbose comments. Note: bear claw-emitter/death work is still WIP (3 bear_boss_test failures). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-09-03 01:01:42 +03:00
siim	4efc6763f0	lobby little tweak	2026-09-01 21:34:02 +03:00
siim	76d4fee33c	Lobby level gates trigger areas	2026-09-01 21:22:16 +03:00
siim	271be0b26b	+ torches	2026-09-01 08:58:56 +03:00
siim	98c6f1285a	underground_lobby	2026-08-31 21:52:13 +03:00
siim	4d66df8c7e	bear long range slam. and not rotating while attacking animore. but dash and movement damage not working now	2026-08-29 09:30:03 +03:00
siim	41f18cb5d6	bear fx v2	2026-08-28 21:43:59 +03:00
siim	6b6a926715	bear_fx	2026-08-28 20:23:13 +03:00
siim	dae7ec06da	barrel materials	2026-08-28 19:43:09 +03:00
siim	1eb06876e9	breakable barrels	2026-08-28 19:02:19 +03:00
richard	1021a07b04	Put dead matadors on a corpse collision layer A killed matador's ragdoll shared the WORLD layer with the bull, so the bull collided with the bodies and spazzed out on them. Give corpses a dedicated CORPSE layer masked to itself, and tag the ground/walls with CORPSE too (at level load, so it also reaches colliders baked into the instanced GLB arenas). The corpse still rests on the arena, but the bull — which only masks WORLD — passes straight through the bodies. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-08-27 23:27:10 +03:00
richard	c365f76d80	Merge remote-tracking branch 'origin/main'	2026-08-27 21:34:23 +03:00
richard	32ac46f840	lobby cam	2026-08-27 21:34:18 +03:00
siim	bd10d1789b	bear max hp 30	2026-08-27 21:30:48 +03:00
siim	170d8ff3f1	siim timmimised väiksed	2026-08-27 21:15:36 +03:00
siim	550bf2c5ad	adjustable wave size with debug parameter "mat_wave_size"	2026-08-27 20:36:00 +03:00
siim	02f3e283de	landing. don't bounce!	2026-08-27 08:30:03 +03:00
siim	9123574947	crowd billbord placement + mat sword run fix	2026-08-26 22:32:30 +03:00
siim	aadf59d2d0	lobby collisions	2026-08-26 21:09:41 +03:00
richard	d57c3dc2a2	Merge remote-tracking branch 'origin/main'	2026-08-26 20:38:14 +03:00
richard	09ae6bfbf4	lobby level	2026-08-26 20:38:07 +03:00
richard	40c1b8e680	debug param save works, bull/bear hitbox	2026-08-26 20:37:50 +03:00
siim	a1c77fed5e	Update debug_params.gd	2026-08-26 20:02:23 +03:00
siim	1a8af92d88	matador attack fix	2026-08-26 19:53:43 +03:00
siim	8166a6c18e	Merge branch 'main' of https://git.richard.work/siim/Bullosseum	2026-08-26 19:41:35 +03:00
siim	46d6dda325	capsule	2026-08-26 19:41:23 +03:00
richard	fc9348551d	fix sword holster	2026-08-26 19:18:52 +03:00
richard	c4a19c7443	crowd markers, unsheathed sword correct	2026-08-26 19:13:39 +03:00
siim	95c4c0ddf9	BEAR ARENA UPDATE	2026-08-26 19:12:27 +03:00
siim	6a4f104655	bear arena model updeit	2026-08-26 18:30:09 +03:00
siim	d4b67888d7	controller zoom with right stick	2026-08-26 18:12:12 +03:00
siim	b177e0aee3	matadors dont come inside the player anymore with sword attack. also got rid of matador.gd dublicate.. that i made for testing animation	2026-08-26 08:39:40 +03:00
siim	2a6f4c0f7b	bear_FX	2026-08-25 21:58:43 +03:00
siim	32d0c58f5c	bear_ Call method track testing with spears	2026-08-25 08:49:44 +03:00
siim	251002ea7c	bull and bear flashing red when take damage	2026-08-25 08:04:39 +03:00
siim	986496097f	arena cleanup	2026-08-24 18:45:03 +03:00
siim	d976deeb6a	arena cleanup+tex modification	2026-08-24 18:41:34 +03:00
siim	d632670092	+death animation bear	2026-08-24 08:36:48 +03:00
siim	e1899e49f4	level lobby	2026-08-23 23:40:28 +03:00
siim	6f5f9e6bba	ps1 filter tuun	2026-08-23 22:26:58 +03:00
siim	91cd027a98	adj	2026-08-23 22:05:57 +03:00
siim	ef2fb24969	cooldowns increase	2026-08-23 21:39:19 +03:00
siim	4c75776c70	debug_param_cooldown adjusts	2026-08-23 21:28:19 +03:00
siim	7688084b7e	spear update	2026-08-23 21:15:25 +03:00
richard	ccc92f201f	mobile support tweaks	2026-08-23 20:32:52 +03:00
richard	008650a87e	Merge remote-tracking branch 'origin/main'	2026-08-23 17:34:05 +03:00
richard	b9e3147519	Bear, level selector (to be removed), new matador spawn, new bear level, saving config updates source files	2026-08-23 17:33:47 +03:00
richard	cdba320cbc	bear	2026-08-23 17:33:32 +03:00
richard	ee7b1617c1	Bear, level selector (to be removed), new matador spawn, new bear level, saving config updates source files	2026-08-23 17:33:15 +03:00
richard	d749485126	Map screen version	2026-08-23 13:16:04 +03:00
richard	45427b7070	Merge remote-tracking branch 'origin/main'	2026-08-23 12:37:35 +03:00
richard	d514435dd8	touch controls and hud	2026-08-23 12:37:30 +03:00
siim	3eb9fa50f3	+bear boss	2026-08-23 11:18:45 +03:00
siim	aee900c009	bear boss, aga broken	2026-08-21 18:23:30 +03:00
siim	4cf714f516	Update spear.glb	2026-08-17 23:49:29 +03:00
siim	b78736a1f4	icon update	2026-08-10 04:43:48 +03:00
siim	212263c858	credits tuun	2026-08-10 03:53:17 +03:00
siim	8c4eeb0861	cooldowns?	2026-08-10 03:30:53 +03:00
siim	95def2d527	loading text + fullscreen default	2026-08-10 01:04:57 +03:00
siim	9a43a9ff8b	icon	2026-08-09 23:58:01 +03:00
siim	7238cbf49e	death anim speed .8	2026-08-09 23:19:23 +03:00
siim	44c667f097	collision scale	2026-08-09 23:15:43 +03:00
siim	3cd347d420	walk anim, death anim ja loading screen	2026-08-09 23:05:55 +03:00
richard	6414b2e7cc	uids	2026-08-09 19:40:39 +03:00
richard	56593c58cf	Release 0.2.0: device-aware controls, spear, settings, shaders Show touch controls only on touch platforms and keyboard hints only on desktop, via a shared Controls.use_touch_ui() gate (is_touchscreen_available is unreliable with emulate_touch_from_mouse). Bumps version to 0.2.0. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-08-09 19:39:37 +03:00
richard	ce6f3d7075	Deployment script update	2026-08-09 15:26:01 +03:00
siim	a74182255b	light tim	2026-08-08 11:47:36 +03:00
siim	ebf5046461	credits	2026-07-30 20:21:10 +03:00
richard	271de1b045	ps1 filter variables, crowds	2026-07-30 15:12:22 +03:00
richard	3defc9da95	UI theme	2026-07-30 13:52:50 +03:00
richard	ff75dacfb6	New screens, new hud, new intro menu, some UI element changes	2026-07-30 13:52:39 +03:00
richard	bf7a454ad0	Win, lose screen. Game version info. Matador a lot more aggressive/wins easier (tweaks needed). No more score/combo/waves	2026-07-30 12:39:51 +03:00
richard	ebb6ec6335	Bull roll ability, console screen, tests	2026-07-28 23:10:38 +03:00
siim	a0b248748c	hud ja camera change	2026-07-24 15:16:21 +03:00
siim	5ef5889979	siim push	2026-07-24 14:51:57 +03:00
siim	2e9d62b964	bull uptade	2026-07-24 10:02:56 +03:00
richard	622830a6ee	Hide controls by default	2026-07-22 23:00:45 +03:00
richard	603a674e08	menu interactive, refactor, perf tests, charge bar, debug menu stuff	2026-07-22 22:57:02 +03:00
siim	631df017d1	seq uptate	2026-07-22 22:25:14 +03:00
siim	2c0142d208	+ intro sequence	2026-07-22 22:00:22 +03:00
richard	c283eb0927	Menu, options with changeable controls, fade transition, placeholder background	2026-07-22 19:45:49 +03:00
siim	d379b215e2	intro test	2026-07-21 23:36:41 +03:00
siim	cd73a21ab7	intro menu alustasin	2026-07-20 22:40:50 +03:00
richard	6a67bfea36	better ragdoll, launch ragdolls on slam weee	2026-06-25 00:17:12 +03:00
richard	b929ed2a7a	cooldowns, sword holstering, ability colors	2026-06-25 00:10:40 +03:00
richard	708a35d51f	return of the bull	2026-06-24 23:13:14 +03:00
richard	115872b98f	sword holster, health	2026-06-24 23:11:19 +03:00
siim	64124990a6	+Sword	2026-06-20 10:58:35 +03:00
siim	037bfad700	matador	2026-06-20 10:53:21 +03:00
siim	661b4e470b	gdignore	2026-06-16 18:30:05 +03:00
siim	b564cd5a71	sword keset platsi	2026-06-14 23:13:52 +03:00
siim	7b5fcb1d1e	+sword	2026-06-14 23:09:18 +03:00
siim	45e69101b6	gamepad buttons	2026-06-11 20:51:59 +03:00
siim	a9810c8c9f	dash	2026-06-10 22:50:07 +03:00
richard	ba20cd8580	remove bounce after slam	2026-06-10 22:42:12 +03:00
richard	aac0099faa	Merge remote-tracking branch 'origin/main'	2026-06-10 22:36:53 +03:00
richard	4fc64dedae	dash speed 3x, slam visual/damage fix	2026-06-10 22:36:47 +03:00
siim	7423665c06	dash*3	2026-06-10 22:07:11 +03:00
richard	09c39e068b	Ability refinement, more and more matadors spawn after clears	2026-06-10 21:53:57 +03:00
richard	c1852e8736	abilities first draft	2026-06-10 19:39:35 +03:00
richard	dda9862589	fix bad references	2026-06-10 19:23:34 +03:00
richard	d538679697	Merge remote-tracking branch 'origin/main'	2026-06-10 19:07:35 +03:00
siim	e668895c12	bull anim	2026-06-10 18:56:17 +03:00
siim	064f07ace7	hud_pics	2026-06-10 01:23:20 +03:00
siim	9d0799083c	dof update	2026-06-08 03:05:11 +03:00
siim	2bea615307	DOF test	2026-06-08 02:50:04 +03:00
siim	a61f4c4689	koristasin selle lehvitaja ära	2026-06-07 19:48:33 +03:00
richard	f6355605cd	smarter AI	2026-06-07 17:30:58 +03:00
siim	033d26ee18	blend1 test	2026-06-07 16:58:52 +03:00
richard	d3315836c3	delete autosaves	2026-06-07 16:56:20 +03:00
richard	3279645ac4	gitignore remove blender autosave	2026-06-07 16:55:50 +03:00
richard	371a2fded0	remove blender autosaves from git history	2026-06-07 16:54:15 +03:00
richard	49a9bced4b	matador animationingng	2026-06-07 16:47:18 +03:00
siim	f0d932eac3	testing	2026-06-06 12:08:56 +03:00
siim	ca1a0ce581	-	2026-06-04 01:12:09 +03:00
siim	5ad4f64474	matador	2026-06-04 00:10:13 +03:00
siim	48cac53fc6	Merge branch 'main' of https://git.richard.work/siim/Bullosseum	2026-06-04 00:07:22 +03:00
siim	5c489318a9	blender files	2026-06-04 00:07:15 +03:00
richard	1f24a750fb	sounds, deploy	2026-05-29 16:41:16 +03:00
richard	33ec51625c	scanlines, sounds, bumper walls, score keep, control legend, timer	2026-05-29 16:37:26 +03:00
richard	2e2b70e030	web deployment, fix stuff so works on linux too (cached non commited stuff)	2026-05-28 22:08:17 +03:00
siim	04597cdc01	publik speed offset	2026-05-26 08:42:18 +03:00
siim	c407513cbd	more publik	2026-05-26 01:23:49 +03:00
siim	ea065e4d81	added publikum	2026-05-26 01:20:19 +03:00
siim	0e654ec0b6	publik_anim	2026-05-25 22:32:01 +03:00
siim	df27e9d807	controller inputs	2026-05-25 21:49:34 +03:00
richard	866cc12c2c	When charging with both buttons, see red	2026-05-25 21:08:43 +03:00
richard	d98a5ba0ac	Hit effect	2026-05-25 20:56:08 +03:00
richard	6abf5355c2	tests & can charge up thrust	2026-05-25 20:51:48 +03:00
richard	bfb026c7ae	giitignore	2026-05-25 20:51:02 +03:00
richard	245ce31eab	missing ps1 gdshader	2026-05-25 20:42:24 +03:00
richard	b30fb6e0a6	hold right+left, it charges ahead	2026-05-25 20:38:38 +03:00
richard	950d93ed0e	PS1 filter	2026-05-25 20:36:39 +03:00
richard	85b9c86164	isometric cam	2026-05-25 20:22:43 +03:00
richard	174b14fa61	R to reset matador	2026-05-25 20:10:16 +03:00
richard	30136a9b90	bull legs not clipped, arena not scaled	2026-05-25 19:39:02 +03:00
richard	80a35a4553	Merge remote-tracking branch 'origin/main' # Conflicts: # Blender/matador_v02.blend	2026-05-25 18:37:54 +03:00
richard	98d579f733	tail wag works	2026-05-25 18:37:42 +03:00
siim	f19e6980cd	Merge branch 'main' of https://git.richard.work/siim/Bullosseum	2026-05-20 21:16:42 +03:00
siim	ab270ac04f	mat blend	2026-05-20 21:16:35 +03:00
richard	22ed4f7722	missing files	2026-05-20 21:16:17 +03:00
richard	af0790a1ce	matadors moving, thrusty bull, slop	2026-05-20 21:07:09 +03:00
siim	a8b9f166a6	matador_fbx	2026-05-20 20:43:50 +03:00
siim	de5b5f3b7c	blender matador	2026-05-20 20:33:31 +03:00
siim	13b027d91c	matatod_mudeling	2026-05-20 00:17:49 +03:00
siim	d6fe527906	+ blenderfiles	2026-05-19 23:36:31 +03:00
richard	6549240337	bouncy bull	2026-05-15 22:10:58 +03:00
richard	fe5d143047	Debug menu F1 (use ctrl to lock cam). Design.md doc	2026-05-10 18:40:14 +03:00
siim	dc40057fe1	ragdoll skeleton	2026-05-10 17:32:56 +03:00
siim	cb3a54c1cc	Merge branch 'main' of https://git.richard.work/siim/Bullosseum	2026-05-10 17:15:17 +03:00
siim	34b3866a5e	nimi ja dash	2026-05-10 17:15:11 +03:00
richard	4f1126563c	dust particles for hooves	2026-05-10 17:01:18 +03:00
richard	c587b9877f	charge shiftiga, suure hooga ei peatu kohe, loomad ei keera snappily	2026-05-09 23:07:02 +03:00
richard	a809ed6cc4	pull liigub õiges suunas	2026-05-09 21:52:11 +03:00
siim	9675ae884d	lisasin pulli ja areeni	2026-05-09 18:09:23 +03:00
richard	a318e65e70	local config xmls	2026-05-09 17:56:43 +03:00
richard	8b3a816203	Restructure	2026-05-09 17:55:47 +03:00
richard	4e7bc29507	vibe code and restructure	2026-05-09 17:55:07 +03:00