Mloc
|
49c0a30301
|
Merge branch 'master' into dev
Conflicts:
baystation12.dme
html/changelog.html
|
2013-09-26 10:26:03 +01:00 |
|
DJSnapshot
|
a9861dd086
|
Added to the example/config.txt
|
2013-09-25 12:28:31 -07:00 |
|
Erthilo
|
3b61ba850f
|
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
|
2013-09-02 23:32:33 +01:00 |
|
Mloc-Argent
|
51ea24b0fe
|
Genericify this shit.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
|
2013-09-01 21:17:09 +01:00 |
|
Erthilo
|
ee55069d59
|
Example of softcrit config
|
2013-08-29 09:52:42 +01:00 |
|
Mloc-Argent
|
21152fac09
|
Moved every config file into an "example" directory, to help prevent git screwing with local testing environments.
Details have been added to README.md.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
|
2013-08-16 19:55:23 +01:00 |
|