esteldunedain
db4974eae2
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317
...
Conflicts:
addons/medical/CfgEden.hpp
addons/repair/CfgEden.hpp
2016-02-27 08:48:57 -03:00
jonpas
10abe5cd57
Merge branch 'master' into German-translations
2016-02-27 01:36:07 +01:00
NorXAengell
0006f72663
Minor correction in explosive
2016-02-26 19:38:51 +01:00
NorXAengell
ea461446f9
Translation Fr
2016-02-26 19:24:53 +01:00
System98
48d312cb8e
Add german translations
...
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
2016-02-25 18:10:26 +01:00
esteldunedain
71707bc81a
Some spanish translations for 3.5.0
2016-02-25 10:54:19 -03:00
Nicolas Diego Badano
5af4e1ca25
Fix trace
2016-02-24 12:17:48 -03:00
Nicolas Diego Badano
c6f6e4e9f7
Let this finally fix it please
2016-02-24 12:14:47 -03:00
esteldunedain
b32732cad0
Delete the logic and group after used
2016-02-23 19:29:18 -03:00
esteldunedain
66fa18888e
Use the logic directly to determine client
2016-02-23 18:53:33 -03:00
esteldunedain
f9ef100fad
Broadcast client
2016-02-23 11:56:46 -03:00
esteldunedain
056244602d
Get the client ID from a new logic object
2016-02-23 10:09:55 -03:00
esteldunedain
645ed3e63d
Resync mine orientations in JIP. Fix #3317
2016-02-23 09:53:38 -03:00
commy2
0f7bfc0f66
Merge pull request #3389 from acemod/precompileongamestart
...
precompile on game start
2016-02-22 16:00:19 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
licht-im-Norden87
d4cca14929
explosives
2016-02-20 23:19:51 +01:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
Thomas Kooi
14b526d417
Merge pull request #3272 from acemod/deadmanBombVest
...
Deadman switch - trigger explosives in inventory
2016-02-20 17:11:06 +01:00
PabstMirror
ed653456e5
Merge pull request #3338 from acemod/translations156merge
...
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
bux578
93e655588b
Merge pull request #3294 from gienkov/pltranslations
...
pl translation
2016-02-18 19:38:43 +01:00
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
