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,925 Commits 73 Branches 88 Tags 752 MiB
9135d956f0
Commit Graph

4064 Commits

Author SHA1 Message Date
jaynus
98df03ca27 Changed: checkFiles extension check prints version returned by extension 
Changed: Build changed to SSE2 instead of defaulting to AVX.
 2015-05-18 20:59:00 +02:00
VKing
1cab51156a Made better with Pabstology (tm) 2015-05-18 20:58:16 +02:00
VKing
5c7e59fd29 Hacked order to fix order of comanche zoom levels 2015-05-18 20:58:03 +02:00
jaynus
d8b4b53b80 Added: Monitor 5sec interval to propegate assignedTeams from leader, allowing team colors to be assigned by the team leader and show in the group. Uses vanilla team assignment. Closes #1279 2015-05-18 08:31:29 -07:00
ulteq
3c5eac96ea Merge pull request #1261 from acemod/ModuleSettings_AB_WD 
Added a new module option for advanced ballistics:
 2015-05-18 13:39:21 +02:00
ulteq
8eaf754fdd Further increased the visibility of the bullet trace effect. 2015-05-18 10:56:34 +02:00
PabstMirror
1e7e5c7aa5 Don't show passenger actions for UAV crew 2015-05-17 17:52:56 -05:00
PabstMirror
53d6d4578b Explosives - Fix UBC 
Updating base class PipeBombBase->IEDUrbanBig_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandBig_Remote_Ammo/
Updating base class PipeBombBase->IEDUrbanSmall_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandSmall_Remote_Ammo/
 2015-05-17 17:21:31 -05:00
ulteq
94453f60f2 Merge pull request #1255 from BullHorn7/vehiclelock 
Documentation: Vehiclelock, Weather
 2015-05-17 23:19:20 +02:00
Josuan Albin
836cd9d833 Documentation pass 3 
- Fixed typos in laser/readme
- Documentation guidelines updated
- ACE3 mentions updated in
- - ai
- Updated doc
- - fcs
- - hearing
-  -hitreaction
- - interaction
- - interact_menu
- - inventory
- - javelin
- - laser
- - laserpointer
- - laser_selfdesignate
- - logistics_uavbattery
- - logistics_wirecutter
- - magazinerepack
- - main
- - map
- - maptools
- - markers
 2015-05-17 21:01:17 +02:00
ulteq
4513b02c10 Experiment with the bullet trace effect size 2015-05-17 12:57:55 +02:00
ulteq
96b92ac172 Added a new module option for advanced ballistics: 
* alwaysSimulateForGroupMembers
 2015-05-17 11:45:55 +02:00
ulteq
9e8283ebab Merge pull request #1260 from acemod/toggleDevices 
ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds.
 2015-05-17 11:23:56 +02:00
ulteq
ea32aa0265 ATragMX/Kestrel 4500 dialogs can be toggled on/off with keybinds. 2015-05-17 11:23:31 +02:00
PabstMirror
1ccf6fb70d #1181 - Reset BFT_markers array each time 2015-05-16 21:54:11 -05:00
ulteq
e0f9d3f6e1 Merge pull request #1253 from acemod/kestrelExpansion 
Kestrel Feature Expansion
 2015-05-16 23:46:36 +02:00
ulteq
a008c45875 Fixed heading can be negative 2015-05-16 23:34:50 +02:00
ulteq
cdd07a33c9 Fixed some typos 2015-05-16 23:30:16 +02:00
BullHorn
c05e7fb046 Documentation: Vehiclelock - 1st iteration 
Add feature\Vehiclelock.md and add relevant info for players
Edit addons\Vehiclelock\readme.md for typos and errors
Edit missionmaker\modules.md for additional info
 2015-05-16 23:42:54 +03:00
ulteq
1b9b8543d3 Merge pull request #1252 from acemod/typoFixATragMX 
Fixed a minor bug in bullet diameter GUI output
 2015-05-16 21:44:58 +02:00
ulteq
01b30c6677 Fixed a minor bug in bullet diameter GUI output 2015-05-16 21:44:43 +02:00
ulteq
f9b7e3c6f7 Fixed clashing MACRO names 2015-05-16 21:10:34 +02:00
ulteq
9116fed415 New main menu: 'date' | New sub menu: 'magnetic heading' 2015-05-16 20:26:52 +02:00
jonpas
ce8d6b683c Prettified Explosive's CfgAmmo and CfgMagazines 2015-05-16 17:49:31 +02:00
jonpas
c95ecca6a8 Added IED Pressure Plates, closes #1191 2015-05-16 17:44:35 +02:00
Glowbal
f02314e996 Merge pull request #1217 from acemod/medicalFixes2 
Medical Vitals Fixes
 2015-05-16 15:35:42 +02:00
ulteq
03b478aeee Reworked dew point, heat index and wind chill calculations 2015-05-16 12:39:52 +02:00
ulteq
ea68e91ef9 Refactored and expanded the kestrel data collection 2015-05-16 11:13:54 +02:00
ulteq
b65ac1f305 Fixed some bugs in the Kestrel 4500 output generation 2015-05-16 11:13:50 +02:00
ulteq
0377526a7c Finished heat index and wet bulb functions 2015-05-16 11:12:29 +02:00
PabstMirror
bb63882d20 #1238 - open door error 2015-05-15 22:52:54 -05:00
ulteq
8b878552cb Fixed several typos in the heat index coefficients 2015-05-16 00:51:53 +02:00
PabstMirror
dabd11b9c5 MedicalStringtable - Fill missing languages 2015-05-15 16:01:39 -05:00
PabstMirror
1e1c6a6930 Merge pull request #1230 from gienkov/patch-16 
Missing Medical module stringtable entries
 2015-05-15 15:59:57 -05:00
SilentSpike
38abe1dd02 Using inline code instead of holdover function 2015-05-15 21:09:55 +01:00
SilentSpike
9d0af2138c Removed old spawn 2015-05-15 21:03:19 +01:00
SilentSpike
84d06bac34 Another fix for moduleCurator 2015-05-15 20:54:17 +01:00
ulteq
56eecfda03 Fixed heat index coefficients syntax 2015-05-15 21:41:07 +02:00
ulteq
8120cef964 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-15 21:12:02 +02:00
ulteq
cee775e5ac Removed spaces in PARAMS macro 2015-05-15 21:11:53 +02:00
ulteq
ef225b366b Kestrel GUI expansion 2015-05-15 21:11:03 +02:00
ulteq
7f966de28c Added wet bulb calculation, fixed macros 2015-05-15 21:10:46 +02:00
esteldunedain
89fe91cce0 Fix tap shoulders keybind 2015-05-15 15:52:09 -03:00
PabstMirror
eed76d5bcf Fix mike tyson spelling 2015-05-15 13:47:44 -05:00
ulteq
2f7d7ece56 Added utility function to calculate the dew point 2015-05-15 19:58:24 +02:00
Nicolás Badano
45961314af Merge pull request #1209 from SilentSpike/zeusEdit 
Fix for curator module
 2015-05-15 14:51:16 -03:00
jaynus
e1c3e96eb1 Fixes: Nil scheduled space bug with hashes. This is still a bug everywhere else. 2015-05-15 10:45:07 -07:00
Grzegorz
1e552496d5 Missing strings 
They need to be here otherwise few options are blank inside medical modules.
 2015-05-15 19:23:49 +02:00
ulteq
e6ed1e5dbd Added utility functions to calculate heat index and wind chill 2015-05-15 19:00:11 +02:00
SAM
bed35b1ac8 Fixed safemode module indentation 2015-05-15 15:41:41 +02:00
ulteq
b609b0fec1 Merge branch 'module-cleanup' of https://github.com/Winter259/ACE3 into Winter259-module-cleanup 2015-05-15 14:59:54 +02:00
SAM
736c4f94e1 Revered macro on fnc_throwGrenade 2015-05-15 14:47:37 +02:00
ulteq
7a95e2a7bd Weather module macro cleanup 2015-05-15 14:20:18 +02:00
SAM
8199a4ad34 Removed extra private 2015-05-15 10:30:15 +02:00
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
jaynus
92799719b6 Spall off by default. 2015-05-14 08:30:06 -07: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
jaynus
035277aafc removed illegal character 2015-05-14 08:11:08 -07: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
jaynus
58a55313cd Changed: Entire frag system re-optimized to a single tracking/GC index-based PFH. 
Changed: Spalling calculations now throttled across frames and limited; accurate but performant
Changed: All lookups are now index-based on a global projectiles array. This reduced runtime dramatically for all fragmentation.
 2015-05-13 17:06:10 -07:00
jaynus
aef896cc21 Merge remote-tracking branch 'origin/explosive_reflection' into fragSpallOptimization 
Conflicts:
	addons/frag/XEH_preInit.sqf
 2015-05-13 15:52:18 -07:00
jaynus
553942bbc7 Initial commit of frag/spalling optimization rewrite. Now tracks in single PFH, with index-based referencing instead of searches. TODO: Break spall calculation up to multiple frames. Needs testing. 2015-05-13 14:33:14 -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
54dcbb9ef4 FCS - Privates 2015-05-12 22:15:52 -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