Skip to content

Commit

Permalink
Merge branch 'master' into multi-dir-search
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger authored Feb 13, 2021
2 parents 69f08f2 + efe6412 commit 6881013
Show file tree
Hide file tree
Showing 1,960 changed files with 661,512 additions and 67,085 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ Oblige.exe
.f
.DS_Store

obj_linux
obj_win32
lib_win32

tools/dumpbsp/dumpbsp_q3
tools/dumpbsp/dumpbsp_q3/obj_q3

Expand Down
13 changes: 6 additions & 7 deletions AUTHORS.txt → AUTHORS.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

OBLIGE AUTHORS
==============
# OBLIGE AUTHORS

DEVELOPER:
## DEVELOPER:

Andrew Apted <[email protected]>

I created OBLIGE and I continue to develop it.


CONTRIBUTORS:
## CONTRIBUTORS:

Chris Pisarczyk (Glaice)
- DOOM prefabs
Expand Down Expand Up @@ -62,7 +61,7 @@ SylandroProbopas
- DOOM 1 boss map


THANKS TO:
## THANKS TO:

DoomJedi : Wolf3D testing, list of Wolf3D mods.

Expand All @@ -83,7 +82,7 @@ ideas for improvements (etc), both in email and on the forums.
Your input has been greatly appreciated!


TITLE ARTWORK:
## TITLE ARTWORK:

bg/lamp1.tga : by Lanea Zimmerman, under CC-BY 3.0 license.
bg/block1.tga : by Keith333 (user on OGA), under CC-BY 3.0 license.
Expand All @@ -94,7 +93,7 @@ Several textures and sprites from the FreeDoom project.
(All other title artwork is under CC0 license / public domain)


NOTES:
## NOTES:

OBLIGE was written from scratch. It does not contain any code
from SLIGE (by David Chess) or from any other random level
Expand Down
76 changes: 0 additions & 76 deletions CHANGES.txt

This file was deleted.

Loading

0 comments on commit 6881013

Please sign in to comment.