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
2,501 Commits 73 Branches 88 Tags 752 MiB
c6b4a57ee2
Commit Graph

2261 Commits

Author SHA1 Message Date
commy2
e1bf475355 Merge pull request #419 from acemod/cfgtriggers 
rename cfgAce_Triggers to ACE_Triggers
 2015-04-11 18:19:36 +02:00
commy2
4dc38ca7ee Merge pull request #395 from acemod/flashsup 
flashsupressors for new weapons, #264
 2015-04-11 18:18:05 +02:00
Kllrt
56681e632d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 16:36:31 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 11:12:56 -03:00
esteldunedain
b8e0388581 Fix nearestObjects with getPos choking over seawater. Fix #465 2015-04-11 11:12:40 -03:00
commy2
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
nic547
a37cd51fe7 more stuff 
- added more ammotypes
- stringtable now follows guideline
 2015-04-11 15:02:56 +02:00
commy2
5a5a1fd66a ACE_optic_SOS_PIP - iron sight was missing, fix #470 2015-04-11 13:18:45 +02:00
PabstMirror
787df67248 Merge branch 'master' into disarmingTest 2015-04-10 19:20:34 -05:00
jaynus
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
jaynus
721898d9fb Constraint dialogs working. 2015-04-10 13:57:44 -07:00
commy2
11ad74735c Merge pull request #458 from Tenga/master 
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
 2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func) 
Still some small head movements, but I don't know how to fix that.
 2015-04-10 15:02:40 -05:00
Tenga
b710c2543e Return the newline to fnc_externalCamera.sqf 2015-04-10 21:59:28 +02:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master 
Count the commander camera as a 3rd person camera
 2015-04-10 21:54:52 +02:00
Tenga
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c - Added isFeatureCameraActive to ace_common 
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
 2015-04-10 21:48:24 +02:00
jaynus
83b453a294 Merge pull request #379 from acemod/allTheMissiles 
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
 2015-04-10 12:48:10 -07:00
jaynus
8429b262f2 more debug removal, backup vanilla usage. 2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562 #441 - Crash with no model on ace_fakeweapon 2015-04-10 14:35:08 -05:00
esteldunedain
ee8af7f153 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-10 16:21:27 -03:00
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 16:20:18 -03:00
jaynus
5577a541ca Add example. 2015-04-10 12:19:02 -07:00
jaynus
0225cb510c Add missile strings. 2015-04-10 12:16:18 -07:00
Riccardo Petricca
d9e78e511e Added italian translation to the last terms. 
Added italian translation to the last added terms.
 2015-04-10 21:13:03 +02:00
jaynus
391b1556cb Disable all debug. 2015-04-10 12:12:25 -07:00
nic547
a4b9090e34 Added new ammotypes for both types of .388 ammo 2015-04-10 21:01:49 +02:00
jaynus
bcb7d18e7e remove debug. 2015-04-10 11:57:50 -07:00
jaynus
c28ac5b4a9 Compensate for target velocity. 2015-04-10 11:40:18 -07:00
jaynus
5083a5a0d2 Javelin locking fire modes were reversed. 2015-04-10 11:37:03 -07:00
PabstMirror
db5861da52 #428 - GJ Git 2015-04-10 13:05:39 -05:00
PabstMirror
33570c94e4 #428 - Only work on locked vehicles. 2015-04-10 13:05:39 -05:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
PabstMirror
97e277d710 #448 - Adjust Nightvision in vehicles 2015-04-10 12:55:42 -05:00
jaynus
c428bf051f placeholder model for hellfire, optics refreshing on titan 2015-04-10 10:42:02 -07:00
commy2
ec29cdd731 remove forgotten debug item, .MD for optics, fix #439 2015-04-10 19:34:44 +02:00
jaynus
2fe55b3117 Attack profile buildout. 2015-04-10 10:14:30 -07:00
commy2
5d097c4dd9 add comment explaining why isNumber is used 2015-04-10 19:11:51 +02:00
EpMAK
17a552bb80 Russian Translation 
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
 2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation" 
This reverts commit fab5605ad5.
 2015-04-10 19:46:18 +03:00
commy2
c03ee8e9c6 lowercase gps 2015-04-10 18:34:26 +02:00
commy2
dc49f2c71e rewrite assigned item fix 2015-04-10 18:31:43 +02:00
commy2
5ff1d9863d remove +2 offset for check temperature, also fix the shade of grey, #431 2015-04-10 17:48:21 +02:00
commy2
fc98e78a53 hide check temperature action when empty weapon is selected, #431 2015-04-10 17:36:58 +02:00
commy2
c7ad94efbf renamed hpp to ACE_Triggers 2015-04-10 17:09:48 +02:00
commy2
5c12b22666 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into cfgtriggers 2015-04-10 17:07:47 +02:00
Grzegorz
584c77a0b6 microdagr PL translation 
fixes
 2015-04-10 17:07:40 +02:00
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
Grzegorz
a95b0b051c inventory PL translation 2015-04-10 16:33:09 +02:00
Grzegorz
439dfa7b3c laser_selfdesignate PL translation 
fixes
 2015-04-10 16:31:47 +02:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Legolasindar
c7d3618d79 Update stringtable.xml 
fix spanish term
 2015-04-10 13:43:39 +02:00
Legolasindar
a224ec3371 Update stringtable.xml 
added spanish translation
 2015-04-10 13:43:07 +02:00
Legolasindar
f2a73ab9c6 Update stringtable.xml 
added some spanish translation
 2015-04-10 13:41:44 +02:00
Legolasindar
19da5b366e Update stringtable.xml 
added spanish translation
 2015-04-10 13:38:19 +02:00
Legolasindar
c741154ff2 Update stringtable.xml 
added spanish translation
 2015-04-10 13:36:17 +02:00
Legolasindar
6f69361a73 Update stringtable.xml 
added spanish translation
 2015-04-10 13:34:16 +02:00
Legolasindar
470a12ed46 Update stringtable.xml 
added spanish translation
 2015-04-10 13:19:26 +02:00
Legolasindar
a73c37ce05 Update stringtable.xml 
added spanish translation
 2015-04-10 13:14:33 +02:00
Legolasindar
e0fc44cfa8 Update stringtable.xml 
Added spanishtr translation
 2015-04-10 13:04:08 +02:00
Legolasindar
cf769e09fb Update stringtable.xml 
Add spanish translation
 2015-04-10 12:46:31 +02:00
Legolasindar
52d476abd3 Update stringtable.xml 
Added spanisth translation, and two lines of english translation
 2015-04-10 12:29:44 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
jaynus
6286d59bd9 Remove NVG from gunner optics on comanche. 2015-04-09 23:29:37 -07:00
jaynus
9e7d4c25bb Removes old value of stabalizing which broke gunner. Fixes #412 2015-04-09 23:28:41 -07:00
commy2
d5f190dff8 fix: getGunner returns null object when throwing grenades, planting explosives 2015-04-10 06:47:31 +02:00
commy2
105184ce88 fix: getGunner returns null object if pilot uses manual fire if no gunner is present 2015-04-10 06:36:09 +02:00
Anthariel
04bf321099 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:31:42 +02:00
Anthariel
81122e0839 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:30:49 +02:00
Anthariel
b5841f8f09 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:28:59 +02:00
Anthariel
dd8f9cd8d6 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:27:04 +02:00
Anthariel
0191abc529 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:25:05 +02:00
Anthariel
523417ba3c Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:23:13 +02:00
Anthariel
0c851a6d9a Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 06:22:26 +02:00
Anthariel
95e53fd1bf Update stringtable.xml 
Added: French Translations (~85%)
 2015-04-10 06:20:04 +02:00
Anthariel
d6b2d13a72 Update stringtable.xml 
Added: French Translation (95%)
 2015-04-10 06:00:22 +02:00
commy2
5fe33fb1db rename cfgAce_Triggers to ACE_Triggers 2015-04-10 05:56:19 +02:00
Anthariel
0d8145073f Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:54:45 +02:00
Anthariel
627f8fb41b Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:53:29 +02:00
Anthariel
87f5873c2a Update stringtable.xml 
Added: French Translation (90%)
Fixed: Uknow to Unknow (line 101)
 2015-04-10 05:50:08 +02:00
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
Anthariel
fb8c49135e Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:43:42 +02:00
Anthariel
d9986c6959 Update stringtable.xml 
Added: French Translation (75%)
 2015-04-10 05:40:22 +02:00
Anthariel
7280148f91 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:37:10 +02:00
Anthariel
949cee6df4 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:35:56 +02:00
Anthariel
e6adddb7fa Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 05:34:09 +02:00
Anthariel
29f06a7bd8 Update stringtable.xml 
Added: French Translation (100%).
 2015-04-10 05:29:00 +02:00
Kavinsky
a118cae13d unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item 2015-04-10 04:36:28 +02:00
Kavinsky
b49fec58e6 Updated stringtable 2015-04-10 04:35:21 +02:00
Grzegorz
311e018ba7 weaponselect PL translation 2015-04-10 04:33:13 +02:00
Grzegorz
bf6984400f medical PL translation 
like a boss
 2015-04-10 04:30:39 +02:00
Kavinsky
adaee74a57 removed config redundancy 2015-04-10 04:00:26 +02:00
Kavinsky
999ad49fd0 removed duplicated debugging error 2015-04-10 03:58:14 +02:00
Grzegorz
3ffd7ac8c7 attach PL translation 2015-04-10 03:57:55 +02:00
Grzegorz
37be4f9e53 captives PL translation 2015-04-10 03:56:24 +02:00
Grzegorz
95be641918 common PL translation 2015-04-10 03:52:30 +02:00
Kavinsky
049edd1483 Added ACE Attach posibility to add more types of attachable items 2015-04-10 03:49:50 +02:00
Grzegorz
dcc07c84bc disposable PL translation 2015-04-10 03:43:34 +02:00
Grzegorz
6be80caf2e dragging PL translation 2015-04-10 03:41:12 +02:00
Grzegorz
d0787ab2d8 explosives PL translation 2015-04-10 03:40:03 +02:00
Grzegorz
ae1b2f04b0 fcs PL translation 2015-04-10 03:39:05 +02:00
Grzegorz
022e17417f frag PL translation 2015-04-10 03:37:30 +02:00
Grzegorz
2925100ec6 frag PL translation 2015-04-10 03:36:32 +02:00
Grzegorz
d874140268 hearing PL translation 2015-04-10 03:33:40 +02:00
Grzegorz
e907553abc interact_menu PL translation 2015-04-10 03:28:14 +02:00
Grzegorz
2984aa2e8c interaction PL translation 2015-04-10 03:26:03 +02:00
Grzegorz
aaa4dcba2c inventory PL translation 2015-04-10 03:19:37 +02:00
Grzegorz
e13199af2a laser_selfdesignate PL translation 2015-04-10 03:15:28 +02:00
Grzegorz
8b6ac39d1d laserpointer PL translation 2015-04-10 03:13:59 +02:00
Grzegorz
e0a2a144c5 logistics_wirecutter 2015-04-10 03:10:05 +02:00
Grzegorz
685d21169d magazinerepack PL translation 
Had to make some shifts in lines 70 and 93 to make it sound good in PL
 2015-04-10 03:03:03 +02:00
Grzegorz
6cbb6206c1 microdagr PL translation 
fixed typo in line 119
 2015-04-10 02:47:19 +02:00
Grzegorz
0f9614eb4f nametags PL translation 
SoundWaves :)
 2015-04-10 02:36:23 +02:00
Nicolás Badano
357fd1969b Merge pull request #406 from Legolasindar/patch-4 
Spanish: Update stringtable.xml
 2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2 
Update stringtable.xml
 2015-04-09 21:24:00 -03:00
Grzegorz
5255c91408 optionsmenu PL translation 2015-04-10 02:20:22 +02:00
Grzegorz
03faa32cef overheating PL translation 2015-04-10 02:07:19 +02:00
Grzegorz
d193fd513f realisticnames PL translation 2015-04-10 02:02:59 +02:00
Grzegorz
a150ab43e1 Update stringtable.xml 2015-04-10 01:53:28 +02:00
Grzegorz
f61832f735 reload PL translation 2015-04-10 01:44:43 +02:00
jaynus
c1089dfffa Working save, distance shots are off. 2015-04-09 16:43:05 -07:00
Legolasindar
2a5e416dfc Update stringtable.xml 
fixed spanish terms
 2015-04-10 01:40:22 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml 
added spanish translation
 2015-04-10 01:38:31 +02:00
Grzegorz
ce46961ef1 reloadlaunchers PL translation 2015-04-10 01:38:13 +02:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
Grzegorz
08590d98a3 respawn PL translation 2015-04-10 01:35:09 +02:00
Legolasindar
5a849fe8a4 Update stringtable.xml 
added spanish translation
 2015-04-10 01:33:08 +02:00
jaynus
2e9f6a7058 Better projected up/down. 2015-04-09 16:31:14 -07:00
Legolasindar
2542f994d6 Update stringtable.xml 
added spanish translation
 2015-04-10 01:29:52 +02:00
Grzegorz
aa8275460f weaponselect PL translation 2015-04-10 01:29:26 +02:00
Legolasindar
5f5ce47bec Update stringtable.xml 
fixed one term in spanish
 2015-04-10 01:26:06 +02:00
Grzegorz
df3927324a wep_javelin PL translation 2015-04-10 01:24:58 +02:00
Legolasindar
65b3566d41 Update stringtable.xml 
fixed spanish terms.
 2015-04-10 01:24:37 +02:00
Legolasindar
b8b151e62e Update stringtable.xml 
added spanish terms
 2015-04-10 01:20:39 +02:00
Legolasindar
df31442599 Update stringtable.xml 
added spanish terms
 2015-04-10 01:13:33 +02:00
Legolasindar
dc44b73a36 Update stringtable.xml 
updated spanish terms
 2015-04-10 01:12:31 +02:00
licht-im-Norden87
852f939430 whoops 2015-04-10 01:00:35 +02:00
Legolasindar
ed87e53c80 Update stringtable.xml 
Updated spanish terms.
 2015-04-10 00:48:51 +02:00
licht-im-Norden87
620d458cab Update stringtable.xml 2015-04-10 00:45:37 +02:00
licht-im-Norden87
7221042d7c Update stringtable.xml 2015-04-10 00:43:30 +02:00
licht-im-Norden87
7e78a7de18 Reload 2015-04-10 00:41:39 +02:00
licht-im-Norden87
fb5189be9a Overheating 2015-04-10 00:38:51 +02:00
Legolasindar
cef9a6454a Update stringtable.xml 
Updated spanish terms, on moved english to first raws.
 2015-04-10 00:38:24 +02:00
licht-im-Norden87
88336753d0 optionsmenu 2015-04-10 00:36:41 +02:00
jaynus
1eadcade72 Linear work javelin. 2015-04-09 15:34:42 -07:00
licht-im-Norden87
c18f7cafa6 Update stringtable.xml 2015-04-10 00:34:04 +02:00
licht-im-Norden87
03aa01c354 Update stringtable.xml 2015-04-10 00:31:52 +02:00
licht-im-Norden87
fbe214db74 Not yet completed 2015-04-10 00:29:45 +02:00
licht-im-Norden87
9cca9dbd80 Update stringtable.xml 2015-04-10 00:23:49 +02:00
licht-im-Norden87
6323a85f17 Update stringtable.xml 
<English>Field Dressing</English>
        <German>Notverband</German>
I dont know if a Notverband is the same as a Field Dressing.
 2015-04-10 00:23:20 +02:00
PabstMirror
c511431e61 Fix encoding problem 
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
 2015-04-09 17:17:33 -05:00
Legolasindar
1dcbebc04c Update stringtable.xml 
Updated spanish terms
 2015-04-10 00:10:47 +02:00
Felix Wiegand
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1 
Stringtable: German additions
 2015-04-10 00:06:43 +02:00
Legolasindar
7b4d62c46c Update stringtable.xml 
Fixed spanish terms
 2015-04-10 00:05:47 +02:00
licht-im-Norden87
4522b45939 Update stringtable.xml 2015-04-10 00:03:46 +02:00
licht-im-Norden87
7f54ec34b6 Update stringtable.xml 2015-04-09 23:53:15 +02:00
licht-im-Norden87
1dc56cb1af Update stringtable.xml 2015-04-09 23:48:58 +02:00
licht-im-Norden87
7994441968 Update stringtable.xml 2015-04-09 23:48:21 +02:00
licht-im-Norden87
7d71d360b0 Update stringtable.xml 
Not quite convinced by my translation ... Flummi you better have a look
 2015-04-09 23:45:33 +02:00
licht-im-Norden87
2373e78245 Update stringtable.xml 2015-04-09 23:43:58 +02:00
licht-im-Norden87
828e19a268 Update stringtable.xml 2015-04-09 23:42:45 +02:00
licht-im-Norden87
2097a5f213 Update stringtable.xml 2015-04-09 23:42:15 +02:00
licht-im-Norden87
0986eb427d Update stringtable.xml 2015-04-09 23:41:10 +02:00
licht-im-Norden87
2304b46e2f Update stringtable.xml 2015-04-09 23:39:48 +02:00
licht-im-Norden87
a6f8e05cb8 Update stringtable.xml 2015-04-09 23:37:26 +02:00
licht-im-Norden87
ecf5eef638 Update stringtable.xml 2015-04-09 23:36:21 +02:00
licht-im-Norden87
3c4656522f Stringtable: German additions 2015-04-09 23:33:36 +02:00
licht-im-Norden87
00c37e0b9d Update stringtable.xml 2015-04-09 23:12:00 +02:00
jaynus
8fe11c36ee Linear altitude comparison. 2015-04-09 14:11:15 -07:00
licht-im-Norden87
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup 
Medical cleanup
 2015-04-09 22:13:31 +02:00
jaynus
198d4f3540 Fixed private variable overrides and timing failure. 2015-04-09 13:03:28 -07:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact 
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
 2015-04-09 14:48:27 -05:00
jaynus
01535c7f5c Merge remote-tracking branch 'origin/master' into allTheMissiles 
Conflicts:
	addons/wep_javelin/config.cpp
 2015-04-09 12:41:09 -07:00
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
commy2
a6a19e956b flashsupressors for new weapons, #264 2015-04-09 19:59:08 +02:00
jaynus
fe147c4986 Config expansion. 2015-04-09 09:39:23 -07:00
commy2
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
commy2
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons 
sorting out required addons for modularity
 2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7 Merge remote-tracking branch 'origin/removeRecoil' 
Conflicts:
	addons/recoil/config.cpp
 2015-04-09 10:05:14 -03: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
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/scopes/XEH_postInit.sqf
 2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02: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
jaynus
bbfd28586b Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers. 2015-04-08 19:51:21 -07:00
PabstMirror
2033676e81 another undef to Make PBO-Project Happy 2015-04-08 18:20:00 -05:00
jaynus
5a9a8d239c Remove test parameters, timing correct. Attack profile selection working. 2015-04-08 15:52:58 -07:00
jaynus
0a1aae8553 Work save, timing correction. 2015-04-08 15:41:26 -07:00