PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
gienkov
d5dd718b8d
fix endlines
2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7
pl translation
2016-02-09 11:50:35 +01:00
VKing
f92b798586
Switch to select (is even slightly faster)
2016-02-07 13:09:01 +01:00
PabstMirror
9b3ca2822f
Change german stringtable
2016-02-05 14:46:30 -06:00
PabstMirror
deac4395c1
Deadman switch - trigger explosives in inventory
...
Also allow manual triggering of the deadman device
2016-02-05 11:40:11 -06:00
Thomas Kooi
8c9523e36b
Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers
...
Various explosives enhancements
2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5
Merge pull request #3106 from acemod/explEvents
...
Explosive events, fix #3104
2016-02-04 19:52:10 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
78729e96ff
Fix bad forceWalk params
2016-01-24 11:39:59 -06:00
VKing
9501c54530
Fix #3203 IEDs magically changing shape
2016-01-22 14:21:25 +01:00
VKing
68531bd4a9
Merge branch 'master' into explosives_cleanup_plus_minetriggers
2016-01-22 14:15:45 +01:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
Thomas Kooi
33479ffcae
Merge pull request #3146 from acemod/Explosives_DetonateTrigger
...
Function to detonate explosives via script
2016-01-19 09:38:43 +01:00
Thomas Kooi
46f832379a
Merge pull request #3120 from acemod/explosives_actionmenu_cleanup
...
Clean up explosive interaction menu
2016-01-19 09:32:26 +01:00
VKing
e3123b3f56
Local check before setPosition
2016-01-16 01:13:01 +01:00
VKing
17aaf477fe
Standardize displayName for the M26/Mk26/M152/whatever this is
2016-01-15 11:47:40 +01:00
VKing
cfea80bec8
Animate preplaced bottom attack SLAMs
2016-01-15 10:49:22 +01:00
VKing
248eb2143b
Fix inconsistent detonator pictures for some IEDs
2016-01-15 10:20:49 +01:00
VKing
0078ad862a
Remove redundant entries.
...
Not removing them as it can be useful to have a reminder that those classes exist.
2016-01-15 09:33:01 +01:00
VKing
4e8ea4f8e6
Fix detonate action pictures
2016-01-15 00:25:02 +01:00
VKing
05c80c2368
Gah stop that you jerk!
2016-01-15 00:04:12 +01:00
VKing
ed8b437a8f
Prep function
2016-01-14 23:58:31 +01:00
VKing
32b33d7792
How the feck did this happen
2016-01-14 23:58:07 +01:00
VKing
8bdb2cb7f7
GVAR it.
2016-01-14 23:05:56 +01:00
VKing
575f37c8fd
Add fnc_connectExplosive to add editor explosives to unit triggers
2016-01-14 23:05:26 +01:00
VKing
099648b6b6
Russian translation as suggested
2016-01-14 18:51:14 +01:00
VKing
73e093ec07
Make stringtable a little more translatable
2016-01-13 22:39:37 +01:00
VKing
2c26d3836b
Some fixes for the zeus modules
2016-01-13 22:39:14 +01:00
VKing
1ae21ad354
Change SLAM bottom attack ammo to be more bottom attacky
2016-01-13 15:41:20 +01:00
VKing
b87a6327ee
Fix Zeus modules not showing up
2016-01-13 15:40:39 +01:00
VKing
058ea4e8f4
Actual editor mines
2016-01-13 01:03:50 +01:00
VKing
f90dd9fed8
Allow SLAMs to use long range transmitter
2016-01-13 00:14:17 +01:00
VKing
46643d44d0
Add editor/zeus modules for different trigger options
2016-01-13 00:13:56 +01:00
VKing
a07d456476
Change small IEDs to use smaller pressure plates
2016-01-12 23:17:10 +01:00
VKing
61f288c9cc
Rename custom classes with ACE_ prefix
2016-01-12 23:16:49 +01:00
VKing
4fc7c3065e
Rename to fnc_scriptedExplosive
2016-01-11 23:41:33 +01:00
VKing
01dd663337
Add fnc_detonateExplosiveTrigger
2016-01-11 23:36:34 +01:00
VKing
9985988987
Change ACE_Player to _unit
2016-01-06 18:05:06 +01:00
PabstMirror
4c229c92f5
Add Stringtable Entry
2016-01-05 17:29:01 -06:00
PabstMirror
b6dce03c90
Fix Header
2016-01-05 17:16:47 -06:00
VKing
1706ca0adc
Move detonate actions from "Detonate" layer to "Explosives" layer.
...
Remove inconsistent ">>" from explosive actions.
2016-01-06 00:06:06 +01:00
VKing
cc8ac69feb
Add function and action to detonate all explosives on a detonator
2016-01-05 23:47:01 +01:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
bux
977bda83e5
add 2 new events, add unit to place event
...
defuse and explodeOnDefuse
2016-01-01 21:47:39 +01:00
licht-im-Norden87
2d64d54d98
Update German Stringtable
...
Iam sure there was a translation some time ago. Someone must have deleted it.
spelling mistake
Update Stringtable
100% some of them already existed in german language
Update stringtable.xml
spelling mistake
Update stringtable.xml
Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.
Update stringtable.xml
2015-12-31 14:17:13 -06:00
bux
23bec6d9a8
Merge master into branch
2015-12-31 10:20:47 +01:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
bux
d6c5643790
improve code style
2015-12-30 09:43:19 +01:00
bux
2a6042bf61
add interaction position and defuse object position
...
and reduce interaction distance
2015-12-30 09:11:57 +01:00
bux
112c002b0b
remove ace_offset entry
...
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
d037f00a92
fix forEachIndex capitalization
2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
PabstMirror
ebcc540943
Merge pull request #2572 from acemod/fixClickExplosivePlace
...
Delay one frame when selecting explosives
2015-09-22 13:23:33 -05:00
PabstMirror
5add8d6789
#2537 - Delay one frame when selecting explosives
2015-09-22 11:31:58 -05:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
Glowbal
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
Alessandro Foresi
bc4f928088
Add: IT translation up to flashlights
2015-09-12 09:41:43 +02:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
Michael Braun
035b3432c5
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
gienkov
17f647f341
PL translation
2015-08-30 01:42:42 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
Michael Braun
5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
Michael Braun
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
PabstMirror
05925ad7c2
Merge pull request #1902 from acemod/virtualExplosivesPlace
...
Virtual explosives place
2015-08-23 16:57:24 -05:00
gienkov
cf585790db
fixes done
2015-08-22 11:41:15 +02:00
PabstMirror
cc9eee5609
Typo
2015-08-21 09:42:23 -05:00
PabstMirror
4c14dc7684
#2208 - Use ACE Message Display instead of sideChat
2015-08-19 17:25:45 -05:00
PabstMirror
61bc40a650
Opps
2015-08-16 02:05:34 -05:00
PabstMirror
b9638f749b
SetPosition Event - Fix digging down ( #1991 )
2015-08-16 01:51:44 -05:00
PabstMirror
fc6cd34d33
params, cleanup
2015-08-15 14:35:33 -05:00
PabstMirror
7203bb2a3d
Cleanup Debug, Limit Satchel Mass
2015-08-05 12:22:43 -05:00
PabstMirror
a6292db1e8
#2018 - Dead Mans Switch / unconscious
2015-08-05 11:54:45 -05:00
PabstMirror
72273c5ad0
Merge branch 'master' into virtualExplosivesPlace
2015-08-05 11:36:58 -05:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
214fda074a
Merge branch 'master' into virtualExplosivesPlace
2015-07-28 15:48:37 -05:00
PabstMirror
bfd3aa71c4
Manual Fix #1931
2015-07-28 15:25:52 -05:00
SilentSpike
16597515f0
Adding remaining missing English straings
2015-07-28 20:55:22 +01:00
PabstMirror
9b551e3fdf
#1931 - Fix Explosives Module Strings
2015-07-28 14:42:23 -05:00
PabstMirror
9f078d405b
Tweak Place when Prone
2015-07-25 02:10:33 -05:00
PabstMirror
bff629be9c
Fix PositionAsl / Update mouse hints
2015-07-25 01:42:17 -05:00
PabstMirror
bc953b32bc
More Stuff
2015-07-18 00:36:47 -05:00
Glowbal
0154dfc51e
Merge pull request #1799 from jokoho48/3DModelUpdate
...
Add and Update Some 3D Object and Textures
2015-07-17 08:17:42 +02:00
PabstMirror
df90c4b88e
More Attach Stuff
2015-07-16 23:59:31 -05:00
PabstMirror
1f4488253d
Only attach some triggers
2015-07-15 23:52:47 -05:00
Joko
9aa0285064
Revert LoD Changes
2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73
Move UAV Battery form models to data
...
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
Joko
a72312738e
Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
...
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
PabstMirror
7cc2628c53
Stuff
2015-07-15 03:18:19 -05:00
PabstMirror
104d1a1cc7
Attaching (Rotate to verticle)
2015-07-15 02:54:38 -05:00
PabstMirror
6130b5b373
Working Demo
2015-07-14 00:24:55 -05:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
Joko
240b26b9ac
Add IRStrobe 3D Object to attach
...
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ulteq
241e8acdd9
Merge pull request #1541 from jonpas/sitting
...
Sitting
2015-06-26 21:34:34 +02:00
ulteq
474e694309
Enable interaction with explosives while swimming
2015-06-19 11:49:38 +02:00
AKALegman
c027db2e0e
final fixes
2015-06-15 20:55:49 +01:00
AKALegman
5915e24f5d
some fixes
2015-06-14 16:09:01 +01:00
AKALegman
0690e6f745
fixed conflicts
2015-06-14 09:36:03 +01:00
jonpas
670d23e14c
Fixed Black Cellphone Display after 1.46
2015-06-13 22:12:32 +02:00
jonpas
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
esteldunedain
1237b1cb4a
Make claymores detonatable by MK16. Close #1603
2015-06-13 16:05:18 -03:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
AKALegman
0e375075ea
improved explosives v2.1
2015-06-06 19:04:58 +01:00
AKALegman
46ed9416ed
improved explosives v2
2015-06-06 18:58:42 +01:00
AKALegman
f9a7ab5ae0
improved explosives
2015-06-06 10:11:00 +01:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52
Merge pull request #1417 from acemod/localDefuseObjects
...
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
AKALegman
3b01da6962
IED Class Inheritance Fixes
2015-05-30 16:57:50 +01:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
...
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Garth L-H de Wet
529e200a4c
Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.
2015-05-28 17:56:45 +02:00
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +02:00
