Commit Graph

142 Commits

Author SHA1 Message Date
Franklin
3b3346ff3e Successfully imported a rigid body from blender, now I have to link the rigidbody and the collider, as it is currently detached 2023-11-16 21:32:15 -04:00
Franklin
25206af09b Can't find rigidbody for some reason 2023-11-16 18:32:17 -04:00
94c9d4aae2 blender changes 2023-11-16 13:26:46 -08:00
d34b52e33f added cylinder invisible with character from blender 2023-11-16 13:24:54 -08:00
ca0987bbe3 Fixed bevy_blender plugin not adding some components when something is spawned before it 2023-11-16 13:02:46 -08:00
Franklin
e7aed2f974 AAA 2023-11-16 16:05:32 -04:00
52e5fe7692 Blender to bevy work, proxies 2023-11-16 11:47:13 -08:00
bb681decf5 Added gltf asset load, plugin call for bevy_blender and GlftAssetType 2023-11-16 09:27:15 -08:00
50539f2ac9 added character 2023-11-16 09:13:11 -08:00
2378552aeb changed rapier dep from local to external 2023-11-16 08:11:53 -08:00
Franklin
6c243e5f4d Inventory UI & system combined. Dropping works, pickup works, work on UI 2023-11-15 12:20:01 -04:00
Franklin
8c30ba6d9f Fixed firearm frozen bug 2023-11-15 11:07:02 -04:00
Franklin
9538f73075 Dropping weapons with G. Updates on inventory and slots 2023-11-15 10:49:34 -04:00
Franklin
a81b2f340e Cargo fmt 2023-11-15 08:01:25 -04:00
Franklin
b79bf00227 Inventory screen and project organization 2023-11-15 08:01:14 -04:00
Franklin
494e99a548 Removed not needed system and added impulse force to dropped guns 2023-11-14 16:22:54 -04:00
Franklin
c55bb81fd7 Cargo fmt, readme update and removed warnings 2023-11-13 13:57:24 -04:00
Franklin
affacae0a0 Centered interact clue text, still needs work, but is much better. 2023-11-13 13:53:30 -04:00
Franklin
45f412c7c0 Compiles and doesn't crash on startup, changed some Boxes to Arcs and added a PickupItemEvent 2023-11-12 18:51:35 -04:00
Franklin
aa7eb521b8 Cargo fmt 2023-11-12 17:24:28 -04:00
Franklin
865070ed90 Fixed guns reloading all animation players when reload anim is triggered on the same gun 2023-11-12 16:38:23 -04:00
Franklin
01bd24bf19 Removed warnings 2023-11-12 14:37:11 -04:00
Franklin
61f33357a4 Integrated trait objects and made modular spawn points 2023-11-12 14:36:37 -04:00
Franklin
8afa56d306 Interactable hud bug fixes 2023-11-12 11:05:37 -04:00
Franklin
bc90efbbc4 Mild refactor 2023-11-12 00:51:15 -04:00
Franklin
cdf1d573cf Work on interaction system, re enabled weapon switching and noticed that Meshes are down to the bone, meaning creating a hitreg system will be relatively easy later on. Focus on the inventory definition, honestly I would just go for static primary, secondary, body armor and helmet inventory spaces. Later, add backpacks with the tetris system you just created. For the moment make everything pickupable 2023-11-12 00:43:54 -04:00
Franklin
7685caf99f Interactable clue UI and trigger plus interaction on key press F 2023-11-11 21:26:49 -04:00
Franklin
ac119eb60a Interactable system completed 2023-11-11 19:45:32 -04:00
Franklin
3f95e2cd5a Inventory backend 2023-11-11 19:03:11 -04:00
Franklin
26d03de52e Removed warnings 2023-11-11 14:04:09 -04:00
Franklin
8c7450d03f Could not find out how to fix bug where stopped collider would not work as precisely as started collision event 2023-11-11 14:03:22 -04:00
Franklin
4e8bddfade Perfect bullet going through colliders system now. 2023-11-11 13:00:55 -04:00
901c30154b bullet 2023-11-09 13:00:01 -08:00
Franklin
1193797a1e comments 2023-11-09 09:42:01 -04:00
Franklin
a98d3b8955 Adjusted firearm firing point forward on the m4 2023-11-09 00:10:13 -04:00
Franklin
47764f63a1 Fixed firearm y_rot glitch. Now firing point is where it should be 2023-11-09 00:06:11 -04:00
a64e646e78 Firearm shooting with a line almost perfect. Only need to change the m4 rotation values as it's rotated -90 on y axis. Apply inverse rotation on all transforms that shoot. And TODO: uncomment muzzle flash light code 2023-11-08 16:39:02 -08:00
0c3ab5d8ad continue in mac 2023-11-08 13:24:17 -08:00
65c555aa03 Fixed player spawning without firearm bug 2023-11-08 13:17:45 -08:00
ab230a95f1 Added resources to reflect derive macro 2023-11-08 12:29:07 -08:00
b5a2d76b58 made light a bit more bright 2023-11-08 10:48:05 -08:00
Franklin
22a8c91c5e Added muzzle flash light 2023-11-08 14:45:04 -04:00
Franklin
373f18cef2 Back to editor_pls 2023-11-08 13:36:17 -04:00
Franklin
866e8c5ff5 Solved gun firing on resume button click 2023-11-08 13:22:36 -04:00
Franklin
adb9cdbe83 Fps color change 2023-11-08 13:12:56 -04:00
Franklin
f5d92d89f2 Aaaaand... Back to inspector 2023-11-08 13:11:14 -04:00
Franklin
28765e173a Debug rect 2023-11-08 11:36:04 -04:00
Franklin
86909e8bcb Added debug information with names and reflect types so that everything can be identified and changed in the editor gui 2023-11-08 10:54:22 -04:00
Franklin
2683d75462 Tried to use egui::dock but ended up just using a manual egui 2023-11-08 00:11:12 -04:00
Franklin
83bc4f1073 Removed unneccessary braces 2023-11-07 21:08:35 -04:00