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
7,299 Commits 73 Branches 88 Tags 752 MiB
02faf0a104
Commit Graph

111 Commits

Author SHA1 Message Date
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
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
gienkov
1edcc320d1 Merge remote-tracking branch 'origin' into pl-translation-7 2015-09-07 16:05:45 +02:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
commy2
6b7f84b297 add missing ; 2015-09-03 13:39:17 +02:00
commy2
76bb2bd2b8 replace function with FUNC macro 2015-09-03 13:37:36 +02: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
commy2
07ab7d1c35 correct comment 2015-09-02 02:00:53 +02:00
commy2
29efc13556 hide clock, use eventhandler 2015-09-02 01:59:07 +02:00
commy2
43c54d51e8 hide clock on map if no watch in inventory, #414 2015-09-02 01:40:38 +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
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
Glowbal
13740c06e4 Merge pull request #1816 from voiperr/ace_map_dev 
Flashlight simulation on map
 2015-08-26 09:01:30 +02:00
voiper
e237bea88c Dimmed the glow values. 2015-08-24 15:43:43 -07:00
voiper
f8f8d7fd19 Simplified the colour check again. 2015-08-24 15:43:21 -07:00
voiper
54f1a87222 Simplified the colour check. 2015-08-24 15:42:12 -07:00
voiper
720f6c075a Removed old references to NVG. 2015-08-24 14:08:02 -07:00
voiper
1f8b16f7fb Fixed BFT module weirdness. 2015-08-24 14:06:19 -07:00
voiper
72b12e3af4 Fixed indentation. 2015-08-24 14:03:23 -07:00
voiper
b230762abd Add some string checking for flashlight glow type. 2015-08-24 13:59:35 -07:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
PabstMirror
6932014b9d Merge pull request #1993 from acemod/fixMapCompassChange 
Fix ace_map changes to compass display object
 2015-08-14 19:34:09 -05:00
voiper
8230dbd272 Git fix #4. 2015-08-11 11:08:01 -07:00
voiper
e0ed81dc67 Git fix #2. 2015-08-11 10:59:21 -07:00
voiper
2144a56be1 Fix attempt. 2015-08-11 10:49:39 -07:00
SilentSpike
17e6aca0c8 Fix ace_map changes to compass display object 
1. RscDisplayDiary doesn't even have a compass object that needs to be changed
2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).
 2015-08-03 13:30:08 +01:00
PabstMirror
2d051188a7 #1957 - Fix BFT Module / Settings (for 3.2.1) 2015-08-01 00:01:33 -05:00
Harakhti
2b23958fd1 Row 2 
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
 2015-07-30 16:06:32 +02:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
Ivan Navarro Cabello
78529af60c Update spanish translation 2015-07-08 20:57:46 +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
PabstMirror
c58ff8d31d #1736 - Allow moving map while shake effect active 2015-07-01 00:13:55 -05: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
jonpas
2e50261bd3 Exit entire map Client XEH on Headless 2015-06-21 21:10:50 +02:00
jonpas
a7d9489555 Fixed map module init, Prevented BFT execution on Headless, Changed BFT Enabled string 2015-06-21 21:08:37 +02:00
jonpas
4f35e10afa Changed BFT_Enabled to module option for proper ACE_Settings handling 2015-06-21 04:46:55 +02:00
jonpas
10602f10c6 Fixed BFT ACE_Settings, Fixed Map Module Initialized diag_log 2015-06-21 04:19:12 +02:00