Commit Graph

Select branches

Hide Pull Requests

1309

1353

985

AMFUniquePtrs

AddEntitySerializeTests

CDClientWork

EmosewaMC-patch-1

EmosewaMC-patch-2

EmosewaMC-patch-3

EmosewaMC-patch-4

EmosewaMC-patch-5

EmosewaMC-patch-6

EmosewaMC-patch-7

EmosewaMC-patch-8

EmosewaMC-patch-9

FallSpeedBehavior

Fix-exploding-script

I-love-players

MM12-Testing-branch

Xiphoseer-patch-1

ZoneInstanceManager

aggregate-initializers

automation

behaviorparameter-memory-savings

better-bitstream-tools

buffs

can-i-rebase

cdc-fixes

cdcinstanceremoval

cdclient-2

cdclient-rework

cdclient-work-2-the-electric-boogalo

change_ldf_to_lnv

chat-http-api

chat-race-conditions

chatpacketwhowhere

chore--make-quickbuild-component-be-derived-from-activity

chore--remove-json

chore-rename-zonecontrol-to-minigamecontrol

clang-formatter-settings

cleanup

comp-serialization-fixes

component-order

components-wheeeee

crashFix

crash_fix

dCinema

dest

dpGrid_speedup

em-clean

enemyNPC

ez-mem-fix

feat--drangmaw

feat--medusa

feat--select-skill-GM-handling

feat-rewardcodes

feature/chat-client

feature/k8s

fix--remove-the-wacrimes-from-our-docker-config

fix-ag-navmesh

fix-crash

fix-crashff

fix-dismantling-models-from-vault

fix-issue

fix-jittering

fix-leaderboard-idempotency

fix-properties-visited

fix-racing

fix-racing-imagination

fixDestComp

fix_gravity

fix_mechs_for_real

fix_slow_chat_stuff

fixllog

fmtlib-experiment

for-you-max

friction-volume-script

grim-lu

guild_temp

hi-aron

imagine-the-nerves

issue-1027

issue-1066

issue-1208

issue-436

issue-960

item-component

jetpack-use-fly-bool

ldf-key-fixes

lto-testing

magic-enum-demo

main

masterSecurity

md5-out-of-common

millisecond

moreMovementAi

movementAiPathing

movementAiPorting

movingPlatformWork

mysql-replacement

naming-of-models

navmesh

navmesh_update

nejlika

nm_scripts

npc-pathing

observable

perfImprovement

persistentId-for-ugc-cars-and-rocket

petTesting

physicsSimplification

player-stuff

poc-gm-impl

property-entrance-rewrite

property_behavior_saving

racing-update

rebuild-issue

remove-multiple-script-syntax-ffffffffff

remove-special-case

save_data

saving-fixes

script-stuff

scripting-lua

serversidefriend-limit

slash-command-refactor

something

speed

spooder-fix-thanks-darwin

switch_behavior

teamdata

testf

tinyxml2docnews

ts_queue

ugc

update-comp-103-definition

use-npc-paths

vanity-reload-and-spawners

vbsd

vendor-update

visual-debugger

wbl-generic-and-rc-citizen

you-think-id-say-it-in-the-branch-name

#10

#1002

#1003

#1004

#1006

#1008

#1010

#1011

#1012

#1012

#1014

#1015

#1017

#1018

#1019

#1020

#1022

#1023

#1025

#1026

#1031

#1032

#1034

#1035

#1036

#1037

#1038

#1039

#1040

#1041

#1042

#1043

#1044

#1047

#1049

#1050

#1051

#1052

#1053

#1054

#1056

#1059

#1060

#1061

#1062

#1063

#1064

#1065

#1067

#1068

#1069

#1070

#1071

#1073

#1074

#1075

#1076

#1077

#1078

#1079

#1081

#1082

#1083

#1084

#1085

#1087

#1088

#1090

#1091

#1095

#1096

#1098

#1099

#11

#1101

#1103

#1104

#1105

#1106

#1107

#1109

#111

#1110

#1110

#1112

#1115

#1116

#1117

#1118

#1120

#1121

#1122

#1123

#1125

#1126

#1130

#1132

#1133

#1140

#1141

#1142

#1143

#1145

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1159

#116

#1160

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#117

#1170

#1171

#1172

#1174

#1176

#1177

#1178

#1180

#1181

#1182

#1183

#1184

#1185

#1187

#1188

#1196

#1198

#1199

#1201

#1202

#1203

#1204

#1205

#1206

#1207

#1209

#1210

#1211

#1212

#1213

#1215

#1216

#1217

#1219

#1221

#1224

#1225

#1226

#1227

#1228

#1229

#1231

#1232

#1233

#1234

#1235

#1236

#1237

#1238

#1240

#1242

#1243

#1245

#1246

#1246

#1247

#1248

#1250

#1251

#1252

#1253

#1254

#1255

#1265

#1266

#1267

#1268

#1269

#1270

#1272

#1273

#1274

#1275

#1276

#1278

#1279

#1287

#1288

#1291

#1292

#1293

#1294

#1294

#1295

#1296

#1298

#1299

#13

#130

#1300

#1302

#1303

#1304

#1305

#1305

#1306

#1307

#1308

#1311

#1312

#1313

#1314

#1315

#1316

#1317

#1319

#132

#1320

#1321

#1323

#1325

#1326

#1327

#1328

#1329

#133

#1330

#1331

#1333

#1336

#1337

#1338

#134

#1340

#1341

#1343

#1344

#1345

#1346

#1347

#1348

#1349

#1351

#1354

#1355

#1357

#1358

#1359

#136

#1361

#1363

#1364

#1365

#1366

#1367

#1368

#1370

#1371

#1372

#1373

#1374

#1375

#1376

#1377

#1378

#1378

#1379

#138

#1380

#1381

#1382

#1383

#1384

#1385

#1386

#1387

#1388

#1389

#1390

#1391

#1394

#1395

#1396

#1397

#1398

#1399

#14

#1400

#1401

#1402

#1403

#1404

#1405

#1406

#1406

#1407

#1408

#1409

#1410

#1412

#1413

#1414

#1415

#1416

#1417

#1418

#1419

#1420

#1421

#1421

#1422

#1423

#1424

#1425

#1427

#1429

#1430

#1431

#1432

#1433

#1434

#1435

#1436

#1437

#1438

#1439

#1439

#1440

#1442

#1443

#1444

#1445

#1446

#1447

#1449

#1450

#1451

#1452

#1452

#1453

#1454

#1455

#1456

#1457

#1458

#1459

#1460

#1461

#1462

#1463

#1464

#1465

#1466

#1467

#1468

#1469

#147

#1471

#1472

#1473

#1474

#1475

#1476

#1477

#1478

#1479

#1480

#1481

#1482

#1483

#1484

#1485

#1486

#1487

#1488

#1489

#149

#1490

#1491

#1492

#1494

#1495

#1496

#1497

#1499

#15

#150

#1500

#1501

#1502

#1503

#1504

#1505

#1506

#1506

#1507

#1508

#1509

#151

#1510

#1512

#1513

#1514

#1516

#1518

#1520

#1521

#1523

#1524

#1527

#1528

#1529

#1530

#1532

#1534

#1535

#1536

#1537

#1538

#1539

#1540

#1541

#1544

#1545

#1547

#1548

#1548

#1549

#1550

#1550

#1551

#1552

#1553

#1555

#1556

#1558

#1559

#1560

#1561

#1562

#1564

#1567

#1569

#1570

#1571

#1572

#1573

#1574

#1575

#1576

#1577

#1578

#1579

#1580

#1581

#1582

#1583

#1584

#1586

#1587

#1588

#1590

#1591

#1592

#1594

#1595

#1596

#1597

#1598

#1599

#1599

#1600

#1601

#1602

#1603

#1604

#1605

#1606

#1606

#1607

#1607

#1608

#1610

#1611

#1611

#1613

#1614

#1615

#1615

#1616

#1617

#1617

#1619

#1620

#1621

#1623

#1623

#1626

#1626

#1631

#1633

#1633

#17

#170

#171

#176

#177

#180

#187

#189

#2

#200

#203

#205

#209

#213

#216

#217

#222

#226

#228

#231

#233

#236

#239

#242

#248

#251

#254

#258

#266

#272

#273

#276

#282

#283

#284

#288

#289

#290

#291

#293

#294

#299

#3

#304

#306

#309

#311

#313

#314

#325

#329

#330

#331

#332

#334

#338

#339

#34

#340

#343

#344

#345

#346

#347

#348

#352

#353

#354

#356

#357

#358

#359

#36

#365

#366

#367

#368

#370

#372

#375

#378

#379

#38

#380

#381

#383

#385

#386

#387

#388

#391

#392

#393

#396

#397

#400

#402

#405

#406

#407

#409

#410

#411

#413

#414

#415

#416

#419

#421

#428

#43

#431

#432

#433

#435

#437

#44

#441

#442

#443

#444

#445

#447

#449

#451

#452

#453

#455

#456

#457

#458

#460

#461

#474

#475

#476

#478

#479

#48

#480

#481

#483

#484

#485

#487

#488

#490

#492

#493

#495

#496

#497

#498

#499

#503

#504

#505

#506

#506

#507

#508

#509

#51

#510

#513

#516

#518

#519

#520

#521

#522

#524

#525

#528

#531

#533

#534

#541

#544

#549

#551

#552

#553

#554

#557

#558

#559

#562

#563

#567

#568

#573

#574

#576

#577

#578

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#590

#591

#592

#593

#594

#597

#599

#6

#600

#604

#605

#606

#609

#614

#615

#617

#618

#619

#620

#621

#623

#623

#624

#625

#626

#627

#628

#629

#630

#634

#635

#640

#641

#642

#643

#645

#646

#647

#648

#649

#650

#651

#652

#653

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#667

#668

#670

#671

#672

#673

#674

#675

#677

#679

#68

#680

#681

#682

#683

#684

#685

#686

#688

#689

#690

#692

#694

#695

#696

#697

#699

#700

#701

#702

#703

#708

#709

#711

#712

#713

#714

#717

#718

#719

#720

#722

#724

#725

#726

#729

#730

#732

#733

#735

#736

#737

#738

#739

#740

#744

#748

#749

#750

#751

#752

#754

#755

#76

#761

#765

#766

#767

#768

#769

#770

#779

#782

#783

#784

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#799

#8

#800

#801

#802

#804

#806

#808

#809

#81

#811

#812

#813

#814

#816

#817

#818

#819

#820

#821

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#834

#837

#838

#840

#841

#842

#843

#844

#845

#846

#848

#85

#850

#851

#852

#853

#854

#855

#856

#857

#858

#860

#861

#862

#863

#864

#865

#867

#868

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#883

#885

#886

#887

#888

#889

#890

#891

#892

#893

#894

#895

#897

#898

#899

#90

#900

#901

#904

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#919

#920

#921

#922

#923

#924

#925

#926

#927

#929

#930

#931

#932

#933

#934

#935

#936

#937

#938

#940

#941

#942

#944

#945

#946

#948

#949

#950

#951

#952

#953

#954

#958

#959

#961

#962

#963

#969

#970

#976

#977

#979

#986

#987

#989

#990

#991

#992

#995

#996

#997

#998

v1.0

v2.0.0

v2.1.0

v2.2.0

v2.3.0

Mono Color

• 5ba13212af
  Merge 71642a24bf into 94b9731a2b #1615 David Markowitz 2024-08-20 17:54:10 +0200
• 7169700d8a
  Merge 40aa925a56 into 94b9731a2b #1617 Tiernan 2024-08-18 17:24:51 +0200
• ec83082f1a
  Merge 9ddb2b5f2e into 94b9731a2b #1548 Daniel Seiler 2024-08-13 09:36:49 -0500
• af64b1eb69
  Merge 214626222c into 94b9731a2b #1550 Aaron Kimbrell 2024-08-13 09:36:49 -0500
• 5d69f6e4d2
  Merge 78425aacb1 into 94b9731a2b #1599 Wincent Holm 2024-08-13 09:36:49 -0500
• 2ec2eb75cf
  Merge 00bba3d6d5 into 94b9731a2b #1606 David Markowitz 2024-08-13 09:36:49 -0500
• 10ab637749
  Merge bf58cf85cc into 94b9731a2b #1611 Aaron Kimbrell 2024-08-13 09:36:49 -0500
• 2aadef1031
  Merge 6818a178fd into 94b9731a2b #1623 David Markowitz 2024-08-13 09:36:49 -0500
• baf39e4118
  Merge 692fcfbe81 into 94b9731a2b #1633 David Markowitz 2024-08-13 01:18:01 -0700
• 692fcfbe81 Update WorldServer.cpp #1633 fixllog David Markowitz 2024-08-13 01:17:31 -0700
• 698e760b51
  Merge 64c510fb70 into 94b9731a2b #1626 David Markowitz 2024-08-11 23:01:09 -0400
• 94b9731a2b
  Use the correct bit field for checking whether or not to decrement progress (#1631) main David Markowitz 2024-08-11 10:26:25 -0700
• 52f7557039 Use the correct bit field for checking whether or not to decrement progress #1631 David Markowitz 2024-08-11 00:12:26 -0700
• aaf446fe6e
  feat: Add Inventory Brick and Model groups (#1587) David Markowitz 2024-08-01 23:38:21 -0700
• 64c510fb70 fix ag navmesh near burtton #1626 navmesh David Markowitz 2024-07-22 20:12:47 -0700
• 2c70f1503c
  Merge pull request #1616 from DarkflameUniverse/behavior Gie "Max" Vanommeslaeghe 2024-07-17 22:24:52 +0200
• 49b4748ed3
  Merge pull request #1614 from DarkflameUniverse/tea Gie "Max" Vanommeslaeghe 2024-07-17 22:24:17 +0200
• ffeb0108d0
  Merge pull request #1619 from DarkflameUniverse/shield Gie "Max" Vanommeslaeghe 2024-07-17 22:23:21 +0200
• 3178a702a7 Updated how skills and upgrades work, more gui stuff nejlika wincent 2024-07-17 20:59:11 +0200
• 6818a178fd update #1623 save_data David Markowitz 2024-07-06 12:05:40 -0700
• d141f922c0 Merge branch 'main' into save_data David Markowitz 2024-07-06 12:03:56 -0700
• 4382a43e4a Update SavingTests.cpp David Markowitz 2024-07-06 00:24:45 -0700
• 7444f3c99e Update test_xml_data.xml David Markowitz 2024-07-06 00:18:30 -0700
• 80bf083a90 Update BuffComponent.h David Markowitz 2024-07-06 00:15:40 -0700
• 500d146a99 add rocket tests David Markowitz 2024-07-06 00:08:24 -0700
• 5e3312850c Refactor damage calculations and add additional modifiers wincent 2024-07-06 00:02:30 +0200
• 43768a5d86 add more tests David Markowitz 2024-07-05 05:22:13 -0700
• 991c61abf8 add more tests David Markowitz 2024-07-05 05:13:36 -0700
• ab5faf3223 use dummy database and add missing pure fns David Markowitz 2024-07-05 00:04:55 -0700
• 45b9721755 Merge branch 'main' into save_data David Markowitz 2024-07-04 22:58:50 -0700
• c3f6ef5a1d
  feat: add admin account creation options from cli (GM level) (#1620) David Markowitz 2024-07-03 15:37:19 -0700
• 87ff255e59
  Update dMasterServer/MasterServer.cpp #1620 David Markowitz 2024-07-02 12:36:16 -0700
• 3708617da7 tests David Markowitz 2024-07-02 04:05:44 -0700
• 999995b2fb Merge branch 'main' into shield #1619 David Markowitz 2024-07-02 03:14:32 -0700
• 9a90f757ea Merge branch 'main' into cli-args David Markowitz 2024-07-02 03:14:22 -0700
• 84fff7c380
  Merge pull request #1621 from DarkflameUniverse/EmosewaMC-patch-10 Gie "Max" Vanommeslaeghe 2024-07-02 12:12:30 +0200
• 59c4b35479
  Update Preconditions.cpp #1621 David Markowitz 2024-07-02 01:55:42 -0700
• b313e9db6c use actual gm levels David Markowitz 2024-07-02 01:54:57 -0700
• b870638370 add admin account creation options from cli David Markowitz 2024-07-02 01:44:06 -0700
• f2d72e7ed5 Update Preconditions.cpp David Markowitz 2024-06-25 21:02:40 -0700
• b648b43c4d ?? David Markowitz 2024-06-25 20:52:46 -0700
• 2628470482 set shield to false, add sync for done David Markowitz 2024-06-18 14:24:03 -0700
• 40aa925a56 Fixed Misspelling of Tresure variable for petcomponent #1617 dinomking33 2024-06-17 22:37:55 -0500
• f82a82f254 Create 16_big_behaviors.sql #1616 David Markowitz 2024-06-17 19:41:27 -0700
• 5a861df43f Merge branch 'main' into brickbuckets #1587 David Markowitz 2024-06-17 18:32:12 -0700
• 9400ee1dc0
  Merge pull request #1586 from DarkflameUniverse/property_behavior_saving Gie "Max" Vanommeslaeghe 2024-06-16 12:31:21 +0200
• 54b8c25754 Merge branch 'main' into tea #1614 David Markowitz 2024-06-12 19:20:44 -0700
• 00bba3d6d5 Merge branch 'main' into fix_slow_chat_stuff #1606 fix_slow_chat_stuff David Markowitz 2024-06-12 19:20:36 -0700
• cd5740f030 Update GameMessages.cpp David Markowitz 2024-06-12 19:19:49 -0700
• 2b104c8f97 Merge branch 'main' into brickbuckets David Markowitz 2024-06-12 19:18:23 -0700
• b984cd6a0b Merge branch 'main' into property_behavior_saving #1586 property_behavior_saving David Markowitz 2024-06-12 19:17:39 -0700
• 71642a24bf is this what you wanted #1615 millisecond David Markowitz 2024-06-12 19:15:11 -0700
• 642d41b9f6 remove const ig? David Markowitz 2024-06-12 14:47:05 -0700
• b24a6eb591 add millisecond tracking David Markowitz 2024-06-11 23:04:01 -0700
• bcf1058759
  Merge pull request #1595 from DarkflameUniverse/issue-462 Gie "Max" Vanommeslaeghe 2024-06-11 20:48:09 +0200
• 6ad6e930c7 move mission progression David Markowitz 2024-06-11 02:29:25 -0700
• fee0238e79
  fix: master not using table data, remove 2 noisy logs (#1613) David Markowitz 2024-06-09 15:31:57 -0700
• 0a8f729622 fix: master not using table data #1613 David Markowitz 2024-06-09 11:03:28 -0700
• b28cd58634 test dServer stuff David Markowitz 2024-06-09 11:02:45 -0700
• 756dc4e44f Updated how upgrade adds skills wincent 2024-06-08 17:31:22 +0200
• bf58cf85cc us static cast and enum #1611 issue-960 Aaron Kimbre 2024-06-07 15:07:37 -0500
• f6f3cdc3c0 fix compiling Aaron Kimbre 2024-06-07 09:31:54 -0500
• 66cf96af1a
  whoops Aaron Kimbrell 2024-06-06 21:34:29 -0500
• 0e6cb8ab19
  implict bool Aaron Kimbrell 2024-06-06 21:34:10 -0500
• 42cf2b6377
  remove unused code Aaron Kimbrell 2024-06-06 21:33:42 -0500
• 3cfbc9d3df Document what needs to be done May not do the recursive restriction cause they aren't used in the live game Aaron Kimbre 2024-06-06 21:11:43 -0500
• 5ba37ff7d6 fix compiling Aaron Kimbre 2024-06-06 08:50:00 -0500
• 8f00f1601c Merge branch 'main' into issue-960 Aaron Kimbre 2024-06-06 08:23:41 -0500
• 1454fcd003
  Fix g++ 14 (#1610) Wincent Holm 2024-06-06 11:00:44 +0200
• c27c32d667
  Update thirdparty/CMakeLists.txt #1610 Wincent Holm 2024-06-06 09:49:17 +0200
• ebe6062600 Fix g++ 14 wincent 2024-06-06 09:37:49 +0200
• 87613f287f Fix g++ 14 wincent 2024-06-06 09:37:49 +0200
• ac1b00fdaa Updates to upgrades wincent 2024-06-06 09:37:24 +0200
• 5e3c869141 WIP Aaron Kimbre 2024-06-05 02:39:36 -0500
• 8685d0dbdc Update SavingTests.cpp David Markowitz 2024-06-04 22:02:07 -0700
• bd0cafa33f testing works David Markowitz 2024-06-04 21:58:38 -0700
• 91ec214eea saving from a test works David Markowitz 2024-06-04 14:44:51 -0700
• af651f0d63
  Merge pull request #1608 from DarkflameUniverse/feat--spectate-command Gie "Max" Vanommeslaeghe 2024-06-04 09:17:18 +0200
• ff38503597 no feedback if empty #1608 Aaron Kimbre 2024-06-03 22:51:46 -0500
• 3f22bf5cc0 Add an easy way to stop spectating Aaron Kimbre 2024-06-03 22:44:54 -0500
• 9d5d2a68ee fix gm serialization Aaron Kimbre 2024-06-03 22:30:57 -0500
• 1a14c29c39 add returns, lol Aaron Kimbre 2024-06-03 22:29:21 -0500
• 2ef45bd7ee use empty Aaron Kimbre 2024-06-03 22:28:37 -0500
• b56d077892 feat: spectate command Aaron Kimbre 2024-06-03 21:50:12 -0500
• 364bcf822a Added upgrades wincent 2024-06-02 15:43:35 +0200
• d2f4c7f8a6
  Merge 7a325470f1 into a54600b41e #1607 TAHuntling 2024-06-02 09:18:26 +0000
• 7a325470f1 Work on tomorrow #1607 dinomking33 2024-06-02 04:18:20 -0500
• d5b2278dc5 Refactor and combat changes wincent 2024-06-02 09:53:56 +0200
• 420822aab4 Actually done dinomking33 2024-06-01 20:14:38 -0500
• a54600b41e
  busting out the multimap ig (#1602) chat-race-conditions David Markowitz 2024-05-31 11:46:18 -0700
• 1c8762fb00 Made changes dinomking33 2024-05-31 01:18:43 -0500
• d809d95842 fix slow code, add bounds checks David Markowitz 2024-05-30 23:07:32 -0700
• 342da927f5
  fix dimantling items from not the model inventory (#1605) David Markowitz 2024-05-30 21:53:13 -0700
• 01086d05c8
  fix: use after free and uninitialized memory (#1603) David Markowitz 2024-05-30 21:53:03 -0700
• c72ce4003b fix dimantling items from not the model inventory #1605 fix-dismantling-models-from-vault David Markowitz 2024-05-30 03:51:13 -0700
• 0bf5ee02e4 Merge remote-tracking branch 'origin/main' into nejlika wincent 2024-05-30 10:56:58 +0200
• c2ad76ee66 Moved to a dedicated nejlika fle wincent 2024-05-30 10:54:38 +0200
• d4e6acf9b7 e dinomking33 2024-05-29 23:01:34 -0500
• dd8e8610d2 move purge down further #1603 David Markowitz 2024-05-29 03:15:31 -0700
• cce5755366
  Fix Dockerfile vanity COPY (#1604) Remco Hofman 2024-05-28 02:46:09 +0200