Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
267 commits
Select commit Hold shift + click to select a range
aa03e8f
Update iextern.cpp
XiadaOku Oct 4, 2020
f29ab47
Merge pull request #3 from XiadaOku/patch-2
Tstis Oct 4, 2020
f32f9dc
Update vangers_windows_64_build.yml
XiadaOku Oct 4, 2020
36bb54c
Update iextern.cpp
XiadaOku Oct 4, 2020
ff9d02d
Merge pull request #5 from XiadaOku/patch-4
Tstis Oct 4, 2020
8215f0e
Merge pull request #4 from XiadaOku/patch-3
Tstis Oct 4, 2020
96cc6e2
Update iextern.cpp
XiadaOku Oct 4, 2020
7af496a
Merge pull request #6 from XiadaOku/patch-1
Tstis Oct 4, 2020
6743d5c
Update vangers_windows_64_build.yml
Tstis Oct 6, 2020
70837c4
Update iextern.cpp
XiadaOku Oct 7, 2020
d816946
Update items.cpp
XiadaOku Oct 7, 2020
076b874
Merge pull request #9 from XiadaOku/patch-2
Tstis Oct 7, 2020
bfa8735
Merge pull request #8 from XiadaOku/patch-1
Tstis Oct 7, 2020
2e1fce0
traincross
Tstis Oct 7, 2020
5e96f8c
Update items.cpp
Tstis Oct 7, 2020
4946300
Update items.cpp
Tstis Oct 7, 2020
12f25c0
Update items.cpp
Tstis Oct 7, 2020
dd0d34c
downgrade items.cpp
Tstis Oct 7, 2020
45df8b1
traincross second try
Tstis Oct 7, 2020
ddec9bf
raffa run 2.0
Tstis Oct 7, 2020
d23efcb
hotfix RR2.0
Tstis Oct 7, 2020
0547f4e
hotfix RR2.0 №2
Tstis Oct 7, 2020
af8ceb5
Update items.cpp
Tstis Oct 7, 2020
f63dd87
1+1 mission, deleted RR2.0
Tstis Oct 7, 2020
5330055
Update iextern.cpp
Tstis Oct 7, 2020
d6826a8
ponimau
Tstis Oct 7, 2020
faa8a86
pmission
Tstis Oct 7, 2020
c3bb61f
beach
Tstis Oct 7, 2020
43f3984
bich plyajjjb
Tstis Oct 7, 2020
711e105
Update items.cpp
Tstis Oct 7, 2020
985419c
9I DoJI6oe6
Tstis Oct 7, 2020
6a8a112
Update items.cpp
XiadaOku Oct 7, 2020
c403eb7
Update items.cpp
Tstis Oct 7, 2020
68647c8
Satina
Tstis Oct 10, 2020
22a9668
Satina
Tstis Oct 10, 2020
403058a
Satinan*
Tstis Oct 10, 2020
156c9eb
fix satinan
Tstis Oct 10, 2020
3658f50
fix travel
Tstis Oct 10, 2020
ce0fe04
aibat
Tstis Oct 11, 2020
fd8eec2
aibat
Tstis Oct 11, 2020
5e96dfb
aibatr
Tstis Oct 11, 2020
1a1e86d
UniVang Reboot
Tstis Oct 11, 2020
7370dfe
fixesssss
Tstis Oct 11, 2020
f239c73
Update univang.cpp
Tstis Oct 11, 2020
fc1725e
stad3la
Tstis Oct 11, 2020
e0f513b
mega mechosoma
Tstis Oct 11, 2020
697089e
super van-war
Tstis Oct 11, 2020
7feb8db
Update server.cpp
Tstis Oct 12, 2020
9bd32ae
Update server.cpp
Tstis Oct 12, 2020
c47b198
Update server.cpp
Tstis Oct 12, 2020
0945572
new mods
Tstis Oct 12, 2020
a4fb55b
Update items.cpp
Tstis Oct 12, 2020
56ce025
Update items.cpp
Tstis Oct 12, 2020
787f72a
new mods
Tstis Oct 12, 2020
f9ff85c
Update items.cpp
Tstis Oct 12, 2020
c4c3a84
huntage-sim
Tstis Oct 12, 2020
19dc74a
Update items.cpp
Tstis Oct 12, 2020
353394d
Update items.cpp
Tstis Oct 12, 2020
2fc5d5f
huntage-sim
Tstis Oct 12, 2020
cb66cce
huntage-sim
Tstis Oct 12, 2020
5a467be
huntage-sim
Tstis Oct 12, 2020
0a6f0f0
Update items.cpp
Tstis Oct 12, 2020
86e7b53
Hy DaBau
Tstis Oct 12, 2020
1d81ec7
Update items.cpp
XiadaOku Oct 12, 2020
98c2483
Update items.cpp
XiadaOku Oct 12, 2020
c6c7edb
Merge pull request #10 from KranX/master
XiadaOku Oct 12, 2020
0dafe88
Update items.cpp
XiadaOku Oct 12, 2020
166cc14
Update items.cpp
Tstis Oct 13, 2020
f5c441a
Update items.cpp
Tstis Oct 13, 2020
9253e15
Update items.cpp
Tstis Oct 13, 2020
fce5fcc
Update items.cpp
Tstis Oct 13, 2020
1c41c0a
Update items.cpp
Tstis Oct 13, 2020
60cb7be
Update items.cpp
XiadaOku Oct 14, 2020
836a1ed
Update items.cpp
XiadaOku Oct 14, 2020
510271f
Update univang.cpp
Tstis Oct 14, 2020
fecbb6e
Update univang.cpp
Tstis Oct 14, 2020
a3de90f
Update univang.cpp
Tstis Oct 14, 2020
05b4b6c
Update univang.cpp
Tstis Oct 14, 2020
5fba505
Update univang.cpp
Tstis Oct 14, 2020
664cb2e
Update univang.cpp
XiadaOku Oct 17, 2020
6c8973b
Update vangers_windows_64_build.yml
Tstis Oct 17, 2020
4b3d1d0
Update vangers_windows_32_build.yml
Tstis Oct 17, 2020
51cb30b
speed konoval
Tstis Oct 17, 2020
59a50db
lens test
Tstis Oct 18, 2020
094a07c
Update items.cpp
Tstis Oct 18, 2020
7b264d9
lens mods
Tstis Oct 18, 2020
257b9a7
battle for hmok
Tstis Oct 18, 2020
2b6aee4
test
Tstis Oct 25, 2020
154eff4
vozvrat, among vangers, eleerection-sim
Tstis Oct 30, 2020
72399f2
Restore
Tstis Nov 2, 2020
24c2385
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
Tstis Nov 2, 2020
5a34d00
Little fix
Tstis Nov 2, 2020
8d459c8
Update vangers_windows_64_build.yml
XiadaOku Nov 2, 2020
c64d9c6
Update vangers_windows_32_build.yml
XiadaOku Nov 2, 2020
c4cc2da
1 final test (1.03)
Tstis Nov 2, 2020
6824613
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
Tstis Nov 2, 2020
7b437c3
fix new soup
Tstis Nov 2, 2020
97c1111
ok
Tstis Nov 2, 2020
ca04b3a
idk
XiadaOku Nov 2, 2020
1c70d68
щл
XiadaOku Nov 2, 2020
7bdab0a
bullet run
Tstis Nov 3, 2020
36d1105
тстис лять...
XiadaOku Nov 3, 2020
83ea946
счастливчик)
Tstis Nov 3, 2020
02323d9
спобсность
Tstis Nov 3, 2020
24337d8
travel update
Tstis Nov 4, 2020
88e858e
game_name fix (first try)
Tstis Nov 5, 2020
a7481b3
Update mechos.cpp
XiadaOku Nov 5, 2020
56ae847
Update mechos.cpp
XiadaOku Nov 5, 2020
2dd0090
гипермаякчернозем|раффарансим
Tstis Nov 5, 2020
e39e670
test soka xiadu
Tstis Nov 5, 2020
820ecac
Update mechos.cpp
XiadaOku Nov 6, 2020
bf73fdc
Update univang.cpp
XiadaOku Nov 8, 2020
5daa6ae
aibatr, not wiring
Tstis Nov 9, 2020
298f2a2
Disabled "Error in Compas Target Open" error handling for teleport on…
XiadaOku Nov 14, 2020
a764646
test tankacide-run
Tstis Nov 16, 2020
d2367f7
Update actint.cpp
XiadaOku Nov 16, 2020
898dcd2
Update iextern.cpp
XiadaOku Nov 16, 2020
8b2055b
Update items.cpp
XiadaOku Nov 16, 2020
39acf30
Update mechos.cpp
XiadaOku Nov 16, 2020
3e1a277
tankacide-run test
Tstis Nov 18, 2020
b43d6d8
final 1.03
Tstis Nov 18, 2020
3b710af
Update vangers_windows_32_build.yml
Tstis Nov 30, 2020
aebb802
Merge pull request #1 from KranX/master
XiadaOku Nov 30, 2020
4980360
bot from cx test
Tstis Dec 14, 2020
35d58fc
downgrade
Tstis Dec 14, 2020
06193a9
бля хочу царя горы сделать, па приколу, вдруг получчится
Tstis Dec 19, 2020
c38a807
скобку забыл........
Tstis Dec 19, 2020
27d20f0
работай жпжпжпжп
Tstis Dec 19, 2020
cf9f7a0
passave test
Tstis Dec 19, 2020
ef161be
passave
Tstis Dec 20, 2020
83e0a5c
2
Tstis Dec 20, 2020
4aa8f9d
телепорт в passave теперь не будет руинить игру (всмысле спавн из эск…
Tstis Dec 20, 2020
f92d2c8
Update optimize.cpp
Tstis Dec 20, 2020
8450763
test
Tstis Jan 15, 2021
a5a5008
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
Tstis Jan 15, 2021
0564c5b
Update iextern.cpp
Tstis Jan 15, 2021
33659ca
Merge branch 'master' of https://github.com/KranX/Vangers into KranX-…
XiadaOku Jan 15, 2021
c0b92de
Merge branch 'KranX-master' into M4D
XiadaOku Jan 15, 2021
e8884fc
Update iscreen.cpp
XiadaOku Jan 15, 2021
c80e95b
Update iextern.cpp
Tstis Jan 18, 2021
9c6b512
Merge pull request #5 from XiadaOku/patch-6
Tstis Jan 22, 2021
8ffe6ec
Merge pull request #6 from KranX/master
XiadaOku Jan 22, 2021
786e4b5
названия модов на русском
Tstis Feb 5, 2021
4f90277
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
Tstis Feb 5, 2021
1a8f6eb
Update iextern.cpp
Tstis Feb 5, 2021
d6d39b5
Update iextern.cpp
Tstis Feb 5, 2021
99df179
Update items.cpp
Tstis Feb 7, 2021
37845c6
ny rabotai
Tstis Feb 7, 2021
2e7f79c
a teper'?
Tstis Feb 7, 2021
64bb4cd
2
Tstis Feb 7, 2021
d32eaa1
Update univang.cpp
Tstis Feb 7, 2021
d204c52
Update univang.cpp
Tstis Feb 7, 2021
33cabbc
Update ascr_fnc.cpp
Tstis Feb 7, 2021
1a7b97c
Update ascr_fnc.cpp
Tstis Feb 7, 2021
7c78915
Merge branch 'master' of https://github.com/KranX/Vangers into KranX-…
XiadaOku Feb 7, 2021
83fd845
Merge branch 'KranX-master' into M4D
XiadaOku Feb 7, 2021
755ce41
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
XiadaOku Feb 7, 2021
8ee10b2
da
Tstis Feb 7, 2021
74805f1
return to monke
XiadaOku Feb 7, 2021
8858299
aaaaaaaaAAAAAAAAAAAAAAAAa
XiadaOku Feb 7, 2021
ea6e777
return to monke
XiadaOku Feb 7, 2021
e52fe6e
popitka 64
Tstis Feb 8, 2021
235cbe5
shit + t удалил
Tstis Feb 9, 2021
39be68f
menu
Tstis Feb 19, 2021
03c20b3
Merge pull request #9 from KranX/master
Tstis Feb 19, 2021
0d4d7e5
accounting escave for goods delivery, accounting purchase/sale of goods
XiadaOku Feb 21, 2021
73a26d9
Update menu
Tstis Feb 21, 2021
d96e091
server turn off with games, but have 0 players/clients
Tstis Feb 21, 2021
d4c367c
pseudo commands
Tstis Feb 21, 2021
8d2ac6c
triacxlon
Tstis Feb 21, 2021
ba76b86
update statistic
Tstis Feb 21, 2021
3bedf8a
reupload statistic and menu
Tstis Feb 21, 2021
02a3866
delete macos build
Tstis Feb 21, 2021
e18cbf8
тот самый файл, который забыл.
Tstis Feb 21, 2021
9cd361d
Merge pull request #11 from XiadaOku/patch-7
Tstis Feb 21, 2021
4b9bd6a
fixed crash in passembloss
XiadaOku Feb 21, 2021
03a8e6c
Merge pull request #12 from XiadaOku/patch-8
Tstis Feb 21, 2021
8f58199
added english menu
Tstis Feb 22, 2021
2e7f61d
strings for menu (english)
Tstis Feb 22, 2021
2393715
fix statistic (again)
Tstis Feb 25, 2021
8899b44
statistics (privet xiada), menu changes.
Tstis Feb 26, 2021
56cddb4
english and russian menu in 1 mainmenu.scr
Tstis Feb 26, 2021
f7fe418
delete 2 checks from vozrat
Tstis Feb 26, 2021
2f85f6e
Merge pull request #13 from XiadaOku/patch-8
Tstis Feb 27, 2021
85c48b3
Update strings.inc
Tstis Feb 28, 2021
9c77c9a
Update iscr_fnc.cpp
Tstis Feb 28, 2021
ad86741
КСИАДА, ТВОЮ МАТЬ, Я НАПИСАЛ 44 И ВСЁ РАБОТАЕТ. ХУЛИ ТЫ МНЕ МОЗГИ ЕБА…
Tstis Mar 2, 2021
b9345d5
update menu 05.03.2021
Tstis Mar 5, 2021
659ca43
PortStrID on INet Host screen
Tstis Mar 5, 2021
48e7a36
Update mainmenu.scr
Tstis Mar 5, 2021
4148bfe
/z and /s
Tstis Mar 5, 2021
05bc4f4
dopustim
Tstis Mar 6, 2021
8740b7a
Merge pull request #14 from KranX/master
Tstis Mar 6, 2021
b3312b4
Update univang.cpp
Tstis Mar 6, 2021
043eccf
УДАЛЕНИЕ ЛИШНЕГО
Tstis Mar 19, 2021
01b7830
полировка меню
Tstis Mar 19, 2021
2715f87
Вывод версии мода в консоль
Tstis Mar 19, 2021
f444628
своя динам. палитра для бани элипода
Tstis Mar 19, 2021
30c8224
Ксиада не бей.
Tstis Mar 19, 2021
dc3ceac
фикс ксиады (который для мьюта чата)
Tstis Mar 19, 2021
9327fed
закоментирован автостарт после переклички
Tstis Mar 19, 2021
c5b5be4
куегкт ещ щчшвшяу ьщтл
Tstis Mar 19, 2021
7cb1f95
ызкщиф2
Tstis Mar 19, 2021
d9de06e
ПОЛНЫЙ ДАУУУУУУУУУУУУУУНГРЕЕЕЕЕЕЕЕЕЕЕЙ ДД
Tstis Mar 19, 2021
9d3bf43
Merge branch 'master' of https://github.com/KranX/Vangers into M4D
Tstis Mar 19, 2021
6317dff
мда уж, я запутался. Но теперь нормально должно быть.
Tstis Mar 19, 2021
668ed96
я починил скриншот
Tstis Mar 19, 2021
93c4aa1
что-то грядёт.
Tstis Oct 26, 2021
c3ce34b
пропихиваем пулл.
Tstis Nov 12, 2021
239230c
возвращение М4Д. Часть 1.
Tstis Nov 12, 2021
f32ec50
меню, ебаный рот!
Tstis Nov 12, 2021
8dfd477
Возвращение М4Д. Часть 2.
Tstis Nov 12, 2021
ba40878
Возвращение М4Д. Часть 3. Финал.
Tstis Nov 12, 2021
8d86aae
ФИКС СТРОК ПАССА!
Tstis Nov 12, 2021
273be77
Merge branch 'master' of https://github.com/KranX/Vangers into Kranx-…
XiadaOku Nov 12, 2021
5e6f788
Merge branch 'KranX-master' into M4D
XiadaOku Nov 12, 2021
f89bc7d
Update actint.cpp
Tstis Nov 12, 2021
2f80c5d
casting start string value to char pointer
XiadaOku Nov 12, 2021
fb751d7
added ifndef _SURMAP_ in modded files from src/3d
XiadaOku Nov 12, 2021
a726525
moved "&&" in ifndef
XiadaOku Nov 12, 2021
e6623e7
moved palette_name before ifndef _SURMAP_
XiadaOku Nov 12, 2021
e87ebd1
восстановление меню.
Tstis Nov 13, 2021
4b0d7e6
фикс кодировок для перехода на другие миры
Tstis Nov 13, 2021
5961707
хня какая-то, наверное помогло в работе с меню
Tstis Nov 13, 2021
ce7e93d
полноценная перекличка (из мира)
Tstis Nov 13, 2021
f5bc5fb
исправление фигни, связанной с перекличкой
Tstis Nov 13, 2021
964b415
возможность выбрать 1 из 4 циклов добы
Tstis Nov 13, 2021
03e7c51
небольшой фикс для сингла, связанный со спамом "СТАРТ".
Tstis Nov 13, 2021
970c204
rollcall from chat'n'world (test)
XiadaOku Nov 13, 2021
61dfe0f
forgor to specify elements type in vector
XiadaOku Nov 13, 2021
a03c778
added color to MessageDispatcher::send arguments
XiadaOku Nov 13, 2021
aa298da
маленькие изменения.
Tstis Nov 13, 2021
eee5039
Merge branch 'M4D' of https://github.com/Tstis/Vangers into M4D
XiadaOku Nov 13, 2021
3378c2f
removed default argument from func in header
XiadaOku Nov 13, 2021
62393ce
")"
XiadaOku Nov 13, 2021
c8a7ae5
not gonna comment on this anymore
XiadaOku Nov 13, 2021
5d28569
fixed crashes
XiadaOku Nov 13, 2021
a472481
убрал принудительные деньги для некоторых ван-варов
Tstis Nov 20, 2021
0f23161
приколы
Tstis Nov 20, 2021
92f958a
Update network.cpp
Tstis Nov 20, 2021
06dea19
всякая менюшная всячина и бесовщина с координатами.
Tstis Nov 20, 2021
49fec96
замена хд текстурек
Tstis Nov 20, 2021
0960e3c
Merge pull request #20 from Aidoneus/master
Tstis Nov 20, 2021
b5aec02
Update road.cpp
Tstis Nov 21, 2021
9e1db88
Update mainmenu.inc
Tstis Nov 21, 2021
6f5e611
Update network.cpp
Tstis Nov 21, 2021
36604f7
Update network.cpp
Tstis Nov 21, 2021
00a7252
Merge branch 'KranX:master' into M4D
Tstis Nov 21, 2021
a1136a2
Merge pull request #21 from Tstis/M4D-1.05
Tstis Nov 21, 2021
8b8ec14
a
XiadaOku Mar 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions data/data/Inventory.text

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/data/Threall.text
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"�� ����� ������. �� �������� ���� ��������. "
"��� ��� �������� ������� ����������. ����� �������. �� ����� ������ ���� ���. "
"�� - �������� ������ �������� �� ������� ����. �� �� ����� � ��� ������ ���� - �� ������. "
"�� �� �����, ��� ����� ������� ��� ���������� ������ ��������-3/8. �� ������ ������ ���� ���. "
"�� �� �����, ��� ����� ������� ��� ���������� ������ ��������-3/8 ����������� M4D. �� ������ ������ ���� ���. "
"�� ������� ��������� ���� � ����� �� � ������� ����� �������. ������ ��� - ���������. "
"�� ������� � ���� ���. �������� �����������. "
"��, ��� �� ��������� � ����� ��� ������, ����� �����. �� ������ ������. �� �� ������ ��� �������. "
Expand Down
Binary file modified data/diagen.text
Binary file not shown.
Binary file modified data/diagen_eng.text
Binary file not shown.
182 changes: 91 additions & 91 deletions data/iscreen/scripts/cr3.inc
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@
Screen "Credits5"
{
screen_offs 0
block_global_obj
default_obj "Back Option"
Object "Credits Text"{
null_level 200
align_x center
y 110
space 2
font 0
s_text $iSTR_CreditsPathF
}
Object "Back Option"
{
align_x right
align_x_offs 30
y 30
Element STRING {
align_x center
terrain_num $TERRAIN2
font 3
space 2
null_level $DEFAULT_NULL
string $iSTR_BACK
}
Event {
key $VK_LBUTTON
key $VK_ESCAPE
time { $PRESS_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
low_obj "Back Option"
time $PRESS_OBJ_TIME
start_time 0
}
EvComm {
move2screen "Credits screen"
start_time $PRESS_OBJ_TIME
time $MOVE2SCREEN_TIME
}
}
Event {
key $VK_RBUTTON
time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
smooth_obj "Back Option" 2
start_time 0
time $SMOOTH_OBJ_TIME
}
EvComm {
hide_obj "Back Option"
start_time $SMOOTH_OBJ_TIME
time $HIDE_OBJ_TIME
}
EvComm {
move2screen "Credits screen"
start_time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME }
time $MOVE2SCREEN_TIME
}
}
}
#define LOGO_OBJ_ID "Logo1"
Object "Logo1" {
align_x center
y 10
Element BITMAP {
align_x center
align_y center
terrain_num $TERRAIN4
bmp_null_level 148
null_level 128
bmp_file "resource/iscreen/bitmap/community.bmp"
}
$LOGO_EV
}
}

Screen "Credits5"
{
screen_offs 0

block_global_obj
default_obj "Back Option"

Object "Credits Text"{
null_level 200
align_x center
y 110
space 2

font 0
s_text $iSTR_CreditsPathF
}

Object "Back Option"
{
align_x right
align_x_offs 30
y 30

Element STRING {
align_x center

terrain_num $TERRAIN2

font 3
space 2
null_level $DEFAULT_NULL
string $iSTR_BACK
}
Event {
key $VK_LBUTTON
key $VK_ESCAPE

time { $PRESS_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
low_obj "Back Option"
time $PRESS_OBJ_TIME
start_time 0
}
EvComm {
move2screen "Credits screen"
start_time $PRESS_OBJ_TIME
time $MOVE2SCREEN_TIME
}
}
Event {
key $VK_RBUTTON

time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME + $MOVE2SCREEN_TIME + 1 }
EvComm {
smooth_obj "Back Option" 2
start_time 0
time $SMOOTH_OBJ_TIME
}
EvComm {
hide_obj "Back Option"
start_time $SMOOTH_OBJ_TIME
time $HIDE_OBJ_TIME
}
EvComm {
move2screen "Credits screen"
start_time { $SMOOTH_OBJ_TIME + $HIDE_OBJ_TIME }
time $MOVE2SCREEN_TIME
}
}
}
#define LOGO_OBJ_ID "Logo1"
Object "Logo1" {
align_x center
y 10

Element BITMAP {
align_x center
align_y center

terrain_num $TERRAIN4

bmp_null_level 148
null_level 128

bmp_file "resource/iscreen/bitmap/community.bmp"
}
$LOGO_EV
}
}

Loading