Commit Graph

44 Commits

Author SHA1 Message Date
LukTeg
6a6fd73292 Merged in main 2023-12-01 19:34:48 -05:00
LukTeg
af138d9110 minor refactoring 2023-12-01 19:22:59 -05:00
LukTeg
1a0227ff28 Enemy flings only horizontal and passenger has running ai
The enemy now can fling all types of actors so long as they can be cast to a character (player and passenger). Also, it flings to the side by a random degrees to prevent the enemy from "dribbling the player like a basketball"(moves forward, flings forward, moves forward, etc). The passenger blueprint has been made(will most likely need to be merged with whatever other one is on the main branch.) The passenger has a 25% of running in a circle, 25% of picking a random direction to face and then run in, and 50% of standing in utter panic.
2023-11-21 21:45:38 -05:00
LukTeg
2a13ba9adb The passenger blueprint now exists and runs in a circle 2023-11-20 20:02:40 -05:00
LukTeg
bf717f3942 Added proper AI and throwing player back on contact 2023-11-14 22:24:58 -05:00
f1d729c7e3 Removed timer error when unplaying game by null checking 2023-11-13 19:05:24 -05:00
Austin Szema
1f08736dfd Organized files into proper folders 2023-11-10 23:35:04 -05:00
Austin Szema
143f01ab92 Auto stash before merge of "main" and "origin/main" 2023-11-10 23:25:11 -05:00
Austin Szema
dddff015be Merge branch 'main' of https://git.nugamestudioclub.com/aszema/jumping-ship 2023-11-10 23:24:23 -05:00
Austin Szema
5799cecd53 Fixing merge errors 2023-11-10 23:23:09 -05:00
82a5093509 Merge remote-tracking branch 'origin/main' into main 2023-11-10 23:21:06 -05:00
cea63354f1 Added the grabbing and throwing functionality 2023-11-10 23:19:47 -05:00
Austin Szema
5ebccf8700 Added baby model and Passenger tag to track when a passenger is saved 2023-11-10 22:54:48 -05:00
LukTeg
5ce49be574 Changed ai-detection from seeing to a fixed distance to player 2023-11-08 13:25:50 -05:00
LukTeg
c682a8821e Created Basic Enemy with AI and detection radius 2023-11-08 09:01:58 -05:00
LukTeg
41ca11d26a Trying to fix enemy movement bug 2023-11-06 19:05:45 -05:00
a778d15702 Added a basic rescue boat with counter 2023-10-30 20:04:44 -04:00
striandafellos
e58c62457a minor NPC spawning tweak 2023-10-30 19:37:29 -04:00
striandafellos
ed4fd719e1 re-added civilian class 2023-10-30 19:36:14 -04:00
striandafellos
451433e9f8 Merge remote-tracking branch 'origin/main' into main 2023-10-30 19:24:56 -04:00
striandafellos
3381c4333e misc lfs updates 2023-10-30 19:24:06 -04:00
striandafellos
4b148e8946 Abstracted spawner blueprint 2023-10-30 19:21:55 -04:00
12583fc0fc Fixed Iceberg revert 2023-10-30 18:59:49 -04:00
0fc4b4b6bd Revert "Revert "Added simple iceberg blueprint""
This reverts commit 42f1f3d7d338bfefb9e758f0392491988ff8afa8.
2023-10-30 18:59:49 -04:00
e4b3f1d03d Revert "Added simple iceberg blueprint"
This reverts commit 7ef34cba0474ff9c0d7a04b266d12cd73e2b4b96.
2023-10-30 18:59:43 -04:00
98758acc4c Added simple iceberg blueprint 2023-10-30 18:59:36 -04:00
Joel Bernardes
5704ce68c0 Merge remote-tracking branch 'origin/main' into main 2023-10-30 18:47:28 -04:00
striandafellos
b50f265b10 Fixed AI movement
Fixed navmesh on Austin test map and fixed enemy spawner blueprint recursively calling itself infinitely
2023-10-27 20:09:07 -04:00
striandafellos
dd9d13a727 Added Movement to Civilian BP Class
now randomly moves on its own given a nav mesh boundary volume
2023-10-23 20:03:16 -04:00
43b3200dfb Added iceberg terrain to AustinTestScene 2023-10-16 20:01:15 -04:00
LukTeg
3b250c5dd0 Made Movement Componenet and got collision act to move 2023-10-16 19:59:56 -04:00
Joel Bernardes
43c3257b27 Merge remote-tracking branch 'origin/main' into main 2023-10-16 19:35:59 -04:00
36e11b4aae Updated water texture, added cruise ship, and updated AustinTestScene 2023-10-16 18:33:07 -04:00
8cbd83ee3b Added water plane to AustinTestMap and reorganized folders 2023-10-16 17:08:57 -04:00
4ca4f020dc Added Starter Content
added starter content to the project for easier prototyping and materials
2023-10-16 17:02:19 -04:00
Joel Bernardes
d9915f01c9 Added tossing mechanic as well as tinkered with layout
Now when you press left click you are able to pick up and carry an object (need to work on physics so that you cant send an object to the moon by flicking quick and letting go of left click)
2023-10-13 19:56:32 -04:00
bef2e20fb8 Set timer minimum
Timer now stops at 00:00. Still breaks when character is despawned though.
2023-10-13 00:29:03 -04:00
e4ae965dcf Added testing scene and a timer
Added testing map for myself and a timer for the player. Timer is very basic and breaks when player despawns (and probably keeps counting after 0:00).
2023-10-11 23:47:05 -04:00
49bdd62caa Add a test scene for myself with an enemy spawner tester 2023-10-09 19:58:21 -04:00
623dfee897 Added boat material and textures
Forgot to save until I closed Unreal, pushing to fix that
2023-10-07 18:57:32 -04:00
260321303d Added basic boat model
Added a basic boat model to the ThirdPersonMap level
2023-10-07 18:53:04 -04:00
128f80fec9 Added the Unreal Project to the repo
Adding a Third Person Unreal Template project to the repo
2023-10-06 22:17:05 -04:00
f54ac7af2a Added git attributes
:)
2023-09-25 19:07:05 -04:00
692a5bde59 Initial commit 2023-09-26 00:42:17 +02:00