PabstMirror
0273dd1d4d
Merge branch 'master' into fixFlashlightPrivates
2015-11-23 17:45:41 -06:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
kaban
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
PabstMirror
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
PabstMirror
e72c1d874a
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/functions/fnc_determineMapLight.sqf
2015-11-10 21:21:06 -06:00
PabstMirror
01d679c5dc
#2810 - Delete map glow light from DC players
2015-11-07 14:33:41 -06:00
PabstMirror
ff60cdcfa3
#2828 - Fix empty flashlightProxy model
2015-11-07 11:44:31 -06:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
kaban
e2763dde27
Russian Translations - Update
2015-11-05 03:28:53 +03:00
PabstMirror
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
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Jonathan Pereira
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
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
PabstMirror
acc3504d7b
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
Glowbal
843eb16837
Merge pull request #2650 from acemod/setDefaultChannel
...
Set Default Channel at mission start
2015-10-18 12:28:13 +02:00
PabstMirror
da2d140a39
Cleanup unnecessary statement
2015-10-17 14:30:59 -05:00
PabstMirror
6ffde8150f
Simplify Map Light Interactions
2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd
fix privates in Map module
2015-10-14 19:56:54 +02:00
PabstMirror
5d76395914
#2734 - Map effects / flashlights for TrippleHead
2015-10-12 11:27:38 -05:00
gienkov
251437c415
pl translation
2015-09-29 20:37:30 +02:00
PabstMirror
c0b78ecf3a
Set Default Channel at mission start
2015-09-29 11:36:30 -05:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
97921aa665
#2503 - run BFT module on server
2015-09-18 12:18:43 -05: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
89eb98a248
Added: IT more translation, medic partial
...
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +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
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02: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
0a47396d10
Corrections for German translation
2015-05-31 14:25:52 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02: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
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
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
PabstMirror
7dec983397
#1383 - Fix map shake interfering with other anims
...
Don't run ctrlMapAnimClear each frame, only when ending the animation
2015-05-24 23:56:22 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
PabstMirror
1ccf6fb70d
#1181 - Reset BFT_markers array each time
2015-05-16 21:54:11 -05:00
SAM
31adb5a9fc
Second batch of settings files
2015-05-14 20:59:25 +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
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
PabstMirror
2e91f45273
#1104 - Fix legend in editor
2015-05-10 16:57:05 -05:00
PabstMirror
dafff4e63e
#940 - Map Tweak (contor legend) for brefing
2015-05-04 23:50:03 -05:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
jaynus
d8d658602f
Apply to all aircraft gunner and pilot
2015-04-21 12:50:42 -07:00
jaynus
08203b26c7
Illuminate map for gunner of helicopters. Fixes #558
2015-04-21 11:58:07 -07:00
PabstMirror
caef5c105f
More Privates
2015-04-17 22:40:37 -05:00
commy2
147fcdfa0c
Merge pull request #392 from KoffeinFlummi/requiredaddons
...
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
Nicolás Badano
c57044fd4a
Merge pull request #390 from KoffeinFlummi/betterMapColors
...
Improve map colors by taking them from A2
2015-04-09 09:52:06 -03:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561
Improve map colors taking them from A2
2015-04-09 01:28:36 -03:00
commy2
1ae69d56ff
Merge pull request #377 from KoffeinFlummi/142light
...
142 directional light for map effects
2015-04-08 21:46:48 +02:00
commy2
deece11689
remove debug
2015-04-08 10:47:56 +02:00
commy2
a47cdb9738
disable map cursor coordinates in mp
2015-04-08 10:45:57 +02:00
esteldunedain
b18bcf8835
Add option to turn on/off cursor coordinates
2015-04-08 01:49:56 -03:00
commy2
691ab012b4
fix map loaded on preInit
2015-04-08 00:44:14 +02:00
commy2
4834facccf
moving it to map
2015-04-08 00:30:36 +02:00
commy2
b6c278e7d3
fix using efunc vs func
2015-04-07 22:33:35 +02:00
commy2
96268b6407
directional light for map effects
2015-04-07 22:19:03 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
Nicolás Badano
4c1f7111b5
Add map module
2015-03-16 20:24:53 -03:00
Nicolás Badano
096b270b83
Merge branch 'mapContours' into mapfx
...
Conflicts:
addons/map/config.cpp
2015-03-14 17:20:25 -03:00
Nicolás Badano
618c021f7e
Tab to space plus comments for the spawns
2015-03-14 17:15:28 -03:00
Nicolás Badano
518010be36
Reordered the map, mapfx and pbos:
...
- mapfx moved inside map
- everything related to map tools and drawing moved to it's own pbo called ace_maptools
Also fixed a couple of bugs in BFT
- Only a single marker was being drawn
- The BFT_HideAi parameter had the opposite effect
2015-03-14 16:58:05 -03:00
Nicolás Badano
7e2e6999bd
Ported from ACE2:
...
- Bring scale legend to ingame map
- Tweak map colors to make them exactly the same as ACE2 (had to import road colors directly from Arma 2, cause ACE just used defaults).
- Hide bushes and trees from the ingame map (they remain visible on the editor)
- Keep sattelite texture toogable, but with a opacity of 50%.
2015-03-13 19:34:56 -03:00
Nicolás Badano
47eec69ebe
Removed old config entries
2015-03-01 01:33:38 -03:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
Nicolás Badano
74d0ae95ff
Change ACE_Settings from modules
2015-02-03 02:53:02 -03:00
Nicolás Badano
981978d043
ACE_Settings: replace all ACE_Parameters
2015-01-30 19:06:25 -03:00
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
KoffeinFlummi
c407553d49
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
Nicolás Badano
fd4a2192e9
map: small fixes
2015-01-17 16:04:48 -03:00
PabstMirror
4cc57be48c
Cleanup debug
2015-01-16 22:07:53 -06:00
PabstMirror
89654a42d2
Needs Testing
2015-01-16 17:13:26 -06:00
PabstMirror
687c7e98aa
almost done
2015-01-16 02:13:29 -06:00
PabstMirror
4c5912e2f1
More progress
2015-01-15 22:30:04 -06:00
PabstMirror
b12844f175
Converted to CBA style
2015-01-15 15:50:48 -06:00
PabstMirror
f4c84182d4
Progress on Map
2015-01-15 03:51:18 -06:00
PabstMirror
e52457bfbc
AGM Map Base
2015-01-15 02:36:48 -06:00
