Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Major rework 1.8.0 #20

Merged
merged 229 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
229 commits
Select commit Hold shift + click to select a range
b132e39
update gitignore
tuntematonjr Nov 20, 2023
da6ba9a
rename data
tuntematonjr Nov 20, 2023
f8bf1e8
case sensitivy
tuntematonjr Nov 20, 2023
db6283a
asd
tuntematonjr Nov 20, 2023
f7f2dc9
case sensitive
tuntematonjr Nov 20, 2023
45d8bf8
initial hemtt version
tuntematonjr Dec 27, 2023
dbf4468
minor hemtt build fixes
tuntematonjr Dec 27, 2023
f5a7c5a
update briefing info
tuntematonjr Dec 27, 2023
8dd834d
update TP dialog
tuntematonjr Dec 27, 2023
fac14d9
dont add check tickets, when no tickets in use
tuntematonjr Dec 27, 2023
cec0771
fix values not being rounded
tuntematonjr Dec 27, 2023
6fffad2
delete some unused shit
tuntematonjr Dec 27, 2023
5f48c04
removed unsude things
tuntematonjr Jan 10, 2024
ffbb1e0
Global function for remaining time notification
tuntematonjr Jan 11, 2024
2f8d93c
Update to use hashs
tuntematonjr Jan 11, 2024
f463105
misc
tuntematonjr Jan 11, 2024
ca18d06
add wait so cba settings are added
tuntematonjr Jan 11, 2024
d0e8a1f
stringtable fix
tuntematonjr Jan 11, 2024
07d3950
Remove different font
tuntematonjr Jan 11, 2024
003c3f5
fix timer
tuntematonjr Jan 11, 2024
2551ba1
fix waiting area text
tuntematonjr Jan 11, 2024
e58d2eb
Comments & tweaks
tuntematonjr Jan 11, 2024
e46a05f
fix missing include
tuntematonjr Jan 11, 2024
48e503d
auto run test mission
tuntematonjr Jan 11, 2024
7f7e897
tickets to hash
tuntematonjr Jan 12, 2024
8077f2a
Rename function
tuntematonjr Jan 12, 2024
171fa41
Rename function
tuntematonjr Jan 12, 2024
d509bb8
Add function to set side tickets
tuntematonjr Jan 12, 2024
cb9e3fa
Update function name
tuntematonjr Jan 12, 2024
805375e
New get side ticket count function
tuntematonjr Jan 12, 2024
50e4bda
Rename function
tuntematonjr Jan 12, 2024
675fe8c
Add tickest to respawn waiting area text
tuntematonjr Jan 12, 2024
d6bbaa0
Waiting area stuff to hashmap
tuntematonjr Jan 12, 2024
4344f11
Respawn enabled moved to hash
tuntematonjr Jan 12, 2024
422f31c
optimize localize
tuntematonjr Jan 12, 2024
ff9b888
Rename function
tuntematonjr Jan 12, 2024
380b266
rename function
tuntematonjr Jan 12, 2024
42bbc17
Rename function
tuntematonjr Jan 12, 2024
788b21b
Update description
tuntematonjr Jan 12, 2024
47919a5
Add god mode to teleport
tuntematonjr Jan 12, 2024
8294d81
Function update
tuntematonjr Jan 12, 2024
51accfb
Update description
tuntematonjr Jan 12, 2024
dc9be43
Rename respawn
tuntematonjr Jan 12, 2024
778252e
update function name
tuntematonjr Jan 12, 2024
88171bf
Rename function
tuntematonjr Jan 12, 2024
c2d2b11
typofix
tuntematonjr Jan 12, 2024
92e3927
typofix
tuntematonjr Jan 12, 2024
b8ce3a9
tweaks
tuntematonjr Jan 12, 2024
25b7ea1
split respawn unit part
tuntematonjr Jan 12, 2024
55937b0
Add tickets to respawn text and sounds
tuntematonjr Jan 12, 2024
54b2932
Force respawn for single unit
tuntematonjr Jan 12, 2024
956d66c
Add contest area markers
tuntematonjr Jan 12, 2024
686fedb
Renaming
tuntematonjr Jan 18, 2024
2fc4512
Rename function
tuntematonjr Jan 18, 2024
a8350d9
Rename function
tuntematonjr Jan 18, 2024
2db02b3
rename function
tuntematonjr Jan 18, 2024
f8ec623
rename function
tuntematonjr Jan 18, 2024
c3514a9
update function name
tuntematonjr Jan 18, 2024
c448cf7
update function name
tuntematonjr Jan 18, 2024
d2396ab
update function name
tuntematonjr Jan 18, 2024
116be70
function renamings & minor tweaks
tuntematonjr Jan 18, 2024
bf1ba95
hash life
tuntematonjr Jan 18, 2024
8c2f4ea
update contested check to be called with side
tuntematonjr Jan 18, 2024
eab64af
Add right icon
tuntematonjr Jan 18, 2024
48ee749
Variable cleaning
tuntematonjr Feb 3, 2024
de5295b
Fix who to notify
tuntematonjr Feb 3, 2024
54267f6
Fix name
tuntematonjr Feb 3, 2024
5a6f776
Updated strings
tuntematonjr Feb 3, 2024
c5cd7d8
Merged functions
tuntematonjr Feb 3, 2024
17f3501
added EHs
tuntematonjr Feb 3, 2024
d58d11a
Disable msp check tickes, when not using them
tuntematonjr Feb 3, 2024
26483d4
Cleaning
tuntematonjr Feb 3, 2024
568ccf6
Allow enabling side to spectate
tuntematonjr Feb 3, 2024
a9ab1cf
Fix missing side for spawned msps
tuntematonjr Feb 3, 2024
c702d51
ReDesing contested check. again.
tuntematonjr Feb 3, 2024
0727e45
Fix missing publicvariables
tuntematonjr Feb 3, 2024
da56ee7
Additional check to prevent running at wrong respawn mode
tuntematonjr Feb 3, 2024
59d6fcc
rename tunres_respawn_fnc_update_respawn_point -> tunres_respawn_fnc_…
tuntematonjr Feb 24, 2024
0bd6d34
cleanup
tuntematonjr Feb 24, 2024
c3d72de
Rename functions
tuntematonjr May 23, 2024
facf136
Check contest area during briefing
tuntematonjr May 23, 2024
1b25d99
Add contest area check & minor fiexes
tuntematonjr May 23, 2024
0558de2
renaming fnc
tuntematonjr May 23, 2024
528d935
renaming fnc and fix typos
tuntematonjr May 23, 2024
3b9c6ac
marker name macro
tuntematonjr May 23, 2024
caf0ec7
AAR Events
tuntematonjr May 23, 2024
5a55663
add ace action to check contest status
tuntematonjr May 23, 2024
929b954
contest area check create marker fnc
tuntematonjr May 23, 2024
ba82705
Use marker name macro
tuntematonjr May 23, 2024
f7744f1
Add flag pole hash
tuntematonjr May 23, 2024
a20ce5e
fix module names
tuntematonjr May 23, 2024
b5f484c
Module additions
tuntematonjr May 23, 2024
9449ee2
fix variables
tuntematonjr May 23, 2024
acb426c
Clean stringtable & briefing
tuntematonjr Jun 13, 2024
6e60073
Unify and add missing roundings
tuntematonjr Jun 13, 2024
17636b7
fix wrong variable name
tuntematonjr Jun 13, 2024
c20af9f
Fix missing contest area marker deleting
tuntematonjr Jun 13, 2024
c2a2e9e
Change hash systems
tuntematonjr Jun 14, 2024
c20a7c9
Change to use existing function
tuntematonjr Jun 14, 2024
58df427
Now actually add/remove units from unit list
tuntematonjr Jun 14, 2024
618909c
Fix overlapping feature with other function
tuntematonjr Jun 14, 2024
d2b2c78
Use hashs macros
tuntematonjr Jun 14, 2024
8a5f300
Update header
tuntematonjr Jun 14, 2024
c5ba1b2
Remove useless variable definition
tuntematonjr Jun 14, 2024
405cacf
Tweak some variable usage
tuntematonjr Jun 14, 2024
0079b1c
Update stringtable
tuntematonjr Jun 14, 2024
a4d1aa5
Tweak variable usage
tuntematonjr Jun 14, 2024
0fb608b
Single variable notification
tuntematonjr Jun 14, 2024
488cf38
Single variable notification pt2
tuntematonjr Jun 14, 2024
b8d9504
Single variable notification pt2
tuntematonjr Jun 14, 2024
460f2ec
Fix wrong time for delayed respawn
tuntematonjr Jun 14, 2024
33070f8
Fix time for delayed respawn
tuntematonjr Jun 14, 2024
a5ee691
Merge functio to one
tuntematonjr Jun 15, 2024
1ff3285
Add check to not run this if not enabled
tuntematonjr Jun 15, 2024
658e40d
Add system to handle respawning in respawn
tuntematonjr Jun 15, 2024
ad6fba0
Convert to use stringtable and unified variable naming
tuntematonjr Jun 15, 2024
6802dd6
Cleaning
tuntematonjr Jun 15, 2024
a2a949d
Add filttering both respawn list
tuntematonjr Jun 15, 2024
e0ddf49
Fix god mode during TP/Respawn
tuntematonjr Jun 15, 2024
8a8db74
Cleaned variables and info text system
tuntematonjr Jun 15, 2024
0f12cec
Template is not needed
tuntematonjr Jun 15, 2024
5b3bde8
Update .gitignore
tuntematonjr Jun 15, 2024
b791d7a
Delete addons/msp/functions/pohja.sqf
tuntematonjr Jun 15, 2024
a1737d6
Delete addons/respawn/functions/pohja.sqf
tuntematonjr Jun 15, 2024
7772861
Update
tuntematonjr Jun 15, 2024
f8212e9
add fnc to clients get tickets remaining
tuntematonjr Jun 16, 2024
474a366
Fix wrong variable usage
tuntematonjr Jun 16, 2024
465470a
Move hash creating to preinit
tuntematonjr Jun 16, 2024
d60673b
Change to use fnc made for changing ticket counts
tuntematonjr Jun 16, 2024
0e63882
Stupid way to send player tickets to players whitout whole sending wh…
tuntematonjr Jun 16, 2024
0fe96dc
Fix typos
tuntematonjr Jun 16, 2024
1b53d34
Change to use the FNC for this
tuntematonjr Jun 16, 2024
ab2d051
Remove debug
tuntematonjr Jun 16, 2024
5555fd0
Fix deleting multiple PFH for respawning while being at respawn
tuntematonjr Jun 16, 2024
4f1c01e
Comments
tuntematonjr Jun 16, 2024
dc0e2e7
Update waitingListupdating
tuntematonjr Jun 16, 2024
bce4d17
update hash variable names to include hahs
tuntematonjr Jun 16, 2024
8dfaf4e
fix variable
tuntematonjr Jun 16, 2024
1e7cc3c
Fix respawn spectator modes&sides
tuntematonjr Jun 16, 2024
df1e159
Logs
tuntematonjr Jun 16, 2024
241587e
Create sqflint.yml
tuntematonjr Aug 8, 2024
88ee9b2
Fix ace action conditions
tuntematonjr Aug 31, 2024
782cd71
update versions
tuntematonjr Aug 31, 2024
0d2e484
test logs to aar macros
tuntematonjr Aug 31, 2024
0205c9b
Hemtt auto convert cases
tuntematonjr Sep 3, 2024
f15fcc0
positions to ASL positions
tuntematonjr Sep 3, 2024
b85acd2
Revert mass change error
tuntematonjr Sep 3, 2024
2b8251d
case sensivity
tuntematonjr Sep 3, 2024
0aa5d0d
split cba settings to include
tuntematonjr Sep 4, 2024
e58a7ef
split cfg vehicles to include
tuntematonjr Sep 4, 2024
82d02c9
add sevrver preinit
tuntematonjr Sep 4, 2024
dfe825f
Not sure if this does anything
tuntematonjr Sep 4, 2024
78a75fc
add player param for AAR
tuntematonjr Sep 4, 2024
21ea498
use macro
tuntematonjr Sep 4, 2024
e9ea24f
fix missing macro and make it simpler
tuntematonjr Sep 4, 2024
f6066b9
show actual remaining time
tuntematonjr Sep 4, 2024
dd99ce0
Make AAR use cba events
tuntematonjr Sep 4, 2024
7f30c2c
update to support new notification system
tuntematonjr Sep 5, 2024
1e63ccf
prevent headless
tuntematonjr Sep 5, 2024
a5bcd04
Notifications use events now
tuntematonjr Sep 5, 2024
4f2e540
change base event to main
tuntematonjr Sep 5, 2024
46ec2a3
Colors are easier to read
tuntematonjr Sep 5, 2024
029090c
make update respawn point to use event
tuntematonjr Sep 5, 2024
4051a39
start contested check uses event now
tuntematonjr Sep 5, 2024
371d229
start spectator uses EH now
tuntematonjr Sep 5, 2024
41b3222
updateWaitingRespawnList uses eh now
tuntematonjr Sep 5, 2024
eaa66db
respawnUnit uses event
tuntematonjr Sep 5, 2024
a808a7d
stylepoints 6/5
tuntematonjr Sep 5, 2024
b229741
Tweak wording
tuntematonjr Sep 8, 2024
2613ffb
New aar events for forced things
tuntematonjr Sep 8, 2024
069438a
split counting respawn to own fnc
tuntematonjr Sep 8, 2024
9db465e
add forced units to counted respawns
tuntematonjr Sep 8, 2024
c38424c
make some variables only for server
tuntematonjr Sep 8, 2024
bb90d1c
fix wrong position type
tuntematonjr Sep 8, 2024
49331de
debug logs to macros
tuntematonjr Sep 8, 2024
8165846
clean
tuntematonjr Sep 8, 2024
f7cafd6
fix macros
tuntematonjr Sep 8, 2024
786dd86
Split stringtables
tuntematonjr Sep 18, 2024
edd3648
not working
tuntematonjr Sep 18, 2024
f97215a
convert to use macro stringtable
tuntematonjr Sep 18, 2024
9246cfa
Cleaning
tuntematonjr Sep 18, 2024
5479d52
update cba settings to use Time instead slider
tuntematonjr Sep 18, 2024
17527c3
fix macro
tuntematonjr Sep 18, 2024
a5140b9
fix conflicting variables
tuntematonjr Sep 22, 2024
2ff9eed
macro
tuntematonjr Sep 22, 2024
ac01a4b
fix string macros
tuntematonjr Sep 22, 2024
6b09a67
fix time slider & macros
tuntematonjr Sep 23, 2024
b37f53e
fix wrong locality for hash
tuntematonjr Sep 23, 2024
098e41e
cleaning
tuntematonjr Sep 24, 2024
ba1d78c
update params
tuntematonjr Sep 24, 2024
509d5ff
remove wrongly placed event
tuntematonjr Sep 24, 2024
ee2c404
show build version at briefing
tuntematonjr Sep 24, 2024
09e604b
cleaning
tuntematonjr Sep 24, 2024
b671035
Remove test log
tuntematonjr Sep 24, 2024
b441faa
add check for objnull
tuntematonjr Sep 24, 2024
b803884
use right cba function
tuntematonjr Sep 24, 2024
5919978
move events to postInit
tuntematonjr Sep 24, 2024
c6a557c
fix broken file
tuntematonjr Sep 24, 2024
eac7a9b
Fix briefing wave time
tuntematonjr Sep 24, 2024
d544ad8
test logs
tuntematonjr Sep 24, 2024
4e96cdb
Update script_version.hpp
tuntematonjr Sep 24, 2024
ed42a66
Fix aar enabled check
tuntematonjr Sep 24, 2024
964c78a
prevent text flickering
tuntematonjr Sep 24, 2024
e6cc212
use cutText
tuntematonjr Sep 24, 2024
5a917ac
run only for clients
tuntematonjr Sep 24, 2024
b6b7b85
Fix missing stringtable entry
tuntematonjr Sep 24, 2024
637ad68
Update script_version.hpp
tuntematonjr Sep 24, 2024
878da78
fix force respawn reset time
tuntematonjr Sep 30, 2024
2acad15
fix wrong params
tuntematonjr Sep 30, 2024
ace4a7e
fix aar to show player instead of msp
tuntematonjr Sep 30, 2024
2c84c5e
Update script_version.hpp
tuntematonjr Sep 30, 2024
f5407eb
fix typo variable
tuntematonjr Sep 30, 2024
9f42e67
fix update respawn point eh for contested
tuntematonjr Sep 30, 2024
04d3306
Update script_version.hpp
tuntematonjr Sep 30, 2024
de3c545
Fix stringtables
tuntematonjr Oct 4, 2024
c2312c4
add position to respawn aar event
tuntematonjr Oct 4, 2024
a9757b0
Update script_version.hpp
tuntematonjr Oct 4, 2024
de947a2
Update debug macros
tuntematonjr Oct 4, 2024
e851944
update header
tuntematonjr Oct 4, 2024
f1de835
fix locality
tuntematonjr Oct 5, 2024
546b930
Fix kill jip time
tuntematonjr Oct 5, 2024
5e0ce60
Use new deleteVehicle syntax
tuntematonjr Oct 8, 2024
a544b25
Merge branch 'master' into Dev
tuntematonjr Oct 23, 2024
fafa99c
add remanding time helper function
tuntematonjr Oct 23, 2024
67ffc61
add helper function get side tickets
tuntematonjr Oct 23, 2024
570fed2
Fix god mode
tuntematonjr Oct 23, 2024
c2ba41d
Make teleporting more safer
tuntematonjr Oct 23, 2024
45db053
use time fnc
tuntematonjr Oct 23, 2024
dea9f9c
Update script_version.hpp
tuntematonjr Oct 23, 2024
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
4 changes: 4 additions & 0 deletions .hemtt/hooks/pre_build/01_set_version.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
let modcpp = HEMTT_VFS.join("mod.cpp").open_file().read();
modcpp.replace("0.0.0", HEMTT.project().version().to_string_short());
HEMTT_VFS.join("mod.cpp").create_file().write(modcpp);
print("mod.cpp version set");
34 changes: 34 additions & 0 deletions .hemtt/project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name = "Tun Respawn"
prefix = "tunres"
author = "Tuntematon"
mainprefix = "x"

[files]
include = [
"mod.cpp",
"data/**",
]

[version]
git_hash = 0

[binarize]
enabled = true

[lint.sqf]
enabled = true

[hemtt.launch.default]
workshop = [
"450814997", # CBA
"463939057", # ACE
"894678801", # TFAR
]
parameters = [
"-filePatching",
"-noPause",
"C:\\Users\\mikal\\Documents\\Arma 3 - Other Profiles\\Tuntematon\\missions\\TUN_Respawn_System.Stratis\\mission.sqm", # Launch into existing Editor Mission - \\ needed
]

[hemtt.release]
folder = "Tun_Respawn_System"
Binary file removed Data/afilogo.paa
Binary file not shown.
14 changes: 0 additions & 14 deletions addons/MSP/XEH_postInit.sqf

This file was deleted.

51 changes: 0 additions & 51 deletions addons/MSP/XEH_preInit.sqf

This file was deleted.

1 change: 0 additions & 1 deletion addons/MSP/XEH_preStart.sqf

This file was deleted.

10 changes: 0 additions & 10 deletions addons/MSP/XEH_prep.sqf

This file was deleted.

32 changes: 0 additions & 32 deletions addons/MSP/config.cpp

This file was deleted.

96 changes: 0 additions & 96 deletions addons/MSP/functions/fnc_ace_actions.sqf

This file was deleted.

101 changes: 0 additions & 101 deletions addons/MSP/functions/fnc_add_EH.sqf

This file was deleted.

Loading