Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,736 Commits 73 Branches 88 Tags 752 MiB
942066b04a
Commit Graph

3951 Commits

Author SHA1 Message Date
SAM
ca17e71200 Safemode macro cleanup 2015-05-15 10:06:11 +02:00
SAM
7c099c1009 Weaponselect module macro cleanup 2015-05-15 09:59:57 +02:00
PabstMirror
1d64e5917f re-add brackets 2015-05-15 02:32:19 -05:00
Glowbal
56aec85616 fixed incorrect private var name 2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4 consistent usage of brackets 2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be Use PFEH array instead of setVariable 2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de Start vital tracking after treatment 2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef Calculate vitals interval on first run 2015-05-14 22:16:44 -05:00
PabstMirror
297cbaef08 #1212 - Add PREP for explosive's module function 2015-05-14 18:49:11 -05:00
PabstMirror
a07f6091f1 Merge pull request #1207 from acemod/commongPrivates2 
Common Privates 2
 2015-05-14 18:34:22 -05:00
PabstMirror
666db5e245 Fix Typo 2015-05-14 18:13:20 -05:00
SilentSpike
60ade8deaa Providing correct parameters 2015-05-15 00:09:03 +01:00
SilentSpike
c458deeae2 End of file newline 2015-05-15 00:02:12 +01:00
esteldunedain
032a2f3778 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistancetweaks 
Conflicts:
	addons/viewdistance/XEH_postInit.sqf
 2015-05-14 19:54:58 -03:00
SilentSpike
0ca8a373d1 BIS_fnc_ActivateAddons must run during mission init 2015-05-14 23:50:58 +01:00
PabstMirror
8cab041806 Missing Nametag Settings File from #1196 2015-05-14 17:24:37 -05:00
PabstMirror
d5db268fc0 Clean unused privates 2015-05-14 17:17:41 -05:00
PabstMirror
c27d84e382 Common Privates Redo 2015-05-14 17:12:40 -05:00
Nicolás Badano
d9b6636221 Merge pull request #1196 from Winter259/common-cleanup 
Cleanup of nearly all common functions
 2015-05-14 18:31:19 -03:00
PabstMirror
2158f467f4 #1171 - Safe get variables if settings not defined 2015-05-14 15:29:09 -05:00
SAM
b2371b1278 Fixed missing nametags config 2015-05-14 22:21:55 +02:00
PabstMirror
03130ab3c9 #1187 - canInteractWith was failing vehicle actions 2015-05-14 15:00:03 -05:00
esteldunedain
e76db653e8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-05-14 16:56:51 -03:00
esteldunedain
f17c7c12a6 Fixed object actions not working 2015-05-14 16:56:32 -03:00
esteldunedain
a9197a8e33 Make viewdistance disabable through settings and module 2015-05-14 16:36:12 -03:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
SAM
021679208b First batch of settings files 
Separating ACE_Settings.hpp from config.cpp
 2015-05-14 20:46:35 +02:00
esteldunedain
195643d557 Handle player not existing 2015-05-14 15:24:35 -03:00
esteldunedain
2027a28959 Modify changeViewDistance so: 
- Displays objects distance percentage instead of coeficient
- Only display that if not off
 2015-05-14 15:16:02 -03:00
esteldunedain
7a6fb54654 Small tweaks to viewdistance 2015-05-14 15:15:07 -03:00
SAM
0b6f02f45e Second batch of cleaned up files. 2015-05-14 20:06:06 +02:00
SAM
9b55dd0b57 First batch of cleaned up files 2015-05-14 20:02:42 +02:00
PabstMirror
f0b7b34321 Cleanup 2015-05-14 13:00:56 -05:00
PabstMirror
ec38c8c951 Merge branch 'master' into interactionPrivates 
Conflicts:
	addons/interaction/functions/fnc_addPassengerActions.sqf
	addons/interaction/functions/fnc_getDoorAnimations.sqf
	addons/interaction/functions/fnc_moduleInteraction.sqf
	addons/interaction/functions/fnc_moveDown.sqf
	addons/interaction/functions/fnc_removeTag.sqf
	addons/interaction/functions/fnc_showMouseHint.sqf
	addons/interaction/functions/fnc_updateTooltipPosition.sqf
 2015-05-14 12:53:18 -05:00
esteldunedain
0b8992a503 Small tweaks to viewdistance 2015-05-14 14:45:31 -03:00
esteldunedain
32f7854bf6 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistance 2015-05-14 14:09:12 -03:00
esteldunedain
7191778402 Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance 2015-05-14 14:08:43 -03:00
jaynus
d5a8f21480 Merge pull request #1087 from SilentSpike/zeustemp 
Added zeus changes module as per #1082
 2015-05-14 09:32:03 -07:00
SAM
8c7d752fcc Made final adjustments 
Centred prompts, fixed erroneous if statement, adjusted function
headers.
 2015-05-14 18:25:41 +02:00
SAM
3480168e05 Integrated new function into module 2015-05-14 17:44:35 +02:00
esteldunedain
54325b4591 Merge branch 'viewdistance' of https://github.com/Winter259/ACE3 into viewdistance 2015-05-14 12:43:47 -03:00
SAM
853333ac49 Added new function, updated settings 2015-05-14 17:19:14 +02:00
SAM
7fe73c2c80 Added Object View Distance Coefficient setting 2015-05-14 17:11:52 +02:00
SAM
d8cce9ece4 Removed redundant settings 2015-05-14 17:07:20 +02:00
jonpas
5a17b39a7e Merge remote-tracking branch 'origin/master' into interactionCodingGuidelines 
Conflicts:
	addons/interaction/CfgVehicles.hpp
 2015-05-14 16:57:49 +02:00
ulteq
7474d7f313 Merge pull request #1193 from acemod/getTemperatureAtHeight 
Moved all temperature calculations into the weather module.
 2015-05-14 16:41:16 +02:00
ulteq
6a0f7343d8 Merge pull request #1192 from acemod/persistentKestrelMenu 
Made the Kestrel menu persistent
 2015-05-14 16:41:12 +02:00
jaynus
cac70762f5 Merge pull request #1149 from acemod/extBuildFix 
Extensions build system updates, changes and crash fixes
 2015-05-14 07:25:49 -07:00
Glowbal
d42d0ef69d Merge pull request #1164 from acemod/litterFixes 
Litter distribution fix and "floating litter over water" fix (medical)
 2015-05-14 16:17:10 +02:00
jaynus
20bd5957e3 Change to execNextFrame. 2015-05-14 07:15:52 -07:00
ulteq
cf487b544e Moved all temperature calculations into the weather module. 2015-05-14 16:07:41 +02:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations' 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-14 16:01:41 +02:00
esteldunedain
5b856e0966 Merge branch 'master' into viewdistance 
Conflicts:
	AUTHORS.txt
 2015-05-14 10:55:31 -03:00
esteldunedain
4a074d4e31 Replace BIS_fnc_sortBy by sort for interact_menu occlusion 2015-05-14 10:54:22 -03:00
ulteq
a167336b40 Made the Kestrel menu persistent 2015-05-14 15:39:29 +02:00
esteldunedain
5ef29c2354 Merge remote-tracking branch 'origin/master' into interactionOclusion 
Conflicts:
	addons/interact_menu/functions/fnc_keyDown.sqf
 2015-05-14 10:39:02 -03:00
Nicolás Badano
2fb317d3bd Merge pull request #1120 from acemod/syncAmmoOnBeltReload 
Manually sync ammo globably on belt reload.
 2015-05-14 10:32:16 -03:00
Nicolás Badano
dddd571a70 Merge pull request #1185 from Legolasindar/master 
fixed some spanish translation
 2015-05-14 09:38:52 -03:00
Grzegorz
ca1ff8382c Tabs fixed 2015-05-14 14:33:33 +02:00
Ivan Navarro Cabello
43c5afac55 fixed some spanish translation 
I fixed some spanish translation.
 2015-05-14 14:32:35 +02:00
ulteq
7fcaa5bbcf Fixed 'input parsing' corrupting 'relative click memory' 2015-05-14 12:52:48 +02:00
ulteq
ddbf274c89 ace_ballistics README.md update 2015-05-14 11:23:44 +02:00
jaynus
b13d44fb6b Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-13 17:29:09 -07:00
Alessandro Foresi
8de611d559 Fixed: Safe mode Italian translation 2015-05-13 23:20:33 +02:00
jaynus
cf635d4564 Merge pull request #1129 from usecforce/removeTitanRealisticName 
Removed Titan realistic name as it's not implemented yet as a Spike
 2015-05-13 13:31:01 -07:00
jaynus
9f3a57bf32 Changed: checkFiles extension check prints version returned by extension 
Changed: Build changed to SSE2 instead of defaulting to AVX.
 2015-05-13 09:57:24 -07:00
Glowbal
be09a5cecd Merge pull request #1145 from acemod/MedicalVehicleCheckFix 
Fix medical vehicle return value
 2015-05-13 18:32:49 +02:00
jaynus
890849fcd1 Merge pull request #1139 from acemod/fragPrivates 
Frag Privates
 2015-05-13 08:06:02 -07:00
Glowbal
a4d0af4b67 Fix medical vehicle return value 
Could fix #1142
 2015-05-13 15:55:03 +02:00
ulteq
26843dad88 Merge pull request #1057 from acemod/abConfigCaching 
Config caching (advanced ballistics)
 2015-05-13 11:30:21 +02:00
ulteq
d04ebef519 Merge pull request #1106 from acemod/refactorCalcWindSpeed 
Moved all wind calculations into the weather module
 2015-05-13 11:23:32 +02:00
commy2
8f35b9b7a4 Merge pull request #1138 from acemod/dragPrivates 
Draggin Privates
 2015-05-13 10:57:03 +02:00
PabstMirror
4185874a9a Frag Privates 2015-05-12 23:19:31 -05:00
jaynus
ed2f73d4d9 Merge pull request #1117 from acemod/waveHeightAtFunc 
Added: waveHeightAt Function
 2015-05-12 21:15:35 -07:00
PabstMirror
3978445837 Draggin Privates 2015-05-12 23:01:59 -05:00
PabstMirror
245a6da6f6 Merge pull request #1027 from acemod/sortForMagRepack 
Sort for mag repack
 2015-05-12 21:56:12 -05:00
jaynus
d972f14649 Merge pull request #1092 from acemod/superTime 
ACE_time variables for accurate purposeful time use
 2015-05-12 19:34:20 -07:00
jaynus
d28f2b0f2c Merge pull request #1113 from acemod/ComancheZoomLevels 
Fix for Comanche zoom levels
 2015-05-12 19:31:28 -07:00
PabstMirror
1827d8ad95 Fix #1024 - Adjust self iMenu for wave height 2015-05-12 16:04:42 -05:00
PabstMirror
e613db1fea Add missing script_component include 2015-05-12 15:40:12 -05:00
jonpas
e58d23d885 Removed Titan realistic name as it's not implemented yet as a Spike 2015-05-12 21:32:30 +02:00
SilentSpike
2620f5ebd9 Made module also default to disabled 2015-05-12 19:55:38 +01:00
GieNkoV
1610221a70 Remove duplicated strings 2015-05-12 20:01:10 +02:00
GieNkoV
ed1acd8c15 Some small errors fixed #2 
Mainly tabs and wrong italian strings (got those from newest master)
 2015-05-12 19:42:35 +02:00
GieNkoV
bc72c71e8e Fix small errors inside stringtables 2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8 Remove tabs and repair errors @Glowbal found 
Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp

Conflicts:
	addons/map/CfgVehicles.hpp
	addons/medical/CfgVehicles.hpp
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:27 +02:00
GieNkoV
5bbf875ef2 Tabs removed 
Conflicts:
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-12 18:27:02 +02:00
Grzegorz Sikora
63c5308cd9 Missed one Yes/no to BOOL 2015-05-12 18:26:41 +02:00
Grzegorz Sikora
156bba3321 Yes/No to BOOL 
Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/CfgVehicles.hpp
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml

Conflicts:
	addons/common/CfgVehicles.hpp
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/CfgVehicles.hpp
	addons/map/stringtable.xml
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
	addons/switchunits/CfgVehicles.hpp
	addons/switchunits/stringtable.xml
 2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules 
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
 2015-05-12 18:25:40 +02:00
ViperMaul
ab580dd1c7 Set version number to 3.0.0.3 2015-05-12 07:08:45 -07:00
VKing
3ddc8569bb Made better with Pabstology (tm) 2015-05-12 15:53:49 +02:00
SilentSpike
228786f3ad Putting the bird in its cage 2015-05-12 12:26:24 +01:00
PabstMirror
ddbb6ab2bb #1119 - Manually sync ammo globably on belt reload. 2015-05-11 23:51:42 -05:00
jaynus
7efe8ccba5 Added: waveHeightAt Function, refs #1024 for use. 2015-05-11 16:44:17 -07:00
ViperMaul
e75c4594e6 Added missing $PBOPREFIX$ for respawn 2015-05-11 15:17:44 -07:00
VKing
ef836d1191 Hacked order to fix order of comanche zoom levels 2015-05-11 23:17:17 +02:00
jaynus
8e7763af08 Removed: systemChat debug in captive 2015-05-11 13:50:24 -07:00
jaynus
991ecdfe01 Removed: Debug sidechat in laser seeker code. 2015-05-11 13:37:50 -07:00
ViperMaul
0bb158bd14 Merge pull request #1109 from acemod/makeNewVersionStamping 
Make new version stamping
 2015-05-11 11:16:14 -07:00