DoKomiX

~dokomix/dokomix/+git/OpenJKDF2:master

  1. Git
  2. lp:~dokomix/dokomix/+git/OpenJKDF2
  3. master
Last commit made on 2024-04-06
Get this branch:
git clone -b master https://git.launchpad.net/~dokomix/dokomix/+git/OpenJKDF2

Branch merges

Branch information

Name:
master
Repository:
lp:~dokomix/dokomix/+git/OpenJKDF2

Recent commits

fbdb01b... by Maxamillion

Merge pull request #318 from bahstrike/strike_refactor2_syncmaster

Strike refactor2 syncmaster

a4f2af4... by bahstrike <email address hidden>

-reverting local submodule state? confused

24d6dd8... by bahstrike <email address hidden>

-removed personal debug arg "who" from sithCollision_SearchRadiusForThings

8b8eeca... by bahstrike <email address hidden>

Merge branch 'master' into strike_refactor2_syncmaster

# Conflicts:
# src/AI/sithAI.c
# src/Cog/sithCogFunction.c
# src/Engine/sithIntersect.c
# src/Engine/sithIntersect.h

3763419... by Maxamillion

Temporarily disable GNS on MSVC

801952c... by Maxamillion

pls fix macOS CI pls

b00ee41... by Maxamillion

Fix MSVC

b050b33... by bahstrike <email address hidden>

+refactor (rename) some coloreffect / palette related stuff

c018e7b... by bahstrike <email address hidden>

+added "who" arg to sithCollision_SearchRadiusForThings (temporary)

a269819... by bahstrike <email address hidden>

*trying to clean up sithCollision_SearchRadiusForThings