diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-10 13:38:40 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2016-01-10 13:38:40 -0500 |
| commit | 397481c41dc2180edd40a06c9053d5c3df8b417f (patch) | |
| tree | 90a4f849d427bd1dea08125fecdc144ba70ad1db | |
| parent | a6f43351e1e6e2fefdcf337cabeb6494ceb4563c (diff) | |
| download | wintersurvival2-397481c41dc2180edd40a06c9053d5c3df8b417f.tar.gz wintersurvival2-397481c41dc2180edd40a06c9053d5c3df8b417f.tar.bz2 wintersurvival2-397481c41dc2180edd40a06c9053d5c3df8b417f.zip | |
Workon getting servers to register with a master server
| -rw-r--r-- | doc/cheetsheet.txt (renamed from to-do/cheetsheet.txt) | 0 | ||||
| -rw-r--r-- | doc/content.materials.settelment/badge.png (renamed from to-do/content.materials.settelment/badge.png) | bin | 15134 -> 15134 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/berries.png (renamed from to-do/content.materials.settelment/berries.png) | bin | 11584 -> 11584 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/bolt.png (renamed from to-do/content.materials.settelment/bolt.png) | bin | 13045 -> 13045 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/bowl.png (renamed from to-do/content.materials.settelment/bowl.png) | bin | 5134 -> 5134 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/cake.png (renamed from to-do/content.materials.settelment/cake.png) | bin | 9335 -> 9335 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/crossbow.png (renamed from to-do/content.materials.settelment/crossbow.png) | bin | 9035 -> 9035 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/diamond.png (renamed from to-do/content.materials.settelment/diamond.png) | bin | 8680 -> 8680 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/egg.png (renamed from to-do/content.materials.settelment/egg.png) | bin | 6359 -> 6359 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/egg.vmt (renamed from to-do/content.materials.settelment/egg.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/egg.vtf (renamed from to-do/content.materials.settelment/egg.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/flour.png (renamed from to-do/content.materials.settelment/flour.png) | bin | 12967 -> 12967 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/flour.vmt (renamed from to-do/content.materials.settelment/flour.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/flour.vtf (renamed from to-do/content.materials.settelment/flour.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/friedegg.png (renamed from to-do/content.materials.settelment/friedegg.png) | bin | 8928 -> 8928 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/friedegg.psd (renamed from to-do/content.materials.settelment/friedegg.psd) | bin | 61767 -> 61767 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/grain.png (renamed from to-do/content.materials.settelment/grain.png) | bin | 8743 -> 8743 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_badge.vmt (renamed from to-do/content.materials.settelment/icon_badge.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_berries.vmt (renamed from to-do/content.materials.settelment/icon_berries.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_bolt.vmt (renamed from to-do/content.materials.settelment/icon_bolt.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_bowl.vmt (renamed from to-do/content.materials.settelment/icon_bowl.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_bowl.vtf (renamed from to-do/content.materials.settelment/icon_bowl.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_cake.vmt (renamed from to-do/content.materials.settelment/icon_cake.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_cake.vtf (renamed from to-do/content.materials.settelment/icon_cake.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_crossbow.vmt (renamed from to-do/content.materials.settelment/icon_crossbow.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_crossbow.vtf (renamed from to-do/content.materials.settelment/icon_crossbow.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_diamond.vmt (renamed from to-do/content.materials.settelment/icon_diamond.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_diamond.vtf (renamed from to-do/content.materials.settelment/icon_diamond.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_friedegg.vmt (renamed from to-do/content.materials.settelment/icon_friedegg.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_friedegg.vtf (renamed from to-do/content.materials.settelment/icon_friedegg.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_grain.vmt (renamed from to-do/content.materials.settelment/icon_grain.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_grain.vtf (renamed from to-do/content.materials.settelment/icon_grain.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_pie.vmt (renamed from to-do/content.materials.settelment/icon_pie.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_pie.vtf (renamed from to-do/content.materials.settelment/icon_pie.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_researchtable.vmt (renamed from to-do/content.materials.settelment/icon_researchtable.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_researchtable.vtf (renamed from to-do/content.materials.settelment/icon_researchtable.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_rope.vmt (renamed from to-do/content.materials.settelment/icon_rope.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_rope.vtf (renamed from to-do/content.materials.settelment/icon_rope.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_scythe.vmt (renamed from to-do/content.materials.settelment/icon_scythe.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_scythe.vtf (renamed from to-do/content.materials.settelment/icon_scythe.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_shack.png (renamed from to-do/content.materials.settelment/icon_shack.png) | bin | 7639 -> 7639 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_soup.vmt (renamed from to-do/content.materials.settelment/icon_soup.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_soup.vtf (renamed from to-do/content.materials.settelment/icon_soup.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/icon_sword.vmt (renamed from to-do/content.materials.settelment/icon_sword.vmt) | 8 | ||||
| -rw-r--r-- | doc/content.materials.settelment/icon_sword.vtf (renamed from to-do/content.materials.settelment/icon_sword.vtf) | bin | 16592 -> 16592 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/pie.png (renamed from to-do/content.materials.settelment/pie.png) | bin | 9232 -> 9232 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/researchtable.png (renamed from to-do/content.materials.settelment/researchtable.png) | bin | 11929 -> 11929 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/rope.png (renamed from to-do/content.materials.settelment/rope.png) | bin | 14263 -> 14263 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/scythe.png (renamed from to-do/content.materials.settelment/scythe.png) | bin | 8354 -> 8354 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/soup.png (renamed from to-do/content.materials.settelment/soup.png) | bin | 12569 -> 12569 bytes | |||
| -rw-r--r-- | doc/content.materials.settelment/sword.png (renamed from to-do/content.materials.settelment/sword.png) | bin | 5068 -> 5068 bytes | |||
| -rw-r--r-- | doc/gmodserver.txt (renamed from to-do/gmodserver.txt) | 0 | ||||
| -rw-r--r-- | doc/modelsandnotes/modelsforbush (renamed from to-do/modelsandnotes/modelsforbush) | 10 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png) | bin | 3605 -> 3605 bytes | |||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js) | 0 | ||||
| -rw-r--r-- | doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png (renamed from to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png) | bin | 4105 -> 4105 bytes | |||
| -rw-r--r-- | doc/notes.txt (renamed from to-do/notes.txt) | 0 | ||||
| -rw-r--r-- | doc/website.txt (renamed from to-do/website.txt) | 0 | ||||
| -rw-r--r-- | gamemode/server/regtomaster.lua | 31 | ||||
| -rw-r--r-- | wintersurvival2.txt | 20 |
73 files changed, 122 insertions, 75 deletions
diff --git a/to-do/cheetsheet.txt b/doc/cheetsheet.txt index e1e825f..e1e825f 100644 --- a/to-do/cheetsheet.txt +++ b/doc/cheetsheet.txt diff --git a/to-do/content.materials.settelment/badge.png b/doc/content.materials.settelment/badge.png Binary files differindex 87efc38..87efc38 100644 --- a/to-do/content.materials.settelment/badge.png +++ b/doc/content.materials.settelment/badge.png diff --git a/to-do/content.materials.settelment/berries.png b/doc/content.materials.settelment/berries.png Binary files differindex da582a3..da582a3 100644 --- a/to-do/content.materials.settelment/berries.png +++ b/doc/content.materials.settelment/berries.png diff --git a/to-do/content.materials.settelment/bolt.png b/doc/content.materials.settelment/bolt.png Binary files differindex 572e519..572e519 100644 --- a/to-do/content.materials.settelment/bolt.png +++ b/doc/content.materials.settelment/bolt.png diff --git a/to-do/content.materials.settelment/bowl.png b/doc/content.materials.settelment/bowl.png Binary files differindex d682513..d682513 100644 --- a/to-do/content.materials.settelment/bowl.png +++ b/doc/content.materials.settelment/bowl.png diff --git a/to-do/content.materials.settelment/cake.png b/doc/content.materials.settelment/cake.png Binary files differindex 00681d9..00681d9 100644 --- a/to-do/content.materials.settelment/cake.png +++ b/doc/content.materials.settelment/cake.png diff --git a/to-do/content.materials.settelment/crossbow.png b/doc/content.materials.settelment/crossbow.png Binary files differindex 45f5164..45f5164 100644 --- a/to-do/content.materials.settelment/crossbow.png +++ b/doc/content.materials.settelment/crossbow.png diff --git a/to-do/content.materials.settelment/diamond.png b/doc/content.materials.settelment/diamond.png Binary files differindex 5fdd01e..5fdd01e 100644 --- a/to-do/content.materials.settelment/diamond.png +++ b/doc/content.materials.settelment/diamond.png diff --git a/to-do/content.materials.settelment/egg.png b/doc/content.materials.settelment/egg.png Binary files differindex 4e6afe9..4e6afe9 100644 --- a/to-do/content.materials.settelment/egg.png +++ b/doc/content.materials.settelment/egg.png diff --git a/to-do/content.materials.settelment/egg.vmt b/doc/content.materials.settelment/egg.vmt index 2178ab1..945fa79 100644 --- a/to-do/content.materials.settelment/egg.vmt +++ b/doc/content.materials.settelment/egg.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/egg"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/egg" +} diff --git a/to-do/content.materials.settelment/egg.vtf b/doc/content.materials.settelment/egg.vtf Binary files differindex cdce86e..cdce86e 100644 --- a/to-do/content.materials.settelment/egg.vtf +++ b/doc/content.materials.settelment/egg.vtf diff --git a/to-do/content.materials.settelment/flour.png b/doc/content.materials.settelment/flour.png Binary files differindex 08bdb3b..08bdb3b 100644 --- a/to-do/content.materials.settelment/flour.png +++ b/doc/content.materials.settelment/flour.png diff --git a/to-do/content.materials.settelment/flour.vmt b/doc/content.materials.settelment/flour.vmt index 27de26a..aef599a 100644 --- a/to-do/content.materials.settelment/flour.vmt +++ b/doc/content.materials.settelment/flour.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/flour"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/flour" +} diff --git a/to-do/content.materials.settelment/flour.vtf b/doc/content.materials.settelment/flour.vtf Binary files differindex 55e1521..55e1521 100644 --- a/to-do/content.materials.settelment/flour.vtf +++ b/doc/content.materials.settelment/flour.vtf diff --git a/to-do/content.materials.settelment/friedegg.png b/doc/content.materials.settelment/friedegg.png Binary files differindex 98de51d..98de51d 100644 --- a/to-do/content.materials.settelment/friedegg.png +++ b/doc/content.materials.settelment/friedegg.png diff --git a/to-do/content.materials.settelment/friedegg.psd b/doc/content.materials.settelment/friedegg.psd Binary files differindex 33e9429..33e9429 100644 --- a/to-do/content.materials.settelment/friedegg.psd +++ b/doc/content.materials.settelment/friedegg.psd diff --git a/to-do/content.materials.settelment/grain.png b/doc/content.materials.settelment/grain.png Binary files differindex f8e05d0..f8e05d0 100644 --- a/to-do/content.materials.settelment/grain.png +++ b/doc/content.materials.settelment/grain.png diff --git a/to-do/content.materials.settelment/icon_badge.vmt b/doc/content.materials.settelment/icon_badge.vmt index 026f0ad..54f1677 100644 --- a/to-do/content.materials.settelment/icon_badge.vmt +++ b/doc/content.materials.settelment/icon_badge.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_badge"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_badge" +} diff --git a/to-do/content.materials.settelment/icon_berries.vmt b/doc/content.materials.settelment/icon_berries.vmt index 4e6bd11..9f39de5 100644 --- a/to-do/content.materials.settelment/icon_berries.vmt +++ b/doc/content.materials.settelment/icon_berries.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_berries"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_berries" +} diff --git a/to-do/content.materials.settelment/icon_bolt.vmt b/doc/content.materials.settelment/icon_bolt.vmt index c6c5e8d..9509767 100644 --- a/to-do/content.materials.settelment/icon_bolt.vmt +++ b/doc/content.materials.settelment/icon_bolt.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_bolt"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_bolt" +} diff --git a/to-do/content.materials.settelment/icon_bowl.vmt b/doc/content.materials.settelment/icon_bowl.vmt index 7a8b9e4..b0f1f84 100644 --- a/to-do/content.materials.settelment/icon_bowl.vmt +++ b/doc/content.materials.settelment/icon_bowl.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_bowl"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_bowl" +} diff --git a/to-do/content.materials.settelment/icon_bowl.vtf b/doc/content.materials.settelment/icon_bowl.vtf Binary files differindex a9c6a88..a9c6a88 100644 --- a/to-do/content.materials.settelment/icon_bowl.vtf +++ b/doc/content.materials.settelment/icon_bowl.vtf diff --git a/to-do/content.materials.settelment/icon_cake.vmt b/doc/content.materials.settelment/icon_cake.vmt index b824960..e00c5de 100644 --- a/to-do/content.materials.settelment/icon_cake.vmt +++ b/doc/content.materials.settelment/icon_cake.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_cake"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_cake" +} diff --git a/to-do/content.materials.settelment/icon_cake.vtf b/doc/content.materials.settelment/icon_cake.vtf Binary files differindex 49c44bc..49c44bc 100644 --- a/to-do/content.materials.settelment/icon_cake.vtf +++ b/doc/content.materials.settelment/icon_cake.vtf diff --git a/to-do/content.materials.settelment/icon_crossbow.vmt b/doc/content.materials.settelment/icon_crossbow.vmt index 614b941..6f7f9c0 100644 --- a/to-do/content.materials.settelment/icon_crossbow.vmt +++ b/doc/content.materials.settelment/icon_crossbow.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_crossbow"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_crossbow" +} diff --git a/to-do/content.materials.settelment/icon_crossbow.vtf b/doc/content.materials.settelment/icon_crossbow.vtf Binary files differindex b1182f8..b1182f8 100644 --- a/to-do/content.materials.settelment/icon_crossbow.vtf +++ b/doc/content.materials.settelment/icon_crossbow.vtf diff --git a/to-do/content.materials.settelment/icon_diamond.vmt b/doc/content.materials.settelment/icon_diamond.vmt index 203035c..3aaab59 100644 --- a/to-do/content.materials.settelment/icon_diamond.vmt +++ b/doc/content.materials.settelment/icon_diamond.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_diamond"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_diamond" +} diff --git a/to-do/content.materials.settelment/icon_diamond.vtf b/doc/content.materials.settelment/icon_diamond.vtf Binary files differindex b23dc82..b23dc82 100644 --- a/to-do/content.materials.settelment/icon_diamond.vtf +++ b/doc/content.materials.settelment/icon_diamond.vtf diff --git a/to-do/content.materials.settelment/icon_friedegg.vmt b/doc/content.materials.settelment/icon_friedegg.vmt index c499dec..4c21ac7 100644 --- a/to-do/content.materials.settelment/icon_friedegg.vmt +++ b/doc/content.materials.settelment/icon_friedegg.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_friedegg"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_friedegg" +} diff --git a/to-do/content.materials.settelment/icon_friedegg.vtf b/doc/content.materials.settelment/icon_friedegg.vtf Binary files differindex 363c649..363c649 100644 --- a/to-do/content.materials.settelment/icon_friedegg.vtf +++ b/doc/content.materials.settelment/icon_friedegg.vtf diff --git a/to-do/content.materials.settelment/icon_grain.vmt b/doc/content.materials.settelment/icon_grain.vmt index 4ab0b46..9750871 100644 --- a/to-do/content.materials.settelment/icon_grain.vmt +++ b/doc/content.materials.settelment/icon_grain.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_grain"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_grain" +} diff --git a/to-do/content.materials.settelment/icon_grain.vtf b/doc/content.materials.settelment/icon_grain.vtf Binary files differindex 6e1e388..6e1e388 100644 --- a/to-do/content.materials.settelment/icon_grain.vtf +++ b/doc/content.materials.settelment/icon_grain.vtf diff --git a/to-do/content.materials.settelment/icon_pie.vmt b/doc/content.materials.settelment/icon_pie.vmt index 28cb99d..73eef40 100644 --- a/to-do/content.materials.settelment/icon_pie.vmt +++ b/doc/content.materials.settelment/icon_pie.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_pie"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_pie" +} diff --git a/to-do/content.materials.settelment/icon_pie.vtf b/doc/content.materials.settelment/icon_pie.vtf Binary files differindex cf9e91d..cf9e91d 100644 --- a/to-do/content.materials.settelment/icon_pie.vtf +++ b/doc/content.materials.settelment/icon_pie.vtf diff --git a/to-do/content.materials.settelment/icon_researchtable.vmt b/doc/content.materials.settelment/icon_researchtable.vmt index d6cac0d..68b9a29 100644 --- a/to-do/content.materials.settelment/icon_researchtable.vmt +++ b/doc/content.materials.settelment/icon_researchtable.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_researchtable"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_researchtable" +} diff --git a/to-do/content.materials.settelment/icon_researchtable.vtf b/doc/content.materials.settelment/icon_researchtable.vtf Binary files differindex 5f01d8c..5f01d8c 100644 --- a/to-do/content.materials.settelment/icon_researchtable.vtf +++ b/doc/content.materials.settelment/icon_researchtable.vtf diff --git a/to-do/content.materials.settelment/icon_rope.vmt b/doc/content.materials.settelment/icon_rope.vmt index 4b7309e..3520813 100644 --- a/to-do/content.materials.settelment/icon_rope.vmt +++ b/doc/content.materials.settelment/icon_rope.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_rope"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_rope" +} diff --git a/to-do/content.materials.settelment/icon_rope.vtf b/doc/content.materials.settelment/icon_rope.vtf Binary files differindex 742145d..742145d 100644 --- a/to-do/content.materials.settelment/icon_rope.vtf +++ b/doc/content.materials.settelment/icon_rope.vtf diff --git a/to-do/content.materials.settelment/icon_scythe.vmt b/doc/content.materials.settelment/icon_scythe.vmt index a9b31d5..c0d29f3 100644 --- a/to-do/content.materials.settelment/icon_scythe.vmt +++ b/doc/content.materials.settelment/icon_scythe.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_scythe"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_scythe" +} diff --git a/to-do/content.materials.settelment/icon_scythe.vtf b/doc/content.materials.settelment/icon_scythe.vtf Binary files differindex 7ca7929..7ca7929 100644 --- a/to-do/content.materials.settelment/icon_scythe.vtf +++ b/doc/content.materials.settelment/icon_scythe.vtf diff --git a/to-do/content.materials.settelment/icon_shack.png b/doc/content.materials.settelment/icon_shack.png Binary files differindex 2a921dc..2a921dc 100644 --- a/to-do/content.materials.settelment/icon_shack.png +++ b/doc/content.materials.settelment/icon_shack.png diff --git a/to-do/content.materials.settelment/icon_soup.vmt b/doc/content.materials.settelment/icon_soup.vmt index 4214ca1..1cd1600 100644 --- a/to-do/content.materials.settelment/icon_soup.vmt +++ b/doc/content.materials.settelment/icon_soup.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_soup"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_soup" +} diff --git a/to-do/content.materials.settelment/icon_soup.vtf b/doc/content.materials.settelment/icon_soup.vtf Binary files differindex 91be7d2..91be7d2 100644 --- a/to-do/content.materials.settelment/icon_soup.vtf +++ b/doc/content.materials.settelment/icon_soup.vtf diff --git a/to-do/content.materials.settelment/icon_sword.vmt b/doc/content.materials.settelment/icon_sword.vmt index 45421fa..81ed352 100644 --- a/to-do/content.materials.settelment/icon_sword.vmt +++ b/doc/content.materials.settelment/icon_sword.vmt @@ -1,4 +1,4 @@ -"LightmappedGeneric"
-{
- "$basetexture" ".settelment/icon_sword"
-}
+"LightmappedGeneric" +{ + "$basetexture" ".settelment/icon_sword" +} diff --git a/to-do/content.materials.settelment/icon_sword.vtf b/doc/content.materials.settelment/icon_sword.vtf Binary files differindex 9365108..9365108 100644 --- a/to-do/content.materials.settelment/icon_sword.vtf +++ b/doc/content.materials.settelment/icon_sword.vtf diff --git a/to-do/content.materials.settelment/pie.png b/doc/content.materials.settelment/pie.png Binary files differindex 6257491..6257491 100644 --- a/to-do/content.materials.settelment/pie.png +++ b/doc/content.materials.settelment/pie.png diff --git a/to-do/content.materials.settelment/researchtable.png b/doc/content.materials.settelment/researchtable.png Binary files differindex df94747..df94747 100644 --- a/to-do/content.materials.settelment/researchtable.png +++ b/doc/content.materials.settelment/researchtable.png diff --git a/to-do/content.materials.settelment/rope.png b/doc/content.materials.settelment/rope.png Binary files differindex 8e2be40..8e2be40 100644 --- a/to-do/content.materials.settelment/rope.png +++ b/doc/content.materials.settelment/rope.png diff --git a/to-do/content.materials.settelment/scythe.png b/doc/content.materials.settelment/scythe.png Binary files differindex f196408..f196408 100644 --- a/to-do/content.materials.settelment/scythe.png +++ b/doc/content.materials.settelment/scythe.png diff --git a/to-do/content.materials.settelment/soup.png b/doc/content.materials.settelment/soup.png Binary files differindex 6344ddb..6344ddb 100644 --- a/to-do/content.materials.settelment/soup.png +++ b/doc/content.materials.settelment/soup.png diff --git a/to-do/content.materials.settelment/sword.png b/doc/content.materials.settelment/sword.png Binary files differindex fe800ff..fe800ff 100644 --- a/to-do/content.materials.settelment/sword.png +++ b/doc/content.materials.settelment/sword.png diff --git a/to-do/gmodserver.txt b/doc/gmodserver.txt index 8d45710..8d45710 100644 --- a/to-do/gmodserver.txt +++ b/doc/gmodserver.txt diff --git a/to-do/modelsandnotes/modelsforbush b/doc/modelsandnotes/modelsforbush index 01b2f8b..8008e82 100644 --- a/to-do/modelsandnotes/modelsforbush +++ b/doc/modelsandnotes/modelsforbush @@ -1,5 +1,5 @@ -models/props/de_train/bush.mdl
-models/props/de_inferno/largebush06.mdl
-models/props_foliage/shrub_01a.mdl
-models/props_foliage/shrub_02a.mdl
-models/props_foliage/bramble001a.mdl
+models/props/de_train/bush.mdl +models/props/de_inferno/largebush06.mdl +models/props_foliage/shrub_01a.mdl +models/props_foliage/shrub_02a.mdl +models/props_foliage/bramble001a.mdl diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm index 35b914f..35b914f 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod.htm diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js index 569325c..569325c 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/angular.js diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm index a6e8232..a6e8232 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/embed.htm diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css index 19111b3..19111b3 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.css diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js index 214e9c9..214e9c9 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/garrysmod.js diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js index 7401208..7401208 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/jquery.js diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css index 832e970..832e970 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.css diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php index 0770019..0770019 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load.php diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css index c60cb1c..c60cb1c 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.css diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php index a8c5465..a8c5465 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_002.php diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php index efbec3a..efbec3a 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_003.php diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php index e67c3cd..e67c3cd 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_004.php diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php index 2100860..2100860 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/load_005.php diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png Binary files differindex 835e860..835e860 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/poweredby_mediawiki_88x31.png diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js index 2643b95..2643b95 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/rainbow.js diff --git a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png Binary files differindex 5eadf15..5eadf15 100644 --- a/to-do/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png +++ b/doc/notes-resource/Linux Dedicated Server Hosting - Garry's Mod_files/smw_button.png diff --git a/to-do/notes.txt b/doc/notes.txt index c186101..c186101 100644 --- a/to-do/notes.txt +++ b/doc/notes.txt diff --git a/to-do/website.txt b/doc/website.txt index 611d80e..611d80e 100644 --- a/to-do/website.txt +++ b/doc/website.txt diff --git a/gamemode/server/regtomaster.lua b/gamemode/server/regtomaster.lua new file mode 100644 index 0000000..9909fc8 --- /dev/null +++ b/gamemode/server/regtomaster.lua @@ -0,0 +1,31 @@ + +local function GetIP() + local hostip = GetConVar( "hostip" ):GetString() + hostip = tonumber( hostip ) + + local ip = {} + ip[ 1 ] = bit.rshift( bit.band( hostip, 0xFF000000 ), 24 ) + ip[ 2 ] = bit.rshift( bit.band( hostip, 0x00FF0000 ), 16 ) + ip[ 3 ] = bit.rshift( bit.band( hostip, 0x0000FF00 ), 8 ) + ip[ 4 ] = bit.band( hostip, 0x000000FF ) + + return table.concat( ip, "." ) +end + +function GM:AddToMaster() + if(!game.IsDedicated())then + print("Listen or singleplayer, not registering with master server!") + return + end + local data = {} + data["hostname"] = GetHostName() + data["ip"] = "" + GetIP() + ":" + (GetConVar("wss_serverurlport"):GetString() or 27015) + data["online"] = "true" + http.Post(GetConVar("wss_wss_masterserverurl"):GetString(),data) +end + +function GM:RemoveFromMaster() + local data = {} + data["online"] = "false" + http.Post(GAMEMODE.masterurl,data) +end diff --git a/wintersurvival2.txt b/wintersurvival2.txt index 624f03d..656b92e 100644 --- a/wintersurvival2.txt +++ b/wintersurvival2.txt @@ -19,8 +19,24 @@ "name" "wss_masterserverurl"
"text" "Master server URL"
"help" "The URL that holds the master server list"
- "type" "String"
- "default" "http://cogarr.net/mserver.php"
+ "type" "Text"
+ "default" "http://cogarr.net/servers.sh"
+ }
+ 3
+ {
+ "name" "wss_serverurlorip"
+ "text" "Server url"
+ "help" "The server's url (for dedicated servers, listen servers can ignore this)"
+ "type" "Text"
+ "default" "127.0.0.1"
+ }
+ 4
+ {
+ "name" "wss_serverurlport"
+ "text" "Server port"
+ "help" "The server's port (for dedicated servers, listen servers can ignore this)"
+ "type" "Numeric"
+ "default" "27015"
}
}
}
|
