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

Mono Color

• c23da81f68 Merge branch 'main' into SP3-141-Camera-System maverickdgg 2022-10-19 23:57:16 +0800
• 4f177bc455 Reworked script serialization and deserialization functions (WIP) Kah Wei 2022-10-19 20:43:22 +0800
• 6051b7ded5 Tfm gizmo wip Sri Sham Haran 2022-10-19 20:42:38 +0800
• 51eba31ad4 Added animation asset class Xiao Qi 2022-10-19 18:38:11 +0800
• 125ce7b564 Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-10-19 17:43:22 +0800
• 71502daac3 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-19 17:23:31 +0800
• a7e8320008 Copy/Paste Entities Sri Sham Haran 2022-10-19 17:23:25 +0800
• a21fc2ba11
  Merge pull request #100 from SHADE-DP/SP3-1-Rendering XiaoQiDigipen 2022-10-19 17:08:42 +0800
• 603470eeb6 Fixed some camera resizing issues Brandon Mak 2022-10-19 17:06:37 +0800
• b499d5fc55 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-19 16:59:50 +0800
• 49b32d1992
  Merge pull request #99 from SHADE-DP/CameraIntegration XiaoQiDigipen 2022-10-19 16:59:11 +0800
• 212e1e7c1f Merge remote-tracking branch 'origin/main' into CameraIntegration Brandon Mak 2022-10-19 16:54:24 +0800
• d9136de134 Integrated Daniel's camera Brandon Mak 2022-10-19 16:53:45 +0800
• 2dcf367bc5
  Merge pull request #98 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-10-19 16:08:38 +0800
• a3c4c347bb Added Time class for C# Kah Wei 2022-10-19 16:06:26 +0800
• 284ee12205 Broken Camera Brandon Mak 2022-10-19 15:32:07 +0800
• 95310b99bd Merge branch 'RenderingEditorVPIntegration' into SP3-1-Rendering Brandon Mak 2022-10-19 12:27:05 +0800
• efe8ba4f11 Added some editor camera controls maverickdgg 2022-10-19 10:32:52 +0800
• db78e2c973
  Merge pull request #97 from SHADE-DP/SP3-6-RangeAttribute XiaoQiDigipen 2022-10-19 10:26:38 +0800
• 8325b7e2be base class for deque deque Glence 2022-10-19 10:17:34 +0800
• 896d399a54 Merge branch 'main' into SP3-6-RangeAttribute Kah Wei 2022-10-19 10:13:15 +0800
• 7df24e7a66 Fixed RangeAttribute not working correctly Kah Wei 2022-10-19 10:12:56 +0800
• 33b173ab9e Merge branch 'main' into SP3-141-Camera-System maverickdgg 2022-10-19 09:57:52 +0800
• 5bd5cec9d4 Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-10-19 09:49:10 +0800
• 7e3ca4c45f
  Merge pull request #96 from SHADE-DP/SP3-8-serialization XiaoQiDigipen 2022-10-19 08:48:18 +0800
• 3a3f7efb29 [WIP] Transform Gizmo Sri Sham Haran 2022-10-19 01:31:48 +0800
• 96f5b29418 Serialization/Deserialization Sri Sham Haran 2022-10-19 01:03:32 +0800
• 2f429f33f8 Merge branch 'main' into SP3-8-serialization Sri Sham Haran 2022-10-19 00:26:14 +0800
• 0e6893840b Merge remote-tracking branch 'origin/SP3-8-serialization' into SP3-8-serialization Sri Sham Haran 2022-10-19 00:17:03 +0800
• ceb4c6c4ca Added Range Attribute Kah Wei 2022-10-18 22:34:46 +0800
• 2623952d47
  Merge pull request #95 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-10-18 20:13:30 +0800
• 5727bf3905 Merge branch 'main' into SP3-6-c-scripting Kah Wei 2022-10-18 20:10:06 +0800
• 87cf3ffa61 Added script inspector tooltips support via Tooltip attribute Kah Wei 2022-10-18 20:09:50 +0800
• b18d1f66ae Merge branch 'main' into SP3-8-serialization Sri Sham Haran 2022-10-18 19:50:20 +0800
• 82637b620d
  Delete UserLayout.ini Sri Sham Haran 2022-10-18 19:36:49 +0800
• 0a6f777c07
  Merge pull request #94 from SHADE-DP/RenderingEditorVPIntegration XiaoQiDigipen 2022-10-18 19:20:08 +0800
• da99a5559e Merge branch 'main' into RenderingEditorVPIntegration RenderingEditorVPIntegration Sri Sham Haran 2022-10-18 19:09:08 +0800
• 15a17deaf0 select picked entity in hierarchy panel Sri Sham Haran 2022-10-18 19:08:31 +0800
• 9ce5a4a47b Mouse picking system now uses cursor returned from editor Brandon Mak 2022-10-18 17:41:14 +0800
• a221cfc1cd Modified SHScriptEngine's serialization functions to take in EntityID instead of SHEntity Kah Wei 2022-10-18 17:25:45 +0800
• 033ba48304 Editor changes to support viewport integration Brandon Mak 2022-10-18 15:04:25 +0800
• e76bc6ef58 World render graph now doesn't render to swapchain image. Brandon Mak 2022-10-18 02:41:27 +0800
• 7b7533420e WIP Brandon Mak 2022-10-18 01:12:03 +0800
• ec6772657f Hierarchy QOL Sri Sham Haran 2022-10-17 21:25:59 +0800
• 17b71393f3 Restructured abit Brandon Mak 2022-10-17 16:50:53 +0800
• 86f4125100
  Merge pull request #92 from SHADE-DP/SP3-13-Assets-Manager XiaoQiDigipen 2022-10-17 15:05:14 +0800
• 013bb71325 Functions to retrieve mesh and texture data Xiao Qi 2022-10-17 15:04:38 +0800
• 161d33280a
  Merge pull request #91 from SHADE-DP/SP3-13-Assets-Manager XiaoQiDigipen 2022-10-16 23:16:55 +0800
• b10f490e45 SP3-102 SP3-248 Saving of SHMETA files with asset IDs, retrieval of asset data under works, currently all assets are loaded into memory automatically Xiao Qi 2022-10-16 23:15:11 +0800
• 95ee4b7b55 Resize half working Brandon Mak 2022-10-16 19:42:44 +0800
• a481970e5f Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-10-16 19:16:02 +0800
• 7fc417e35a Parent/child multiple entities (WIP) Sri Sham Haran 2022-10-16 18:16:05 +0800
• c16bea2d39 WIP Brandon Mak 2022-10-16 17:35:15 +0800
• 1117ecc5ef WIP Brandon Mak 2022-10-16 17:31:53 +0800
• bda38049ea
  Merge pull request #90 from SHADE-DP/SP3-1-Rendering XiaoQiDigipen 2022-10-16 16:38:30 +0800
• 0a042f3a3f
  Merge pull request #89 from SHADE-DP/SP3-6-c-scripting XiaoQiDigipen 2022-10-16 16:38:20 +0800
• 0d02ece4c1 Wrote handle resize for mouse picking objects Brandon Mak 2022-10-16 16:28:29 +0800
• 7f2935dcf6 add window pos change for editor windows add git ignore for user ini Sri Sham Haran 2022-10-16 15:36:14 +0800
• 2830dad8e3 Fixed Kai Wei's issues (sampler move ctor never move device :D) Brandon Mak 2022-10-16 15:35:32 +0800
• 228868604a Editor fixes Integration of mouse pick Add editor state Add editor layout Sri Sham Haran 2022-10-16 14:20:35 +0800
• 808274fce0 Lots of changes Brandon Mak 2022-10-16 14:16:14 +0800
• 3b3492843f Added input class Kah Wei 2022-10-16 03:25:33 +0800
• 7005f4d839 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-16 00:26:53 +0800
• daa4b74c17 Merge branch 'main' into SP3-2-Physics Diren D Bharwani 2022-10-14 17:05:14 +0800
• a7ed10c0b4 Merge branch 'main' into SP3-8-serialization Sri Sham Haran 2022-10-14 16:05:53 +0800
• c257842156
  Merge pull request #88 from SHADE-DP/SP3-4-editor_fix XiaoQiDigipen 2022-10-14 15:58:43 +0800
• 22cad78728 Clean up Sri Sham Haran 2022-10-14 15:53:29 +0800
• 20cedbb4ec Merge branch 'main' into SP3-4-editor_fix Sri Sham Haran 2022-10-14 15:53:12 +0800
• 49575893fe Made Editor a system and create editor routine so that the editor routine will run between graphics routines Sri Sham Haran 2022-10-14 15:39:43 +0800
• e027318d22 Inspector View - Collider Component Sri Sham Haran 2022-10-14 14:35:09 +0800
• 2ed2e04f83
  Merge pull request #87 from SHADE-DP/SP3-1-Rendering XiaoQiDigipen 2022-10-14 12:19:56 +0800
• d6101c936e Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-14 11:53:06 +0800
• faa55847cb Mouse picking is working from rendering side Brandon Mak 2022-10-14 11:52:15 +0800
• ec99a6f0f9
  Merge pull request #86 from SHADE-DP/SP3-10-input-management XiaoQiDigipen 2022-10-14 01:54:20 +0800
• 682a5a6cbf bug fix Brandon Mak 2022-10-14 00:10:56 +0800
• d265aa4541 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-14 00:10:45 +0800
• ab09d78e42 removed routines for graphics from application (remember to add back after ingui update routine is added). Scene graph and physics system had some extra couts input system bug fix (this change is now in main) Mouse pick system wip Brandon Mak 2022-10-14 00:08:14 +0800
• 288f58c978 fixed timing of memcpy of keys to keysLast mushgunAX 2022-10-13 23:03:30 +0800
• 1321a0ba36 Merge remote-tracking branch 'origin/main' into SP3-2-Physics Diren D Bharwani 2022-10-13 20:23:11 +0800
• 28ec02afee
  Merge pull request #85 from SHADE-DP/SP3-2-Physics XiaoQiDigipen 2022-10-13 18:32:25 +0800
• 3b60cee764
  Merge pull request #84 from SHADE-DP/SP3-16-Math XiaoQiDigipen 2022-10-13 18:21:26 +0800
• acd3174c39 Merge branch 'SP3-16-Math' into SP3-2-Physics Diren D Bharwani 2022-10-13 18:15:52 +0800
• e1fb92e3f1 Adding Bounding Spheres Diren D Bharwani 2022-10-13 17:32:53 +0800
• 9aaacbf5ea Merge branch 'main' into SP3-8-serialization Sri Sham Haran 2022-10-13 17:05:23 +0800
• 0a3d211f02 Added a render target to store entity ID Brandon Mak 2022-10-13 16:57:08 +0800
• b153ccd1e3 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering Brandon Mak 2022-10-13 13:44:34 +0800
• 381217a1b8 Added Colour Diren D Bharwani 2022-10-13 03:03:21 +0800
• d95dbd5ce6 Reworked Bounding Boxes Diren D Bharwani 2022-10-12 21:59:34 +0800
• 2fa71f0fd9 Added Ray Diren D Bharwani 2022-10-12 19:12:34 +0800
• 5b4838c5b9 Merge branch 'main' into SP3-16-Math Diren D Bharwani 2022-10-11 02:26:50 +0800
• ff9b504bc5 Moved collider interface into physics object. Added support for removing rigidbodies Diren D Bharwani 2022-10-11 01:26:12 +0800
• e68ef89c00 synced rigidbodies through physics object Diren D Bharwani 2022-10-10 21:21:20 +0800
• 46a082b62e Moved rigidbody creation into physics object Diren D Bharwani 2022-10-10 21:13:14 +0800
• 7c4a9ca004 Added conversions for shade math to reactphysics math Diren D Bharwani 2022-10-10 18:07:21 +0800
• 877507284e Merge branch 'main' into SP3-2-Physics Diren D Bharwani 2022-10-10 13:47:33 +0800
• 3ebf42fc1a
  Merge pull request #83 from SHADE-DP/SP3-4-editor_fix XiaoQiDigipen 2022-10-02 11:01:33 +0800
• db0b61d16f Reflect RB Enumeration Add RB to inspector view Sri Sham Haran 2022-10-02 10:56:13 +0800
• 0e518c52a9 Fixed bug when SceneGraph is destroyed Diren D Bharwani 2022-10-02 04:22:32 +0800
• 45d526c0e0 Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph Diren D Bharwani 2022-10-02 04:13:38 +0800
• 530db8b7d6
  Merge pull request #82 from SHADE-DP/SP3-1-Rendering XiaoQiDigipen 2022-10-02 03:12:35 +0800