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
Felix Wiegand
7678919e8d
Merge pull request #982 from ToasterBR/master
...
Translation to Portuguese
2015-05-02 21:40:14 +02:00
esteldunedain
aad108a6a3
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion
2015-05-02 14:55:35 -03:00
esteldunedain
e6c333bff4
Fix oclusion when self-interacting
2015-05-02 14:54:57 -03:00
esteldunedain
1735047e3c
Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738
2015-05-02 14:37:58 -03:00
Harakhti
6c2717be7f
More more translations
...
Stope.
2015-05-02 18:06:01 +02:00
jaynus
980be9f55b
Merge pull request #972 from acemod/javFixInheritanceCheck
...
Javelin - Fix configProperties
2015-05-02 08:50:18 -07:00
adam3adam
05a6389acd
Czech translation v2
...
mk6mortar and some medical translation
2015-05-02 12:46:28 +02:00
ruPaladin
219735611f
interaction2
2015-05-02 12:47:06 +03:00
ruPaladin
3aad0904cd
medical2
2015-05-02 12:45:27 +03:00
ruPaladin
3b6e491f5c
interaction
2015-05-02 12:42:44 +03:00
ruPaladin
ca03637a54
medical
2015-05-02 12:42:02 +03:00
FreeZbe
66f39fc1dc
French : update / fix stringtable
2015-05-02 10:12:28 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
esteldunedain
fae10aa731
Replace dialog by display.
2015-05-02 01:33:28 -03:00
PabstMirror
436e50411a
Medical - Fix Uncon PFEH argument changes
2015-05-01 22:42:43 -05:00
Felix Wiegand
4dce2b8841
Merge pull request #978 from licht-im-Norden87/patch-7
...
Added german strings to interaction
2015-05-02 04:08:37 +02:00
licht-im-Norden87
f93ac12807
Added german strings to laser
2015-05-02 03:28:54 +02:00
licht-im-Norden87
106f2ab89b
Added german strings to interaction
2015-05-02 03:25:28 +02:00
Dimas
b350d234e2
Addes spanish translation
...
Added spanish translation for three strings. Did it manually here.
2015-05-02 02:44:39 +02:00
esteldunedain
b8d8aeae5c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-05-01 20:32:51 -03:00
esteldunedain
be07fd2c82
Avoid ACE_Comanche_Test from showing on Zeus. #943
2015-05-01 20:32:20 -03:00
Grzegorz
c9cf1d2455
Update CfgVehicles.hpp
...
another typo few lines below
2015-05-02 01:26:54 +02:00
Grzegorz
5b9e6de6f1
Update CfgVehicles.hpp
...
missing "s"
2015-05-02 01:21:49 +02:00
PabstMirror
675b76f569
Privates - Interaction
2015-05-01 18:12:24 -05:00
PabstMirror
ce1255bb2f
Fix configProperties
2015-05-01 17:56:04 -05:00
KoffeinFlummi
97a9bffe98
Set version number to 3.0.0.2
2015-05-02 00:49:43 +02:00
ulteq
4239772ce9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-05-02 00:36:34 +02:00
ulteq
884da7742e
Disabled AB terrain init, if AB is not enabled
2015-05-02 00:36:23 +02:00
Felix Wiegand
07ec7b96c4
Merge pull request #954 from acemod/medicalFixVehAnimation
...
Medical fix veh animation
2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
KoffeinFlummi
e05f1b557a
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-02 00:19:39 +02:00
KoffeinFlummi
debfe990e8
Fix duplicates
2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f
Merge https://github.com/adam3adam/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/interact_menu/stringtable.xml
2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312
Czceh translation
2015-05-02 00:04:50 +02:00
Felix Wiegand
f16e02b003
Merge pull request #959 from licht-im-Norden87/patch-6
...
Update Stringtable: missileguidance
2015-05-02 00:03:13 +02:00
Grzegorz
c1d87f2a75
PL translation
...
interaction
2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf
Merge pull request #689 from acemod/group
...
Reword the group action names
2015-05-01 23:30:10 +02:00
Tachii
60c02f4051
added 2 missing ru strings
2015-05-02 00:21:00 +03:00
FreeZbe
6f5e64b4a5
French : update / fix stringtable
2015-05-01 23:10:06 +02:00
FreeZbe
7e12c97317
French : update / fix stringtable
2015-05-01 23:09:09 +02:00
FreeZbe
d1da3a82d7
French : update / fix stringtable
2015-05-01 23:08:36 +02:00
Felix Wiegand
58a67a2f77
Merge pull request #962 from gienkov/patch-10
...
PL translation
2015-05-01 22:51:36 +02:00
KoffeinFlummi
cc627b4a92
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd
Add spanish translation for removing tournis
2015-05-01 22:49:52 +02:00
Glowbal
937b20f551
Merge branch 'master' of github.com:acemod/ACE3
2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4
This should not be 1
2015-05-01 22:49:13 +02:00
Grzegorz
3b321c7bf2
PL translation
...
laser
2015-05-01 22:46:51 +02:00
KoffeinFlummi
a002c796da
Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/respawn/stringtable.xml
2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86
Merge branch 'master' into spanish-merge
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec
Last touches to Spanish translation
2015-05-01 22:42:09 +02:00
bux578
1a946acc30
German Translation / Typo
2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76
PL translation
...
STR_ACE_Medical_RemovingTourniquet
2015-05-01 22:32:53 +02:00
Glowbal
0a300f3385
Merge pull request #960 from acemod/medicalMissingProgressText
...
Added missing progress bar display text
2015-05-01 22:31:41 +02:00
Glowbal
e8ccddfc2c
Added missing progress bar display text
2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c
Translation of some stuff into czech language
...
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23
I suck at git
...
redo reverted stuff here
2015-05-01 15:03:05 -05:00
licht-im-Norden87
5e8096f29c
Update Stringtable: missileguidance
2015-05-01 21:29:49 +02:00
PabstMirror
e67e15c3fa
Merge branch 'master' into medicalFixVehAnimation
...
Conflicts:
addons/common/functions/fnc_getDeathAnim.sqf
addons/common/functions/fnc_loadPersonLocal.sqf
2015-05-01 14:29:21 -05:00
licht-im-Norden87
d12c7ff048
Update Stringtable: Rallypoint
...
Angleichung
2015-05-01 21:25:39 +02:00
KoffeinFlummi
c9ff497c83
Merge branch 'master' into polish-merge
...
Conflicts:
addons/respawn/stringtable.xml
2015-05-01 21:13:36 +02:00
Felix Wiegand
90275b272e
Merge pull request #950 from Tachii/patch-19
...
Added few missing ru strings
2015-05-01 21:11:37 +02:00
Felix Wiegand
b0094ff8e6
Merge pull request #949 from Tachii/patch-18
...
added 1 RU string
2015-05-01 21:11:17 +02:00
Felix Wiegand
3d45a26334
Merge pull request #957 from evromalarkey/master
...
Few Czech strings
2015-05-01 21:07:27 +02:00
jaynus
2bd0acb621
Revert "GetDeathAnim"
...
This reverts commit 0f736ae684
2015-05-01 12:00:38 -07:00
jaynus
6603806c77
Revert "Save and replay valid awake animations"
...
This reverts commit 8d1ac26e24
2015-05-01 12:00:21 -07:00
jaynus
c1ba4966f9
Test confirm no bouncy.
2015-05-01 11:53:55 -07:00
Lubomír Blažek
dcb3196e58
Czech strings
2015-05-01 20:52:41 +02:00
jaynus
5bf763a08e
quote, not var.
2015-05-01 11:47:49 -07:00
Tachii
bed298d5b3
Update stringtable.xml
2015-05-01 21:38:05 +03:00
jaynus
2ed05ed469
Merge remote-tracking branch 'origin/master' into laserCodeSelection
2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e
Resolved. Conflicts:
...
addons/missileguidance/functions/fnc_onFired.sqf
2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2
Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751
2015-05-01 11:31:37 -07:00
Glowbal
e1d0ac4b9e
Added author
2015-05-01 20:16:34 +02:00
PabstMirror
d8a6dd1bbd
Stuff
2015-05-01 12:58:56 -05:00
Tachii
66eda924ac
Update stringtable.xml
2015-05-01 20:48:37 +03:00
Glowbal
722c459c1e
added APL pbo
2015-05-01 19:37:17 +02:00
Grzegorz
7e87c3a250
Update stringtable.xml
2015-05-01 19:32:59 +02:00
Grzegorz
e36fbe9da7
Update stringtable.xml
2015-05-01 19:32:43 +02:00
Grzegorz Sikora
4668869959
PL translation
2015-05-01 19:30:30 +02:00
Tachii
b1a23fd3c7
Update stringtable.xml
2015-05-01 20:29:57 +03:00
Tachii
43dea56ae6
Update stringtable.xml
2015-05-01 20:29:00 +03:00
Tachii
66818e0a74
Update stringtable.xml
2015-05-01 20:26:05 +03:00
Tachii
889275091e
Update stringtable.xml
2015-05-01 20:24:13 +03:00
Tachii
1771b61578
added 2 missing ru strings
2015-05-01 20:23:05 +03:00
Tachii
43655d0cec
Update stringtable.xml
2015-05-01 20:18:51 +03:00
Tachii
caf301ac99
Update stringtable.xml
...
Added 1 RU string
2015-05-01 20:15:35 +03:00
PabstMirror
8d1ac26e24
Save and replay valid awake animations
2015-05-01 12:12:13 -05:00
ulteq
ff2d7fdb72
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix
...
Conflicts:
addons/fcs/functions/fnc_firedEH.sqf
2015-05-01 19:00:27 +02:00
ulteq
aa21962f8b
Allowed positive weapon initSpeed values
2015-05-01 18:55:44 +02:00
Glowbal
80162627ec
Fixed spelling of enableUnconsciousnessAI
2015-05-01 18:49:59 +02:00
Felix Wiegand
23bb96e514
Merge pull request #948 from ruPaladin/patch-7
...
Russian translation (interact_menu)
2015-05-01 18:39:34 +02:00
ruPaladin
2aa788bba2
Update stringtable.xml
2015-05-01 19:26:23 +03:00
ruPaladin
a883517a5e
Update stringtable.xml
2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e
Fix duplicate entries
2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92
Merge https://github.com/FreeZbe/ACE3 into french-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
ulteq
a42dec6760
Added more missing privates
2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33
Finds the corresponding weapon class for each magazine type.
2015-05-01 17:39:38 +02:00
KoffeinFlummi
e46eba673f
Merge branch 'master' into german-translation
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
ulteq
6dc28f026f
Added missing private
2015-05-01 17:15:49 +02:00
Felix Wiegand
526b0a2d59
Merge pull request #931 from gienkov/master
...
PL translation
2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3
Removed duplicate code
2015-05-01 16:24:16 +02:00
Nicolás Badano
65dcbce25e
Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection
...
Revert "Takes negative initSpeed values into account"
2015-05-01 11:07:57 -03:00
ulteq
3ad668605a
Fix for last fcs change
2015-05-01 16:02:34 +02:00
jaynus
e4567fb59f
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
...
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
2015-05-01 06:59:28 -07:00
jaynus
9997b6d464
action is select 1
2015-05-01 06:57:49 -07:00
Nicolás Badano
cde80b2901
Revert "Takes negative initSpeed values into account"
2015-05-01 10:38:41 -03:00
commy2
b255d1040b
scope 1 for ACE_Comanche_Test, #943
2015-05-01 15:30:11 +02:00
FreeZbe
68d62b0005
Update stringtable.xml
2015-05-01 14:20:21 +02:00
FreeZbe
518614ec0b
Update stringtable.xml
2015-05-01 14:20:03 +02:00
FreeZbe
79ac41bd95
Update stringtable.xml
2015-05-01 14:19:43 +02:00
bux578
bfb68fe368
fix spelling errors
2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021
Update stringtable.xml
2015-05-01 14:19:15 +02:00
FreeZbe
acf74dd2ae
Update stringtable.xml
2015-05-01 14:13:32 +02:00
FreeZbe
7a397459ae
Update stringtable.xml
2015-05-01 14:13:08 +02:00
FreeZbe
371aa381ec
Update stringtable.xml
2015-05-01 14:12:45 +02:00
FreeZbe
820c841b35
Update stringtable.xml
2015-05-01 14:12:10 +02:00
FreeZbe
53be70f661
French : update stringtable
2015-05-01 14:07:08 +02:00
ulteq
a6f4c68ef4
Removed obsolete comment
2015-05-01 13:50:01 +02:00
ulteq
6d0e2cc464
Merge pull request #936 from acemod/explosivesSleepReplacement
...
Replaced sleep with waitAndExecute
2015-05-01 12:55:14 +02:00
Glowbal
f0efba09e5
Merge pull request #814 from acemod/basic-med-options
...
Basic medical module options
2015-05-01 12:27:22 +02:00
ulteq
a9cde188ea
Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection
...
Takes negative initSpeed values into account
2015-05-01 12:24:22 +02:00
bux578
2acc10ba70
meh
2015-05-01 12:19:42 +02:00
Glowbal
e9a86da8e0
Should be in same order as the module
2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4
missing german translation
2015-05-01 12:17:28 +02:00
ulteq
4c0bed609e
Fixed a typo
2015-05-01 11:53:53 +02:00
Glowbal
5beca63ae2
Added missing private
2015-05-01 11:51:23 +02:00
ulteq
940f8e8349
Cleanup++:
...
*Removed spawn
*Added, moved and renamed some privates
2015-05-01 11:38:09 +02:00
commy2
a97c934688
fix ubc, fix #938
2015-05-01 11:01:07 +02:00
ulteq
d3b36c2b56
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-05-01 10:26:48 +02:00
ulteq
723ffc21d1
Removed unneeded TODO
2015-05-01 10:26:37 +02:00
ulteq
2219339e24
Fixed a typo
2015-05-01 10:25:59 +02:00
ulteq
965e45a53c
Takes negative initSpeed values into account
2015-05-01 10:25:33 +02:00
commy2
b859956604
rename category ace <blank> to ace common
2015-05-01 10:19:47 +02:00
PabstMirror
0f736ae684
GetDeathAnim
2015-05-01 03:13:26 -05:00
ulteq
e8264110bb
Replaced sleep with waitAndExecute
2015-05-01 10:12:41 +02:00
commy2
c52278c11f
Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty
2015-05-01 09:52:03 +02:00
esteldunedain
a0923aa5c3
Tweak the position for rally point actions. Fix #837
2015-05-01 01:57:37 -03:00
esteldunedain
324b9510e3
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
2015-05-01 01:56:39 -03:00
esteldunedain
fc02bb4e06
Stylistic changes
2015-05-01 00:32:16 -03:00
esteldunedain
aa4a5539d4
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
2015-05-01 00:04:22 -03:00
KoffeinFlummi
984a1fe337
Rename breakLine to break_line
2015-05-01 02:14:23 +02:00
KoffeinFlummi
e06e1a2f89
Make preventDeath work
2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464
Let setUncon handle AI unconsciousness
2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2
Rename caching variables in basic HD
2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f
Reduce animation forcing delay
2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8
Offload ejecting to unloadPerson
2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3
Proper privates and alignment
2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7
Whoops
2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea
Merge remote-tracking branch 'origin/master' into basic-med-options
...
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
Kavinsky
f301491c7a
changed variable name to use QGVAR macro
2015-04-30 23:18:45 +02:00
Grzegorz
3f932c0a93
Update stringtable.xml
2015-04-30 22:55:51 +02:00
Grzegorz
1e0eaa1971
Update stringtable.xml
2015-04-30 22:55:43 +02:00
Grzegorz Sikora
03973f3dcf
PL translation
2015-04-30 22:54:15 +02:00
Glowbal
eb48048a58
Merge pull request #930 from acemod/keybindingCategories
...
Split keybindings into different sub-categories
2015-04-30 22:51:39 +02:00
commy2
2ae5538df5
change wrong strings
2015-04-30 22:46:08 +02:00
Glowbal
131468f0d8
plurals
2015-04-30 22:39:33 +02:00
PabstMirror
090062153c
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
KoffeinFlummi
d59436c588
Only force animation when necessary
2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903
Fix missing semicolon
2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf
Reorganize AI unconsciousness
2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938
Remove max unconsciousness time again
2015-04-30 22:15:40 +02:00
Glowbal
7106093f1c
Merge pull request #929 from acemod/medical-lowercase
...
Convert Medical stringtable key names to lowercase
2015-04-30 22:10:54 +02:00
commy2
bc0d95765a
Merge pull request #849 from acemod/menuonclick
...
add option to only use action when clicking
2015-04-30 22:08:37 +02:00
KoffeinFlummi
270c3adc1e
Do it again, but properly this time
2015-04-30 22:06:10 +02:00
Glowbal
1ca0d66f30
Initial categories
2015-04-30 22:02:20 +02:00
KoffeinFlummi
85669a9e92
Convert Medical stringtable key names to lowercase
2015-04-30 22:01:09 +02:00
Glowbal
e7290feaa2
disabled radial option, so it isn't server selectable either
2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310
Disabled client setting for menu style
2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e
Merge branch 'master' into medicalMenuClientSetting
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
2015-04-30 21:08:46 +02:00
PabstMirror
ba18f8b430
Handle Scaling
2015-04-30 14:07:19 -05:00
commy2
8c8e310d66
handle cursor mode
2015-04-30 21:00:30 +02:00
Glowbal
349d723fea
Merge pull request #928 from acemod/AdjustUnloadPerson
...
Adjust unload person
2015-04-30 20:55:17 +02:00
Glowbal
67370f3340
Handles waking up
2015-04-30 20:49:38 +02:00
Glowbal
8d358f3ab5
can only carry/drag units that are not in a vehicle
2015-04-30 20:44:59 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
commy2
5ec8b6d36c
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
2015-04-30 20:01:58 +02:00
PabstMirror
a46d4e11ab
Remove linebreak from teamManagement, fix leaveteam
2015-04-30 12:38:19 -05:00
bux578
367da1f4bf
cleaned up insignias
2015-04-30 19:36:35 +02:00
PabstMirror
5ca75f9973
Action names Join->Assign
2015-04-30 12:20:01 -05:00
PabstMirror
ca57a4e168
Merge branch 'master' into group
...
Conflicts:
addons/interaction/CfgVehicles.hpp
addons/interaction/stringtable.xml
2015-04-30 11:59:53 -05:00
Kavinsky
b9c1936efc
changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser
2015-04-30 18:51:30 +02:00
KoffeinFlummi
fd152c580b
Merge branch 'master' into basic-med-options
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
9c02f915ec
Merge pull request #922 from acemod/medicalPrivates
...
Medical Private Variables
2015-04-30 11:34:33 -05:00
jaynus
21cc0db28f
Correctly look up configs.
2015-04-30 09:04:29 -07:00
jaynus
7568773ece
class localize and disable all guidance/locking.
2015-04-30 09:00:09 -07:00
bux578
0f135c5dab
fix ballistics stringtable
2015-04-30 15:23:52 +02:00
ulteq
ac33ad109f
Merge pull request #923 from Bla1337/master
...
Localization update (Russian)
2015-04-30 13:44:54 +02:00
Harakhti
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Bla1337
5d1478b733
interact and medical system localization upd
2015-04-30 14:01:22 +03:00
ulteq
50a8a89b28
Added missing privates
2015-04-30 10:50:49 +02:00
ulteq
d2aa28715d
Merge pull request #874 from acemod/fragCleanup
...
Frag cleanup
2015-04-30 10:35:25 +02:00
ulteq
e77ddcf837
Added Sh_105mm_HEAT_MP frag config
2015-04-30 10:35:06 +02:00
ulteq
59017ed79d
Added more frag configs:
...
* R_Hydra_HE
* Sh_120mm_HE
* Sh_125mm_HE
* Missile_AGM_02_F
* M_Hellfire_AT
2015-04-30 10:26:00 +02:00
