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
5,342 Commits 73 Branches 88 Tags 752 MiB
a48aded5e5
Commit Graph

4356 Commits

Author SHA1 Message Date
PabstMirror
5a4ef610ec Use PFEH array instead of setVariable 2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603 Start vital tracking after treatment 2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49 Calculate vitals interval on first run 2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d fixes #1195 units do not display injuries 
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
 2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c fixes #1155 2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8 Change to execNextFrame. 2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4 Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-18 20:59:56 +02:00
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
gienkov
0993c0f0b0 Fix tabs and errors 2015-05-17 23:28:00 +02: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
PabstMirror
3daec7d98d Fix UAV and Interaction Compile Inheritance 2015-05-17 13:51:59 -05:00
ODK-Bn
13740d9f32 translated the missing strings into Russian 2015-05-17 13:25:08 +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
Glowbal
d9da4211f7 Merge branch 'master' into medicalExtension 2015-05-17 09:51:41 +02:00
Glowbal
2b91d398f0 added extension to config 2015-05-17 09:51:34 +02:00
PabstMirror
1ccf6fb70d #1181 - Reset BFT_markers array each time 2015-05-16 21:54:11 -05:00
gienkov
4bebedf73e Stringtable Zeus and View Distance 
* Stringtabled ACE Zeus module
* Stringtabled ACE View Distance
* Lowered default view distance to 1500 because default value (10000)
makes enormous FPS drop at start for low end machines
 2015-05-17 00:53:55 +02:00
Glowbal
556b9ad7d8 removed debug prints 2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae Removed old sqf version. 2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f Temp added old sqf version for easy performance comparison 2015-05-17 00:08:34 +02: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
Glowbal
e3dd1eaf47 Using extension for handleDamage wounds instead of sqf 2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca Loading config data to extension 2015-05-16 23:20:38 +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
VKing
5f328ce616 Added ace_ui - enchanced chat visibility on the map screen 2015-05-16 15:28:59 +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
PabstMirror
1dd34199d6 ASDG- Fail gracefully if attachments not compatible 2015-05-15 22:23:46 -05:00
jonpas
c0c4414ec0 Name tags Draw3D variable names consistency 2015-05-16 01:35:48 +02:00
jonpas
1a468cb4ff Split common ACE_Settings.hpp from config.cpp, shortened sampleSetting 2015-05-16 01:06:29 +02:00
jonpas
cccc741a16 #1123 - Added CheckPBOs to ACE_Settings 2015-05-16 00:54:01 +02:00
ulteq
8b878552cb Fixed several typos in the heat index coefficients 2015-05-16 00:51:53 +02:00
jonpas
bffe58efd6 Name Tags cleanup 2015-05-16 00:22:23 +02:00
jonpas
7c96c12bd5 Made forced settings through module in original entry, Reworked Draw3D handling, Some strings cleanup 2015-05-16 00:07:38 +02:00
esteldunedain
0b1beed219 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reliableSettings 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-05-15 18:18:13 -03: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
esteldunedain
d189cffce6 Fix event names 2015-05-15 15:49:22 -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
jonpas
02b9df1bc3 Fixed client setting Draw3D installation/removal handling 2015-05-15 18:13:10 +02:00
jonpas
1ccc7e1e0a CBA Macro for addEventHandler 2015-05-15 17:44:58 +02:00
jonpas
2edbacd15b Added SettingChanged EH and proper handling 2015-05-15 17:16:55 +02:00
jonpas
a7cd36bc3e Added Force setting 2015-05-15 16:52:27 +02:00
jonpas
62d7ea0b03 Fixed module entry not taking effect 2015-05-15 16:31:06 +02:00
SAM
bed35b1ac8 Fixed safemode module indentation 2015-05-15 15:41:41 +02:00
jonpas
58ad012433 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/ACE_Settings.hpp
 2015-05-15 15:37:18 +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
esteldunedain
ca94fd4c78 Remove the pfh 2015-05-14 20:58:45 -03:00
esteldunedain
6774739854 Fix #1201 2015-05-14 20:54:11 -03:00
PabstMirror
297cbaef08 #1212 - Add PREP for explosive's module function 2015-05-14 18:49:11 -05:00
esteldunedain
5e3b6f389a Reliable settings framework 2015-05-14 20:45:53 -03: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
jonpas
22c5c03f6f Removed redundant defaultValue and checks 2015-05-15 00:04:20 +02:00
jonpas
6ba4289511 Merge branch 'master' into nametagsToggle 
Conflicts:
	addons/nametags/config.cpp
 2015-05-14 23:38:11 +02:00
jonpas
d7b617f49e Stringtables fixed, variable macro fixed 2015-05-14 23:33:35 +02: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
jonpas
446ad378ca Fixed variable incosistency, string added for new module option 2015-05-14 23:27:41 +02:00
jonpas
8a2a53ddac Show player names module option added 2015-05-14 23:26:37 +02:00
jonpas
77e13ca5be Seperated ACE_Settings 2015-05-14 23:18:38 +02: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
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
SilentSpike
f6cdad62ca Added parenthesis 2015-05-11 19:04:04 +01:00
SilentSpike
7cf52d13ca Disable zeus settings by default 
Fixed newline characters
 2015-05-11 18:15:45 +01:00
ViperMaul
5092d586fd Exception handling and clean up. 
#1105
 2015-05-11 10:06:40 -07:00
commy2
c0e2af2e66 quotes in config arrays 2015-05-11 18:50:04 +02:00
SilentSpike
b09ebc9c79 QGVAR was meant to be GVAR 
Improved module text
Forgot about script_component
 2015-05-11 17:08:25 +01:00
jaynus
9660978b92 Changed: search for ace_server, not ace_serverconfig 2015-05-11 09:02:13 -07:00
ViperMaul
9c288ffa12 Merge pull request #1108 from acemod/missingPBOPREFIX 
Added missing PBOPREFIX files
 2015-05-11 08:54:03 -07:00
ViperMaul
b0051a6638 Merge pull request #1094 from acemod/fixUnSurrender 
Fix not being able to UnSurrender (currentWeapon)
 2015-05-11 08:39:39 -07:00
ViperMaul
4e1370cbc3 Merge pull request #1093 from acemod/fixDisarming 
Fix disarming
 2015-05-11 08:38:56 -07:00
ulteq
0b3d3b8793 Added missing PBOPREFIX files 2015-05-11 17:37:08 +02:00
SilentSpike
e16ea007e4 Add ACE settings 2015-05-11 16:30:46 +01:00
SilentSpike
755581be40 Changed BI functions to check for settings 2015-05-11 16:23:46 +01:00
SilentSpike
3118666f80 Added settings module to config 
Started functionality
 2015-05-11 16:02:24 +01:00
SilentSpike
519aba57b5 Transfered ballistics support (as discussed with glowbal) 2015-05-11 14:45:37 +01:00
ulteq
b03333c9e8 Moved all wind calculations into the weather module 2015-05-11 10:59:07 +02:00
jaynus
d6dde3c73f Merge pull request #1077 from acemod/fixSwitchUnits 
Fix switch units
 2015-05-10 23:38:56 -07:00
ulteq
9fe8d6f40a Merge pull request #1097 from acemod/dispersionFix 
Rifle dispersion overhaul:
 2015-05-11 00:31:23 +02:00
PabstMirror
2e91f45273 #1104 - Fix legend in editor 2015-05-10 16:57:05 -05:00
Glowbal
e6a8f0b295 Merge pull request #1103 from SilentSpike/medical_typofix 
Trivial variable name fix for moduleAssignMedicalVehicle function
 2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6 false -> 0 2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e isMedic -> medicClass 2015-05-10 20:19:32 +01:00
ulteq
09c19e4ec2 Subtle recoil reduction when using a suppressor 2015-05-10 20:58:36 +02:00
SilentSpike
d321ed2753 Changed function variable to match other medical vehicle functions 2015-05-10 19:56:35 +01:00
ViperMaul
9be22ee8b5 Merge pull request #1088 from acemod/makeNOBIN_improvements 
Make Improvements
 2015-05-10 11:46:16 -07:00
ulteq
82f3c65c31 Tuned down the dispersion reduction of suppressors some more 2015-05-10 20:06:27 +02:00
SilentSpike
c1c10f43b2 Fixed typo 2015-05-10 17:41:43 +01:00
SilentSpike
a40277f6f1 Module configs and function headers 2015-05-10 17:32:01 +01:00
SilentSpike
5166e73cc0 Added commented out code and function prep 2015-05-10 17:26:24 +01:00
SilentSpike
9dd163ac3d Use moduleProjectile with ballistics support 2015-05-10 17:21:18 +01:00
SilentSpike
eaa0f16e30 Transferring rest of function files 2015-05-10 17:17:17 +01:00
jaynus
c39b5931c7 ACE tickTime based on ACE_time. 2015-05-10 07:56:14 -07:00
jaynus
e1c3c40cdd I need more coffee. this should be more accurate. 2015-05-10 07:50:58 -07:00
jaynus
318b2437f9 Applied virtual time acceleration to the master ACE_time. Created ACE_tickTime macro, to provide same-frame millisecond resolution. 2015-05-10 07:42:53 -07:00
ViperMaul
1cc5bd1c50 removing unneeded debug files 2015-05-10 07:41:24 -07:00
ulteq
235534292f Rifle dispersion overhaul: 
*Added dispersion values for the new marksmen rifles (when needed)
*Overworked some of the (ridiculous) existing values
*Made use of the vanilla values whenever possible
 2015-05-10 16:31:56 +02:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095 
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
 2015-05-10 16:19:46 +02:00
KoffeinFlummi
9e982fe958 Merge branch 'translation/15bn/alef' of https://github.com/alef/ACE3 into italian-merge 2015-05-10 16:09:31 +02:00
commy2
ba6ffe8c2f Merge pull request #946 from acemod/fcsInitSpeedFix 
Fcs init speed fix
 2015-05-10 14:57:50 +02:00
SAM
cb64f7d1a9 Adjusted PBOPREFIX 2015-05-10 13:28:18 +02:00
SAM
495e94f3f0 Merged fnc_init.sqf into XEH_postInit.sqf 2015-05-10 13:04:08 +02:00
SAM
283768fabb Fixed code style in switch statement 2015-05-10 12:56:05 +02:00
SAM
6a6681872c Replaced player with ACE_player 2015-05-10 12:54:53 +02:00
SAM
2ce133675a Removed terrain grid related configs 2015-05-10 12:28:58 +02:00
SAM
c05a91f530 Suppress prompts when changing vehicle. 
They're only shown when the player changes the setting.
 2015-05-10 12:15:34 +02:00
SAM
69648f0e1b Added adaptive view distance depending on vehicle 2015-05-10 12:00:19 +02:00
Glowbal
f861466882 Merge pull request #1075 from acemod/ambianceSoundModuleDescAndDoc 
adjust ambiance sound module description and docs
 2015-05-10 11:46:53 +02:00
Alessandro Foresi
2dd06babec Added: Italian translations completed. 
Fixed: BOM markers where missing
 2015-05-10 11:44:46 +02:00
ulteq
d32e1024d3 Fixed a typo 2015-05-10 11:09:14 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
ulteq
718c38098e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abConfigCaching 2015-05-10 10:38:12 +02:00
PabstMirror
59adf92862 Fix not being able to UnSurrender (currentWeapon) 2015-05-10 01:47:50 -05:00
jaynus
7fb7b04a85 And one final bugfix for fast machines. 2015-05-09 23:13:02 -07:00
jaynus
8e34b99c0f Optimization of variables. 2015-05-09 23:09:33 -07:00
jaynus
b3833c665d Time magic. 2015-05-09 22:53:20 -07:00
PabstMirror
2da2794e20 ACE_isUnique config for mags instead of static list 2015-05-09 17:08:47 -05:00
Alessandro Foresi
7e7c3ed053 Added: More italian translations 2015-05-10 00:04:42 +02:00
Alessandro Foresi
9e093b9459 Added: More italian translations 2015-05-09 23:52:01 +02:00
Alessandro Foresi
6695a8793b Added: Some italian translastions 2015-05-09 23:43:03 +02:00
SilentSpike
212b8528fa Bird locality code no longer needed 2015-05-09 21:30:52 +01:00
jonpas
1a2e7d0596 Tabs to Spaces, Removed unused GUI class 2015-05-09 22:25:48 +02:00
jonpas
633e94a114 CBA Macros to Interaction functions 2015-05-09 22:14:00 +02:00
PabstMirror
4733818e9b Fix weather array for zargabad 2015-05-09 15:10:01 -05:00
ulteq
3a10c77f08 Minor cleanup 2015-05-09 22:09:36 +02:00
PabstMirror
2e3e203d9f #1081 - Fix binocular dupe 
binocs are weapons and items at the same time.
need to properly drop binocs because stuff like deisgnator can have ammo
 2015-05-09 14:41:46 -05:00
jaynus
6b5d95906d Disables multiple openings of the kestrel & atrag. Allows the overlay toggle, but disables the opening of multiple ones. Used onUnload handlers. Supports both limiting interact and keybinds. Fixes #1086 2015-05-09 12:41:01 -07:00
SilentSpike
3544ee57f8 Added removed script within comments 2015-05-09 20:35:07 +01:00
SilentSpike
079b8489ce Missing spaces 😉 2015-05-09 20:30:49 +01:00
SilentSpike
f685ec2257 added zeus changes module 2015-05-09 20:24:39 +01:00
ViperMaul
21ea667463 $NOBIN$ file must not be a zero-byte file in order to affect the cache to trigger a proper rebuild. 2015-05-09 11:07:27 -07:00
ulteq
00c28dd146 Merge pull request #1085 from acemod/cleanupScopesFiredEH 
scope firedEH cleanup
 2015-05-09 20:02:29 +02:00
ulteq
253ed6946e scope firedEH cleanup 2015-05-09 20:02:22 +02:00
commy2
aa6c3ddf2c fix: check files script, order in activatedAddons is not guaranteed 2015-05-09 19:34:35 +02:00
ulteq
b80602fbae Fixed a typo 2015-05-09 18:55:00 +02:00
SAM
737b1cc216 Renamed variable limit to limitViewDistance 
For future limiting of terraingrid
 2015-05-09 18:42:02 +02:00
ulteq
30ff90453b wind deflection has wrong version number macro setup 2015-05-09 18:32:19 +02:00
Glowbal
d3e2bd45d7 Merge pull request #1065 from acemod/fixMedicalSettingMistake 
Fixed medical setting spelling mistake
 2015-05-09 18:09:27 +02:00
commy2
4dc0b41c4b Merge pull request #1076 from acemod/checkfiles 
check for outdated pbo files
 2015-05-09 17:50:29 +02:00
Nicolás Badano
b32729978f Merge pull request #1026 from acemod/wavesFix 
Fixes bugged waves
 2015-05-09 12:42:28 -03:00
commy2
7fb56d4fd5 simple check to compare client and server version of ace 2015-05-09 17:03:51 +02:00
commy2
3976c4d64f the spaces 2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e ignore ace in checkPBO module, also fix #1020 2015-05-09 16:01:53 +02:00
commy2
52a904478b laser selfdesignate has wrong version number macro setup 2015-05-09 15:32:34 +02:00
SAM
cad86280c1 Fixed module value not overriding. 2015-05-09 14:51:23 +02:00
bux578
f1798aa739 fix switchunits 2015-05-09 14:05:58 +02:00
bux578
8c937a707d starting to fix switchunits 2015-05-09 13:49:26 +02:00
commy2
57131496f2 check for outdated pbo files 2015-05-09 13:25:19 +02:00
SAM
f4d7c6818b Attempted fix #2 2015-05-09 13:05:36 +02:00
SAM
a9d6fbd841 Attempting to fix module value not being read 2015-05-09 12:36:11 +02:00
SAM
f64f76e92f Fixed wrong file name 2015-05-09 12:07:05 +02:00
SAM
2dfaaa047a Reworked limiting system 
Module limit still not being set properly.
 2015-05-09 11:56:27 +02:00
SAM
bba216ebd2 Rewrote switch statement 
Per @Glowbal's comment
 2015-05-09 10:53:09 +02:00
SAM
7201a23d41 Adjusted post init, removed redundant settings 2015-05-09 10:44:01 +02:00
SAM
9e40e16c4a Adjusted XEH_preinit accordingly 2015-05-09 10:43:20 +02:00
SAM
ae1628ef03 Renamed init file for neatness 2015-05-09 10:41:55 +02:00
bux578
fb284faa66 adjust ambiance sound module description and docs 2015-05-09 08:18:44 +02:00
bux578
ddf32052c4 fix removeWhiteSpace function name 
used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace`
due to 612fa69c1c
 2015-05-09 08:02:13 +02:00
Nicolás Badano
19e8d7bbe7 Merge pull request #1066 from acemod/scopes-usefiredBisEH 
Switch scopes to use firedBIS
 2015-05-09 01:21:10 -03:00
commy2
b57f731dd0 disable laserpointer inheritance for rhs 2015-05-09 04:59:10 +02:00
jonpas
e9abd8c27a Fixed lowercasing, improved examples 2015-05-09 04:55:41 +02:00
jonpas
2ff372e2a1 Function headers per Coding Guidelines for Interaction 2015-05-09 04:47:15 +02:00
jonpas
50d5e845ee Lowercased beginning of functions pt2 2015-05-09 03:12:28 +02:00
jonpas
2a9f4d779d Lowercased beginning of function names 2015-05-09 03:09:26 +02:00
PabstMirror
a4c710bd28 Switch scopes to use firedBIS 2015-05-08 13:36:24 -05:00
commy2
2ffabec250 Merge pull request #1040 from acemod/disableCfgAISkill 
Disables the CfgAISkill class to prevent it from affecting players.
 2015-05-08 20:27:31 +02:00
jaynus
b7b6cb6086 Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled. 2015-05-08 11:27:17 -07:00
commy2
7294056da0 keep ai tweaks except of relaod 2015-05-08 20:13:20 +02:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +02:00
ulteq
0a9dbfba87 Privates cleanup 2015-05-08 18:47:17 +02:00
ulteq
03fd740f8e Config caching is now done in the uiNamespace 2015-05-08 18:43:26 +02:00
SAM
0b4137763d Cleaned up code 2015-05-08 18:41:32 +02:00
SAM
45992e5e7f All working except module returning any. 
ace_viewdistance_moduleViewDistanceLimit always returning as any. No
error in the RPT relating to readSettingfromModule failing
 2015-05-08 18:30:28 +02:00
ulteq
9a0fcd4fec AB config read caching 2015-05-08 17:20:56 +02:00
SAM
6cda97e3a0 Adding required files for module integration 2015-05-08 16:07:57 +02:00
ulteq
1f15e68c30 Global variable cleanup 2015-05-08 16:00:41 +02:00
SAM
5732015370 Added moduleViewDistance file 2015-05-08 15:36:47 +02:00
SAM
bb625aac58 Used ACE common function instead of hint 2015-05-08 15:27:13 +02:00
ulteq
fd0ca58fe6 Fixes broken bullet trace effect (caliber is now in mm, not inches) 2015-05-08 15:25:32 +02:00
SAM
a5d68f122d Added working limiter (config based) 2015-05-08 14:49:52 +02:00
SAM
6b604c101c First working version 2015-05-08 14:14:15 +02:00
ulteq
f9b6916456 Merge pull request #1053 from acemod/fixATragMX 
Fixes broken ATragMX (calculateStabilityFactor now requires metric in…
 2015-05-08 13:57:59 +02:00
ulteq
3495196f40 Fixes broken ATragMX (calculateStabilityFactor now requires metric input) 2015-05-08 13:56:38 +02:00
ulteq
0e74fa56f7 Corrected several armour piercing round configs 2015-05-08 13:45:00 +02:00
Felix Wiegand
6589cdfb0e Merge pull request #1041 from acemod/metric-units 
Metric units
 2015-05-08 13:09:31 +02:00
KoffeinFlummi
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
ulteq
fa07110311 The stability factor calculation is all metric now 2015-05-08 10:46:59 +02:00
SAM
2c8dddfc47 Adding required files 2015-05-08 09:28:48 +02:00
SAM
c2bb6386af Added required files for new module 2015-05-07 22:41:44 +02:00
Glowbal
518dfb4373 Added missing privates 2015-05-07 21:51:03 +02:00
KoffeinFlummi
a8c4068b56 Remove unnecessary comment 2015-05-07 18:51:18 +02:00
KoffeinFlummi
db07de31af Whoops; back to the roots. 2015-05-07 18:49:40 +02:00
KoffeinFlummi
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
ulteq
cea6d0063d Disables the CfgAISkill class to prevent it from affecting players. 2015-05-07 17:49:59 +02:00
ViperMaul
996c342087 Merge pull request #994 from acemod/imenumisclick 
don't close menu when no action is selected
 2015-05-06 13:31:07 -07:00
PabstMirror
5f43cffecd Sort for mag repack 2015-05-05 20:35:08 -05:00
ulteq
05f34e5d6a Attempt to fix https://github.com/acemod/ACE3/issues/1025 2015-05-05 22:21:29 +02:00
Glowbal
f6dae4f6ba Merge pull request #1016 from acemod/fixRespawnModule 
Fix undefined variable in respawn module
 2015-05-05 20:30:46 +02:00
Glowbal
50cc5db92f fixes #1017 2015-05-05 20:05:31 +02:00
Glowbal
a49feee76b should have been defaultValue 2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2 lets use proper module config for this 2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1 Make certain that GVAR(BodyRemoveTimer) exists 2015-05-05 19:44:44 +02:00
Glowbal
d88d71e2b3 Merge pull request #1015 from alganthe/master 
New anim update
 2015-05-05 19:35:31 +02:00
jaynus
8f19c13d85 Merge pull request #1009 from acemod/fixMissleGuidanceInhertiacnes 
MissleGuidance - fix Inheritance check
 2015-05-05 10:31:40 -07:00
Josuan Albin
dd2ea99d15 pak 
pak anim
 2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added 
animations added for advanced
 2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update 
new healing animation added to animationCaller, animationCallerSelf
stays the same
 2015-05-05 18:53:17 +02:00
PabstMirror
76f540409f Fix 1.44 Updating Base Class 
Updating base class VestItem->ItemInfo, by
z\addons\ace\protection\config.cpp/CfgWeapons/V_PlateCarrierIAGL_dgtl/ItemInfo/
 2015-05-05 10:46:56 -05:00
Nicolás Badano
83304a0622 Merge pull request #1011 from acemod/moveContourLegend 
#940 - Map Tweak (contor legend) for brefing
 2015-05-05 08:14:34 -03:00
ulteq
19864d5be6 Fixed a bug in the humidity calculation 2015-05-05 10:37:51 +02:00
ulteq
4f44bcdf46 Added wind data for Chernarus (Prag) 2015-05-05 10:36:12 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
PabstMirror
dafff4e63e #940 - Map Tweak (contor legend) for brefing 2015-05-04 23:50:03 -05:00
PabstMirror
21552caee7 Opps- Not the same as javelin 2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d MissleGuidance - fix Inheritance check 2015-05-04 22:46:58 -05:00
ulteq
f81e53bb33 Added wind data for Takistan (Kabul) 2015-05-04 22:17:26 +02:00
ulteq
be7391bf47 Added wind data for F.A.T.A 2015-05-04 21:28:12 +02:00
ulteq
76eaa5ded1 Added wind data for Bornholm 2015-05-04 20:35:39 +02:00
ViperMaul
032424b23e Merge pull request #1006 from acemod/skipLOSCheckBodyparts 
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
 2015-05-04 10:14:59 -07:00
esteldunedain
d07b69aca4 Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions. 2015-05-04 13:37:14 -03:00
ulteq
d78be0fa23 Merge pull request #998 from Bla1337/master 
Translation fixes/improvements (RU)
 2015-05-04 10:28:35 +02:00
Bla1337
6c6cb9128a Reverted the abbreviation changes 
Abbreviation only used when necessary for the text clipping prevention.
 2015-05-04 09:54:54 +03:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError 
Fix treatment script error
 2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ulteq
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
ulteq
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21:56 +02:00
ulteq
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master 
Czech translation - Update
 2015-05-03 17:03:47 +02:00
Bla1337
bf592ce0a9 nightvision edits 2015-05-03 17:35:58 +03:00
Bla1337
73d0be88fb nametags edits 2015-05-03 14:57:59 +03:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
Lukas
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
Lukas
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ulteq
4d4604da28 Fixed two typos in the ATragMX gun profile list 2015-05-03 10:47:49 +02:00
ulteq
d653aa262a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix 
Conflicts:
	addons/ballistics/stringtable.xml
 2015-05-03 10:21:57 +02:00
KoffeinFlummi
f678fb8fbf Merge branch 'spanish-merge' 2015-05-03 02:40:56 +02:00
KoffeinFlummi
7633f406ae Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/laser/stringtable.xml
 2015-05-03 02:40:44 +02:00
PabstMirror
d0975b4c0f Laserpointer Stringtable - fix swapped eng/czk 2015-05-02 18:55:23 -05:00
KoffeinFlummi
697656da92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-03 01:08:39 +02:00
KoffeinFlummi
a1d2bd62a4 Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-05-03 01:08:22 +02:00
jaynus
27c66ba631 Merge pull request #993 from acemod/clipboardExtension 
ACE clipboard extension to bypass clipboard limit of arma. Close #991
 2015-05-02 15:29:18 -07:00
jaynus
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-02 23:29:45 +02:00
esteldunedain
8d92d9cc7d Add ace_clipboard to ACE_Extensions 2015-05-02 18:25:35 -03:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
commy2
f44aaee7c7 also in cursor mode 2015-05-02 23:02:40 +02:00
commy2
0fd783082d don't close menu when no action is selected 2015-05-02 22:53:23 +02:00
esteldunedain
233ca37219 Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log 2015-05-02 17:52:37 -03:00
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00