SHADE_Y3

Commit Graph

Select branches

Hide Pull Requests

AIFinalFixesGAM300M3

AIFixes

AudioImpl

AudioImplementation

AudioScripting

BackTo5.0

CleanAndGenerate

CleanUpPremake

ControllerImplementation

DisableDllWarnings

Fix-AwakeLater

Fix-BatchPersistence

Fix-Material

Fix-NoGPUClarity

Fix-RemoveDocGen

Fix-RenderableDeleteCrash

Fix-ResourceHubCrashOnExit

Fix-SetMesh

FontIntegration

HandleDebugging

Hotfix-1.4

MTtoMD

Model-Loader-Update

NavData

Navigation

PhySH

PlayerController

PlayerController-FoodPlacementForLevel2and3

PlayerControllerWIthNewPhysics

PointCloudRenderer

PreAlphaFixes

Prefabs

PremakeCopyFix

Presentation

ProjectWarningDisables

Rename-ResourceManager

Rendering-Camera-Integration

RenderingEditorVPIntegration

SP3-1-BuiltInMesh

SP3-1-DebugDraw

SP3-1-DebugLabels

SP3-1-MaterialEditSupport

SP3-1-MaterialUpdate

SP3-1-RenderOnlyActive

SP3-1-Rendering

SP3-1-SerialisedRenderable

SP3-10-input-management

SP3-12-SceneGraph

SP3-129-AudioSystem

SP3-13-Assets-Manager

SP3-13-ResourceManager

SP3-14-FileSystem

SP3-141-Camera-System

SP3-15-Tools

SP3-16-Math

SP3-17-anim-sys-refactor

SP3-17-animation-system

SP3-17-animation-viewer

SP3-18-Events

SP3-19-frame-rate-controller

SP3-2-Physics

SP3-20-UI-System

SP3-22-AnimationController

SP3-22-aianimation-controller

SP3-305-configurations

SP3-305-configurationsMerge

SP3-4-Editor

SP3-5-ECS

SP3-6-CSharpStaticReset

SP3-6-c-scripting

SP3-8-serialization

ScriptingAI

SetWorkingDirectory

UI-Bug-Fix

UI-Test

UI_Integration

UseSharedOutInterDirs

deque

main

revert-316-SHPhysics

scenetransitions

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#273

#274

#275

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#29

#291

#293

#294

#295

#296

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#329

#33

#330

#331

#332

#334

#335

#336

#337

#338

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#46

#47

#48

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#94

#95

#96

#97

#98

#99

v1.0

v1.1

v1.2

v1.4

v1.4.1-Hotfix

v1.6

v1.7

v1.7.1

v1.7.2

3f334da934 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-02 03:09:25 +0800
0dba60f9f1 Small fix Brandon Mak 2022-10-02 03:09:09 +0800
45514ac77e Fixed warnings and errors Kah Wei 2022-10-02 03:06:13 +0800
39302bc7f1

Merge pull request #79 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-10-02 02:47:47 +0800
4771fbfb76 WIP Brandon Mak 2022-10-02 02:28:50 +0800
e5df98aaa6 Added missing move assignment and extra check for command buffer destructor Kah Wei 2022-10-02 01:59:56 +0800
cfa07e9b3b Temp fix for SceneGraph crash Kah Wei 2022-10-02 01:58:24 +0800
d432822608 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-02 01:13:43 +0800
9fabb7d672 Window can close properly (with the exception of scene graph dtor crash) Brandon Mak 2022-10-02 01:13:04 +0800
8a6ef1fc2d Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering Sri Sham Haran 2022-10-02 01:01:50 +0800
9e8b4414d1 add window close callback Sri Sham Haran 2022-10-02 01:00:07 +0800
201ce17a40 Fixed validation errors when closing the app Kah Wei 2022-10-02 00:56:12 +0800
64d1c2ab2e Minimize is now working Brandon Mak 2022-10-02 00:47:26 +0800
40bcea133d Changed texture index to 0 for both racoons Xiao Qi 2022-10-02 00:09:38 +0800
32a3cc0674 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering Brandon Mak 2022-10-02 00:00:07 +0800
d273c24410

Merge pull request #81 from SHADE-DP/SP3-13-Assets-Manager XiaoQiDigipen 2022-10-01 23:57:19 +0800
61e353164b Fixed all asset related warnings Xiao Qi 2022-10-01 23:57:26 +0800
0f13476c08 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering Brandon Mak 2022-10-01 23:57:13 +0800
e2b86545bb Window resize working Brandon Mak 2022-10-01 23:57:08 +0800
77653ebde5 add window isMinimized Sri Sham Haran 2022-10-01 23:56:45 +0800
18a74ffd45

Merge pull request #80 from SHADE-DP/SP3-14-FileSystem XiaoQiDigipen 2022-10-01 23:44:22 +0800
01f648ceb6 Serialize/Deserialize [WIP] Sri Sham Haran 2022-10-01 23:43:00 +0800
8e60d4b771 Changed asserts to SHLOG related functions Xiao Qi 2022-10-01 23:42:54 +0800
6fd1cadf01 Merge branch 'main' into SP3-8-serialization Sri Sham Haran 2022-10-01 23:41:55 +0800
1a14e5241b Added names for SHGraphicsSystem Routines Kah Wei 2022-10-01 23:14:42 +0800
15c39d7028 Removed mixed tabs and spaces Kah Wei 2022-10-01 22:58:19 +0800
5e07383cf1 Merge branch 'main' into SP3-6-c-scripting Kah Wei 2022-10-01 22:56:33 +0800
f717b61c88 Added undo and redo support for script changes in the inspector Kah Wei 2022-10-01 22:56:15 +0800
c1006821f3

Merge pull request #78 from SHADE-DP/SP3-2-Physics XiaoQiDigipen 2022-10-01 22:17:23 +0800
4007120dbd Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-10-01 22:06:50 +0800
3a9a1d878a

Merge pull request #77 from SHADE-DP/SP3-129-AudioSystem XiaoQiDigipen 2022-10-01 21:38:45 +0800
e906039af8

Merge pull request #76 from SHADE-DP/SP3-4-editor_fix XiaoQiDigipen 2022-10-01 21:38:15 +0800
8a3a08986b fix audiosystem warnings Glence 2022-10-01 21:29:40 +0800
1a725c24e2 Stored renderpass attachement information in SHVkRenderpass Brandon Mak 2022-10-01 21:25:22 +0800
9913e5a68b Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-10-01 21:19:07 +0800
c5efefcf4f Editor warning fixes Sri Sham Haran 2022-10-01 21:18:54 +0800
e4a6877ed3 Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-10-01 20:43:18 +0800
1477aaaead Merge branch 'SP3-6-c-scripting' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-6-c-scripting Kah Wei 2022-10-01 20:34:45 +0800
b3d15b6a39 Added WIP UndoRedoStack Kah Wei 2022-10-01 20:34:23 +0800
48413bdc1f

Merge pull request #75 from SHADE-DP/ProjectWarningDisables XiaoQiDigipen 2022-10-01 19:44:17 +0800
f95f28a750

Merge pull request #74 from SHADE-DP/SP3-10-input-management XiaoQiDigipen 2022-10-01 19:43:45 +0800
a6e17847bf Warning disables Remove SDL hint that gave warning (it was unnecessary anyway) ProjectWarningDisables Sri Sham Haran 2022-10-01 18:58:13 +0800
3c58a538ae Mouse Vel & UpdateInput called from SBApplication mushgunAX 2022-10-01 18:02:27 +0800
aef3e4ef1a Update SBApplication.cpp mushgunAX 2022-10-01 17:04:07 +0800
857f88c4a8 Merge branch 'main' into SP3-10-input-management mushgunAX 2022-10-01 17:03:58 +0800
374f1a961d Integrated rigidbodies into physics system Diren D Bharwani 2022-10-01 16:50:50 +0800
5aee22a5e3 Revert "Changed some couts and asserts to use SHLOG" maverickdgg 2022-10-01 16:37:47 +0800
b657ad8884 Handled resizing for the render graph resource (not tested) Brandon Mak 2022-10-01 16:33:16 +0800
4f56a32a9b Added physics system (untested) Diren D Bharwani 2022-10-01 15:26:08 +0800
f2b27b35fc

Merge pull request #73 from SHADE-DP/SP3-129-AudioSystem XiaoQiDigipen 2022-10-01 15:13:42 +0800
0c78eca1bc added audiosystem back in added a button for the audio Glence 2022-10-01 15:09:26 +0800
ec2ec82163 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-01 15:00:01 +0800
8ad315193d

Merge pull request #72 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-10-01 14:55:31 +0800
b3b565454f Merge branch 'main' into SP3-6-c-scripting Kah Wei 2022-10-01 14:50:46 +0800
0360a8bfa1 made the Input Manager NOT be a System anymore mushgunAX 2022-10-01 14:34:30 +0800
78d13c0ab8 Changed some couts and asserts to use SHLOG maverickdgg 2022-10-01 14:28:13 +0800
dc8d58d95c fix GetMouseWindowPosition() mushgunAX 2022-10-01 13:49:11 +0800
af24ed78dc Fixed MSIL warning when building scripts Kah Wei 2022-10-01 13:43:34 +0800
a011e9a795

Merge pull request #71 from SHADE-DP/SP3-13-Assets-Manager XiaoQiDigipen 2022-10-01 13:39:33 +0800
0792979dff Moved some comments Xiao Qi 2022-10-01 13:31:08 +0800
adbb77932c Merge branch 'main' into SP3-13-Assets-Manager Xiao Qi 2022-10-01 13:29:51 +0800
c82d01631c SP3-237 Texture load/compile successfully Xiao Qi 2022-10-01 13:27:51 +0800
5069a42319 SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1 Xiao Qi 2022-10-01 13:12:37 +0800
e956797441 Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-10-01 01:13:13 +0800
8a3d3c8d4e SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED Xiao Qi 2022-09-30 22:08:17 +0800
e046dafced

Merge pull request #70 from SHADE-DP/SP3-5-ECS XiaoQiDigipen 2022-09-30 20:36:02 +0800
cbf4a1f5fd Merge branch 'main' into SP3-5-ECS maverickdgg 2022-09-30 20:35:12 +0800
e4be5e0987 Added event manager include maverickdgg 2022-09-30 20:34:46 +0800
4647a94aa3

Merge pull request #68 from SHADE-DP/SP3-5-ECS XiaoQiDigipen 2022-09-30 20:27:44 +0800
2d07fb0afc Added component added and removed events maverickdgg 2022-09-30 20:25:26 +0800
9930b002c6

Merge pull request #67 from SHADE-DP/SHFamilyID-BugFix maverickdgg 2022-09-30 20:15:03 +0800
114ae86a9f Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene maverickdgg 2022-09-30 20:13:18 +0800
584b7e425f WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary Xiao Qi 2022-09-30 08:57:25 +0800
00695950d9 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-09-29 10:59:18 +0800
a51cbb7e70 Merge branch 'main' into SP3-13-Assets-Manager Xiao Qi 2022-09-29 10:55:49 +0800
b1a799cf05 Attempt using dllimport/dllexport maverickdgg 2022-09-29 07:59:04 +0800
a9ff693646

Merge pull request #66 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-09-29 00:11:51 +0800
70559204bf Added spinning raccoons and fixed TRansform component bug Kah Wei 2022-09-28 23:55:44 +0800
566c12a922 Merge branch 'main' into SP3-6-c-scripting Kah Wei 2022-09-28 23:27:48 +0800
0e07960938 Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-09-28 21:30:57 +0800
561f2b091f Added PhysicsObject to handle interface between components and physics system Diren D Bharwani 2022-09-28 21:09:27 +0800
c963f1d978

Merge pull request #65 from SHADE-DP/SP3-1-Rendering XiaoQiDigipen 2022-09-28 20:42:03 +0800
363e09bd55 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-09-28 20:39:42 +0800
78f216e445 Rendered multiple racoons Brandon Mak 2022-09-28 20:33:29 +0800
238ed1665c

Merge pull request #64 from SHADE-DP/SP3-4-editor_fix XiaoQiDigipen 2022-09-28 19:53:02 +0800
371f8e5e6f Add simple profiler Sri Sham Haran 2022-09-28 19:45:40 +0800
10f5817c15 Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-09-28 19:01:18 +0800
9909cfaa96

Merge pull request #63 from SHADE-DP/SP3-129-AudioSystem XiaoQiDigipen 2022-09-28 18:56:08 +0800
551853084b Merge branch 'main' into SP3-129-AudioSystem Glence 2022-09-28 18:54:21 +0800
a96ef67ec4 change engine premake to copy fmod lib over Glence 2022-09-28 18:53:53 +0800
9a774508a8

Merge pull request #62 from SHADE-DP/SP3-129-AudioSystem XiaoQiDigipen 2022-09-28 18:42:29 +0800
f83b40c96c added fmod to dependencies.bat Glence 2022-09-28 18:40:45 +0800
a1775db60b Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-09-28 18:36:44 +0800
02ec5d88e8 Add remaining controls to component view Sri Sham Haran 2022-09-28 18:36:22 +0800
fa6175256f

Merge pull request #61 from SHADE-DP/SP3-129-AudioSystem XiaoQiDigipen 2022-09-28 18:36:13 +0800
219aaa1707 Split texture loader into 2 paths for dds and shtexture format. Xiao Qi 2022-09-28 18:35:59 +0800
201b19e8a6 SP3-237 Renamed MeshWriter to MeshCompiler Implemented texture compiler Xiao Qi 2022-09-28 18:35:22 +0800
5f4c81aeed comment out audiosystem from application to prevent accidents Glence 2022-09-28 18:22:53 +0800
e71941cccf removing not needed buttons Glence 2022-09-28 18:12:01 +0800
43ad883bdb removing unnecessary creation of cpmponent Glence 2022-09-28 18:08:49 +0800