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
