Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/boxden/The-Lobby
Browse files Browse the repository at this point in the history
  • Loading branch information
boxden committed Jan 22, 2024
2 parents 9502403 + 51433c5 commit 74f81a0
Show file tree
Hide file tree
Showing 18 changed files with 1,508 additions and 1,360 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

*.log
*.vmx
*.bsp
*.prt
12 changes: 6 additions & 6 deletions README-RU.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The Lobby - это разрушаемая карта для Garry's Mod. У ва

Название карты: phys_lobby
Бинд для восстановления карты: bind `<key>` gmod_admin_cleanup
Для примера я использую клавишу "Delete"
Для примера я использую клавишу "del"
Вы так же можете просто ввести gmod_admin_cleanup в консоль

## Установка
Expand Down Expand Up @@ -57,17 +57,17 @@ The Lobby - это разрушаемая карта для Garry's Mod. У ва

### Улучшения

- [ ] Холмистая территория на улице
- [ ] Атмосфера на улице более насыщена
- [ ] Холмистая местность на улице
- [ ] Атмосфера на улице более насыщенная
- [ ] Главный вход переработан [#9](https://github.com/boxden/The-Lobby/issues/9)
- [ ] Расширенная игровая зона
- [ ] Электроснабжение здания переосмыслено [#8](https://github.com/boxden/The-Lobby/issues/8)
- [ ] Здания снаружи получили новый внешний вид
- [ ] Здания снаружи получили новый облик

### Исправлено

- [ ] Звонок от Mr. Oizo завершается корректно
- [x] Статические реквизиты не летают в воздухе, например [#7](https://github.com/boxden/The-Lobby/issues/7)
- [x] Статические пропы не летают в воздухе, например [#7](https://github.com/boxden/The-Lobby/issues/7)
- [x] Все текстуры, невидимые для игрока, были закрашены `nodraw`
- [x] Модели `exit_ceiling.mdl` и `vending_machine.mdl` имеют отключенные текстуры [#4](https://github.com/boxden/The-Lobby/issues/4)
- [x] Модель `moneypallet_washerdryer.mdl` не создаёт ошибки в консоли [#5](https://github.com/boxden/The-Lobby/issues/5)
Expand All @@ -78,4 +78,4 @@ The Lobby - это разрушаемая карта для Garry's Mod. У ва
- [x] Неиспользуемые оружия `weapon_rpg`, `weapon_357` и `weapon_shotgun` [#6](https://github.com/boxden/The-Lobby/issues/6)
- [ ] Музыка с радио [#1](https://github.com/boxden/The-Lobby/issues/1)

29 Октября 2023г - Была приобретина GTX 1660 Super 6GB
29 Октября 2023г - Была приобретена GTX 1660 Super 6GB за 3200 лей
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ For a comfortable game we recommend the Chromium x64 version of the game along w

Map name: phys_lobby
Bind to restore: bind `<key>` gmod_admin_cleanup
For example i used "Delete" key
For example i used "del" key
You can also simply type gmod_admin_cleanup in the console

## Installation
Expand Down Expand Up @@ -66,14 +66,14 @@ Thanks a lot to [Nicolai Seven](https://steamcommunity.com/id/nicolai_seven) for

### Fixed

- [ ] A call from Mr. Oizo ends properly
- [x] Static props don't fly in the air, [for example #7](https://github.com/boxden/The-Lobby/issues/7)
- [ ] Call from Mr. Oizo ends correctly
- [x] Static_prop's don't flying, [for example #7](https://github.com/boxden/The-Lobby/issues/7)
- [x] All textures invisible to the player have been painted with `nodraw`
- [x] Models `exit_ceiling.mdl` and `vending_machine.mdl` they have disabled textures [#4](https://github.com/boxden/The-Lobby/issues/4)
- [x] Model `moneypallet_washerdryer.mdl` doesn't generate errors in the console. [#5](https://github.com/boxden/The-Lobby/issues/5)
- [ ] The music stops when the radio receiver is destroyed [#3](https://github.com/boxden/The-Lobby/issues/3)
- [ ] Music stops when the radio receiver is destroyed [#3](https://github.com/boxden/The-Lobby/issues/3)

### Removed

- [x] Unused weapons `weapon_rpg`, `weapon_357` and `weapon_shotgun` [#6](https://github.com/boxden/The-Lobby/issues/6)
- [ ] Music from the radio [#1](https://github.com/boxden/The-Lobby/issues/1)
- [ ] Music from the radio [#1](https://github.com/boxden/The-Lobby/issues/1)
Binary file added lobby/_ideas/Saddam-Husein-toilet-loop.wav
Binary file not shown.
Binary file added lobby/_ideas/saddam husein.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lobby/_ideas/toilet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lobby/mapsrc/phys_lobby.bsp
Binary file not shown.
90 changes: 46 additions & 44 deletions lobby/mapsrc/phys_lobby.prt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PRT1
32
58
34
60
4 1 11 (640 -1024 192 ) (384 -1024 192 ) (384 -1024 64 ) (640 -1024 64 )
4 1 2 (384 -704 192 ) (384 -704 176 ) (384 -705 176 ) (384 -705 192 )
4 1 3 (384 -705 64 ) (384 -1024 64 ) (384 -1024 192 ) (384 -705 192 )
Expand All @@ -10,52 +10,54 @@ PRT1
4 3 4 (328 -705 64 ) (328 -1024 64 ) (328 -1024 192 ) (328 -705 192 )
4 4 11 (328 -1024 192 ) (112 -1024 192 ) (112 -1024 64 ) (328 -1024 64 )
4 4 5 (112 -704 64 ) (112 -1024 64 ) (112 -1024 192 ) (112 -704 192 )
4 5 14 (0 -1024 64 ) (0 -1024 192 ) (0 -704 192 ) (0 -704 64 )
4 5 13 (0 -1024 64 ) (0 -1024 192 ) (0 -704 192 ) (0 -704 64 )
4 5 11 (112 -1024 192 ) (0 -1024 192 ) (0 -1024 64 ) (112 -1024 64 )
4 6 8 (1032 -1072 192 ) (1032 -1072 -448 ) (1032 -1232 -448 ) (1032 -1232 192 )
4 7 8 (1032 -1096 192 ) (1032 -1208 192 ) (1024 -1208 192 ) (1024 -1096 192 )
4 8 12 (1024 -1232 -448 ) (1024 -1232 48 ) (1024 -1072 48 ) (1024 -1072 -448 )
4 8 10 (1024 -1232 64 ) (1024 -1232 192 ) (1024 -1072 192 ) (1024 -1072 64 )
4 9 19 (0 -1024 224 ) (0 -1024 192 ) (0 -1280 192 ) (0 -1280 224 )
4 9 21 (0 -1024 224 ) (0 -1024 192 ) (0 -1280 192 ) (0 -1280 224 )
4 9 11 (0 -1280 192 ) (0 -1024 192 ) (96 -1024 192 ) (96 -1280 192 )
4 10 11 (640 -1024 64 ) (640 -1280 64 ) (640 -1280 192 ) (640 -1024 192 )
4 11 27 (0 -1600 192 ) (0 -1216 192 ) (0 -1216 64 ) (0 -1600 64 )
4 11 25 (0 -1216 192 ) (0 -1088 192 ) (0 -1088 64 ) (0 -1216 64 )
4 11 24 (0 -1088 192 ) (0 -1024 192 ) (0 -1024 64 ) (0 -1088 64 )
4 13 17 (-592 -1024 608 ) (-832 -1024 608 ) (-832 -1024 224 ) (-592 -1024 224 )
4 13 15 (-832 -1024 224 ) (-832 -1024 608 ) (-832 -704 608 ) (-832 -704 224 )
4 14 24 (0 -1024 64 ) (0 -1024 192 ) (-800 -1024 192 ) (-800 -1024 64 )
4 15 28 (-1024 -1024 192 ) (-1024 -1024 64 ) (-832 -1024 64 ) (-832 -1024 192 )
4 15 21 (-1024 -1024 224 ) (-1024 -1024 192 ) (-832 -1024 192 ) (-832 -1024 224 )
4 15 18 (-832 -1024 608 ) (-1024 -1024 608 ) (-1024 -1024 224 ) (-832 -1024 224 )
4 15 16 (-1024 -1024 64 ) (-1024 -1024 608 ) (-1024 -64 608 ) (-1024 -64 64 )
4 16 29 (-1024 -1024 64 ) (-1024 -1024 608 ) (-1600 -1024 608 ) (-1600 -1024 64 )
4 17 20 (-704 -1024 224 ) (-608 -1024 224 ) (-608 -1280 224 ) (-704 -1280 224 )
4 17 18 (-832 -1024 224 ) (-832 -1600 224 ) (-832 -1600 608 ) (-832 -1024 608 )
4 18 29 (-1024 -1600 608 ) (-1024 -1024 608 ) (-1024 -1024 224 ) (-1024 -1600 224 )
4 18 23 (-832 -1600 608 ) (-1024 -1600 608 ) (-1024 -1600 224 ) (-832 -1600 224 )
4 18 22 (-832 -1600 224 ) (-1024 -1600 224 ) (-1024 -1280 224 ) (-832 -1280 224 )
4 18 21 (-1024 -1280 224 ) (-1024 -1024 224 ) (-832 -1024 224 ) (-832 -1280 224 )
4 19 27 (0 -1216 192 ) (0 -1280 192 ) (-96 -1280 192 ) (-96 -1216 192 )
4 19 25 (0 -1088 192 ) (0 -1216 192 ) (-96 -1216 192 ) (-96 -1088 192 )
4 19 24 (-96 -1024 192 ) (0 -1024 192 ) (0 -1088 192 ) (-96 -1088 192 )
4 20 27 (-608 -1216 192 ) (-608 -1280 192 ) (-704 -1280 192 ) (-704 -1216 192 )
4 20 25 (-608 -1088 192 ) (-608 -1216 192 ) (-704 -1216 192 ) (-704 -1088 192 )
4 20 24 (-704 -1024 192 ) (-608 -1024 192 ) (-608 -1088 192 ) (-704 -1088 192 )
4 21 29 (-1024 -1024 224 ) (-1024 -1024 192 ) (-1024 -1280 192 ) (-1024 -1280 224 )
4 21 28 (-1024 -1280 192 ) (-1024 -1024 192 ) (-832 -1024 192 ) (-832 -1280 192 )
4 21 22 (-1024 -1280 192 ) (-832 -1280 192 ) (-832 -1280 224 ) (-1024 -1280 224 )
4 22 29 (-1024 -1280 192 ) (-1024 -1600 192 ) (-1024 -1600 224 ) (-1024 -1280 224 )
4 22 28 (-1024 -1600 192 ) (-1024 -1280 192 ) (-832 -1280 192 ) (-832 -1600 192 )
4 22 23 (-1024 -1600 192 ) (-832 -1600 192 ) (-832 -1600 224 ) (-1024 -1600 224 )
4 23 30 (-832 -2048 608 ) (-1024 -2048 608 ) (-1024 -2048 192 ) (-832 -2048 192 )
4 23 29 (-1024 -2048 192 ) (-1024 -2048 608 ) (-1024 -1600 608 ) (-1024 -1600 192 )
4 23 28 (-832 -2048 192 ) (-1024 -2048 192 ) (-1024 -1600 192 ) (-832 -1600 192 )
4 24 25 (-800 -1088 64 ) (0 -1088 64 ) (0 -1088 192 ) (-800 -1088 192 )
4 25 27 (-800 -1216 64 ) (0 -1216 64 ) (0 -1216 192 ) (-800 -1216 192 )
4 25 26 (-800 -1088 176 ) (-800 -1088 64 ) (-800 -1216 64 ) (-800 -1216 176 )
4 26 28 (-832 -1088 64 ) (-832 -1216 64 ) (-832 -1216 176 ) (-832 -1088 176 )
4 28 30 (-832 -2048 192 ) (-1024 -2048 192 ) (-1024 -2048 64 ) (-832 -2048 64 )
4 28 29 (-1024 -2048 64 ) (-1024 -2048 192 ) (-1024 -1024 192 ) (-1024 -1024 64 )
4 29 31 (-1024 -2048 64 ) (-1024 -2048 608 ) (-1600 -2048 608 ) (-1600 -2048 64 )
4 30 31 (-1024 -2048 608 ) (-1024 -2048 64 ) (-1024 -2176 64 ) (-1024 -2176 608 )
4 11 29 (0 -1600 192 ) (0 -1216 192 ) (0 -1216 64 ) (0 -1600 64 )
4 11 27 (0 -1216 192 ) (0 -1088 192 ) (0 -1088 64 ) (0 -1216 64 )
4 11 26 (0 -1088 192 ) (0 -1024 192 ) (0 -1024 64 ) (0 -1088 64 )
4 13 26 (0 -1024 64 ) (0 -1024 192 ) (-576 -1024 192 ) (-576 -1024 64 )
4 13 18 (-576 -704 64 ) (-576 -1024 64 ) (-576 -1024 192 ) (-576 -704 192 )
4 14 20 (-1024 -704 608 ) (-1024 -64 608 ) (-1024 -64 64 ) (-1024 -704 64 )
4 14 19 (-1024 -704 64 ) (-832 -704 64 ) (-832 -704 192 ) (-1024 -704 192 )
4 14 17 (-832 -704 192 ) (-832 -704 224 ) (-1024 -704 224 ) (-1024 -704 192 )
4 14 16 (-832 -704 224 ) (-832 -704 608 ) (-1024 -704 608 ) (-1024 -704 224 )
4 15 22 (-832 -1024 224 ) (-576 -1024 224 ) (-576 -1024 608 ) (-832 -1024 608 )
4 15 16 (-832 -704 608 ) (-832 -704 224 ) (-832 -1024 224 ) (-832 -1024 608 )
4 16 25 (-1024 -1024 608 ) (-1024 -1024 224 ) (-832 -1024 224 ) (-832 -1024 608 )
4 16 20 (-1024 -1024 224 ) (-1024 -1024 608 ) (-1024 -704 608 ) (-1024 -704 224 )
4 16 17 (-1024 -704 224 ) (-832 -704 224 ) (-832 -1024 224 ) (-1024 -1024 224 )
4 17 25 (-1024 -1024 224 ) (-1024 -1024 192 ) (-832 -1024 192 ) (-832 -1024 224 )
4 17 20 (-1024 -1024 192 ) (-1024 -1024 224 ) (-1024 -704 224 ) (-1024 -704 192 )
4 17 19 (-1024 -1024 192 ) (-1024 -704 192 ) (-832 -704 192 ) (-832 -1024 192 )
4 18 26 (-800 -1024 64 ) (-576 -1024 64 ) (-576 -1024 192 ) (-800 -1024 192 )
4 19 30 (-1024 -1024 192 ) (-1024 -1024 64 ) (-832 -1024 64 ) (-832 -1024 192 )
4 19 20 (-1024 -1024 64 ) (-1024 -1024 192 ) (-1024 -704 192 ) (-1024 -704 64 )
4 20 31 (-1024 -1024 64 ) (-1024 -1024 608 ) (-1600 -1024 608 ) (-1600 -1024 64 )
4 21 29 (0 -1216 192 ) (0 -1280 192 ) (-96 -1280 192 ) (-96 -1216 192 )
4 21 27 (0 -1088 192 ) (0 -1216 192 ) (-96 -1216 192 ) (-96 -1088 192 )
4 21 26 (-96 -1024 192 ) (0 -1024 192 ) (0 -1088 192 ) (-96 -1088 192 )
4 22 24 (-832 -1280 608 ) (-832 -1280 224 ) (-576 -1280 224 ) (-576 -1280 608 )
4 22 23 (-608 -1280 224 ) (-704 -1280 224 ) (-704 -1024 224 ) (-608 -1024 224 )
4 22 25 (-832 -1280 224 ) (-832 -1280 608 ) (-832 -1024 608 ) (-832 -1024 224 )
4 23 29 (-608 -1216 192 ) (-608 -1280 192 ) (-704 -1280 192 ) (-704 -1216 192 )
4 23 27 (-608 -1088 192 ) (-608 -1216 192 ) (-704 -1216 192 ) (-704 -1088 192 )
4 23 26 (-704 -1024 192 ) (-608 -1024 192 ) (-608 -1088 192 ) (-704 -1088 192 )
4 24 25 (-832 -1600 224 ) (-832 -1600 608 ) (-832 -1280 608 ) (-832 -1280 224 )
4 25 32 (-1024 -2048 608 ) (-1024 -2048 192 ) (-832 -2048 192 ) (-832 -2048 608 )
4 25 31 (-1024 -2048 192 ) (-1024 -2048 608 ) (-1024 -1024 608 ) (-1024 -1024 192 )
4 25 30 (-832 -2048 192 ) (-1024 -2048 192 ) (-1024 -1024 192 ) (-832 -1024 192 )
4 26 27 (-800 -1088 64 ) (0 -1088 64 ) (0 -1088 192 ) (-800 -1088 192 )
4 27 29 (-800 -1216 64 ) (0 -1216 64 ) (0 -1216 192 ) (-800 -1216 192 )
4 27 28 (-800 -1088 176 ) (-800 -1088 64 ) (-800 -1216 64 ) (-800 -1216 176 )
4 28 30 (-832 -1088 64 ) (-832 -1216 64 ) (-832 -1216 176 ) (-832 -1088 176 )
4 30 32 (-832 -2048 192 ) (-1024 -2048 192 ) (-1024 -2048 64 ) (-832 -2048 64 )
4 30 31 (-1024 -2048 64 ) (-1024 -2048 192 ) (-1024 -1024 192 ) (-1024 -1024 64 )
4 31 33 (-1024 -2048 64 ) (-1024 -2048 608 ) (-1600 -2048 608 ) (-1600 -2048 64 )
4 32 33 (-1024 -2048 608 ) (-1024 -2048 64 ) (-1024 -2176 64 ) (-1024 -2176 608 )
Loading

0 comments on commit 74f81a0

Please sign in to comment.