Commit Graph

2870 Commits

Author SHA1 Message Date
Glence 270cab64e2 raccoon new tag 2023-03-25 17:28:42 +08:00
maverickdgg 2d9b7f3a5d Merge branch 'main' into Navigation 2023-03-25 17:20:49 +08:00
maverickdgg 4a149508c9 Level 3 generated 2023-03-25 17:20:42 +08:00
Glence ce24a1efb0 player caught bug fix 2023-03-25 17:20:35 +08:00
XiaoQiDigipen 4f84736599
Merge pull request #444 from SHADE-DP/Navigation
Added Attack animation, Fix Edge case for path finding. Added footsteps. Level 2 merge
2023-03-25 16:54:30 +08:00
maverickdgg 75f38f4e36 Merge branch 'main' into Navigation 2023-03-25 16:52:34 +08:00
maverickdgg 485d8cc38b AI Level 2 merge 2023-03-25 16:52:26 +08:00
XiaoQiDigipen 3affd446f3
Merge pull request #443 from SHADE-DP/ShaderCompilerMigrate
Removed shader compiler to external executable
2023-03-25 16:52:02 +08:00
Xiao Qi 47a78de609 Added dependencies pull for shader compiler 2023-03-25 16:41:49 +08:00
maverickdgg 749cedfae2 Merge branch 'main' into Navigation 2023-03-25 16:13:03 +08:00
maverickdgg c1544b0b51 Merge branch 'main' into Navigation 2023-03-25 16:12:42 +08:00
XiaoQiDigipen cd04a93df9
Merge pull request #442 from SHADE-DP/PlayerController
Bug fixes
2023-03-25 16:11:55 +08:00
Glence 429674c16e Merge branch 'main' into PlayerController 2023-03-25 16:10:01 +08:00
Glence 9b6a0d112e remove density 2023-03-25 16:09:40 +08:00
maverickdgg 291c9d044e Added footsteps. Fix path forward to not get stuck as much 2023-03-25 16:09:20 +08:00
Xiao Qi f21f235980 Moved out all native shader compiler code
Replaced call to internal classes with system calls to external executable
2023-03-25 15:58:06 +08:00
XiaoQiDigipen a40c59872c
Merge pull request #441 from SHADE-DP/SP3-6-c-scripting
Fixed issues where scripts cannot be loaded if another instance of the engine is using it
2023-03-25 15:52:51 +08:00
Glence 82fd4e2149 dont ask me 2023-03-25 15:52:22 +08:00
Kah Wei 52d27ae6bd Fixed issues where scripts cannot be loaded if another instance of the engine is using it 2023-03-25 14:59:42 +08:00
maverickdgg 47f195e998 HomeOwner attack and animations 2023-03-25 14:51:28 +08:00
maverickdgg ab4493822a Fix edge case of starting node being a wall 2023-03-25 10:52:50 +08:00
XiaoQiDigipen c28e874626
Merge pull request #440 from SHADE-DP/PlayerController
Scene changes and bug fixes
2023-03-25 02:44:16 +08:00
Glence 98d9683995 dont ask me 2023-03-25 02:38:56 +08:00
Glence 4f44435823 Merge branch 'main' into PlayerController 2023-03-25 00:17:10 +08:00
Glence 6ce807b878 added upwards force on jumpPad 2023-03-24 21:28:33 +08:00
Glence 33ba73c298 particle bug fix 2023-03-24 20:58:22 +08:00
Glence ff6a49e0a7 dont ask me 2023-03-24 20:30:01 +08:00
XiaoQiDigipen 0b5f602a0e
Merge pull request #439 from SHADE-DP/Navigation
Saved Navigation Data as Asset and load on scene load
2023-03-24 18:05:55 +08:00
maverickdgg af77bd4812 Saved Nav Data 2023-03-24 18:04:44 +08:00
maverickdgg 38d3040a04 Merge remote-tracking branch 'origin/NavData' into Navigation 2023-03-24 16:47:09 +08:00
maverickdgg 2382f11628 Merge branch 'main' into Navigation 2023-03-24 16:34:22 +08:00
maverickdgg 86593fd602 Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation 2023-03-24 16:34:14 +08:00
maverickdgg 4f7d1850af Added editor window for generating nav data 2023-03-24 16:33:45 +08:00
XiaoQiDigipen 346f2b2fac
Merge pull request #438 from SHADE-DP/Navigation
Added Navigation System. Added basic AI FSM
2023-03-24 16:11:13 +08:00
XiaoQiDigipen 0892322049
Merge branch 'main' into Navigation 2023-03-24 16:10:58 +08:00
XiaoQiDigipen 6d1b793831
Merge pull request #437 from SHADE-DP/PlayerController
Added particle and bug fixes
2023-03-24 16:09:43 +08:00
maverickdgg 78d30cb051 fix rotation 2023-03-24 16:06:35 +08:00
maverickdgg b32dba0694 basic FSM 2023-03-24 13:26:18 +08:00
maverickdgg 9dd180c1e6 Fix for when end point is unreachable. Find closest reachable point 2023-03-24 07:41:05 +08:00
maverickdgg a785a972e4 Navigation Fix 2023-03-24 04:22:51 +08:00
Glence 01cbba1f1f added item score multiplier 2023-03-23 18:20:42 +08:00
Glence 64bbc4d67a scenes update, setActive message removed, expose Emitcount 2023-03-23 16:49:41 +08:00
Glence 5cd0de1960 Merge branch 'main' into PlayerController 2023-03-23 00:38:31 +08:00
Glence 6ddc5c35cb did left and right foot smoke 2023-03-23 00:38:25 +08:00
maverickdgg 267793e3cc Merge branch 'main' into Navigation 2023-03-22 23:27:32 +08:00
maverickdgg 38d7e49976 WIP 2023-03-22 23:27:30 +08:00
Brandon Mak f4d361e1e9 Particle bug fix and raccoon dust particle fix 2023-03-22 22:52:43 +08:00
XiaoQiDigipen 744e66eeb6
Merge pull request #436 from SHADE-DP/SP3-2-Physics
Fixed consistency of Trajectories with different time steps
2023-03-22 22:33:23 +08:00
Diren D Bharwani 2737113a84 forces are cleared after first iteration 2023-03-22 22:25:11 +08:00
Diren D Bharwani e02e3f5faf silly mistake 2023-03-22 22:21:39 +08:00