a383da5b2d
fix inverted isTurnedOut for map lighting
...
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).
Signed-off-by: freghar <freghcz@gmail.com >
2015-12-20 11:53:08 +01:00
575fabb69d
#2872-Map time support for subclasses of ItemWatch
2015-11-24 16:17:06 -06:00
7981faad64
private -> local
2015-11-23 17:47:58 -06:00
0273dd1d4d
Merge branch 'master' into fixFlashlightPrivates
2015-11-23 17:45:41 -06:00
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
f8481ae5f2
Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
...
Conflicts:
addons/captives/stringtable.xml
2015-11-18 06:39:58 +03:00
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
e72c1d874a
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/functions/fnc_determineMapLight.sqf
2015-11-10 21:21:06 -06:00
01d679c5dc
#2810 - Delete map glow light from DC players
2015-11-07 14:33:41 -06:00
ff60cdcfa3
#2828 - Fix empty flashlightProxy model
2015-11-07 11:44:31 -06:00
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
e2763dde27
Russian Translations - Update
2015-11-05 03:28:53 +03:00
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
acc3504d7b
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
843eb16837
Merge pull request #2650 from acemod/setDefaultChannel
...
Set Default Channel at mission start
2015-10-18 12:28:13 +02:00
da2d140a39
Cleanup unnecessary statement
2015-10-17 14:30:59 -05:00
6ffde8150f
Simplify Map Light Interactions
2015-10-14 14:36:40 -05:00
2dcdd224bd
fix privates in Map module
2015-10-14 19:56:54 +02:00
5d76395914
#2734 - Map effects / flashlights for TrippleHead
2015-10-12 11:27:38 -05:00
251437c415
pl translation
2015-09-29 20:37:30 +02:00
c0b78ecf3a
Set Default Channel at mission start
2015-09-29 11:36:30 -05:00
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
97921aa665
#2503 - run BFT module on server
2015-09-18 12:18:43 -05:00
463e21dd91
330
2015-09-16 12:40:30 +02:00
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
89eb98a248
Added: IT more translation, medic partial
...
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
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
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
6b7f84b297
add missing ;
2015-09-03 13:39:17 +02:00
76bb2bd2b8
replace function with FUNC macro
2015-09-03 13:37:36 +02:00
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
07ab7d1c35
correct comment
2015-09-02 02:00:53 +02:00
29efc13556
hide clock, use eventhandler
2015-09-02 01:59:07 +02:00
43c54d51e8
hide clock on map if no watch in inventory, #414
2015-09-02 01:40:38 +02:00
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
17f647f341
PL translation
2015-08-30 01:42:42 +02:00
