Glowbal
27106ce59f
minor refactor
2015-05-28 20:54:13 +02:00
ulteq
4ad82d9629
Switched to ctrlCreate to avoid aspect ratio problems with the listbox.
2015-05-28 20:13:22 +02:00
ulteq
697710d40d
Initial draft of the range card implementation.
2015-05-28 19:17:29 +02:00
Garth L-H de Wet
529e200a4c
Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.
2015-05-28 17:56:45 +02:00
BullHorn
de1bfa8f80
fix typo, add inert/not-inert description
2015-05-28 18:04:08 +03:00
BullHorn
da34cfa296
Merge remote-tracking branch 'origin/docs-optional' into docs-optional
2015-05-28 16:54:55 +03:00
BullHorn
fcd7ff5287
docs: optional pbos - add notice for mod makers
2015-05-28 16:51:53 +03:00
BullHorn
f00a032e17
Add notice for mod-makers
2015-05-28 16:41:23 +03:00
Nicolás Badano
6332e035a7
Merge pull request #1412 from Tourorist/patch-4
...
Alphabetized the contributor list
2015-05-28 10:03:26 -03:00
Nicolás Badano
5f70001ac0
Merge pull request #1409 from acemod/gogglesCacheSurfaceDust
...
Goggles - Cache Surface Dust
2015-05-28 09:48:42 -03:00
Bracconiere
4ef8bbace8
Alphabetized the contributor list
...
More recent additions seem to have been just stacked unsorted at the bottom.
2015-05-28 14:30:26 +03:00
Glowbal
5df9bb4a60
Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting
...
Send directly to extension instead of splitting it
2015-05-28 11:54:11 +02:00
PabstMirror
236ae767b5
Goggles - Cache Surface Dust
2015-05-28 00:18:45 -05:00
PabstMirror
3a4a02e524
#1407 - Make Saline 500ml match mass blood/plasma
2015-05-27 16:23:25 -05:00
PabstMirror
5f2bee09e4
Create Defuse Helpers on demand
2015-05-27 14:09:06 -05:00
Glowbal
7dd01ebb69
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
...
Possible fix medical unload patient
2015-05-27 19:34:23 +02:00
PabstMirror
9ed15d9702
Merge pull request #1302 from acemod/nameTagFixes
...
Nametags - Use EyePos of target / windows
2015-05-27 12:19:17 -05:00
PabstMirror
30adc2d463
Patch Merge of PR #1156 - Optics for tripplehead
2015-05-27 11:28:06 -05:00
Nicolás Badano
c365008330
Merge pull request #1275 from acemod/fixUAVandInteractionInhert
...
Fix UAV and Interaction Compile Inheritance
2015-05-27 12:20:46 -03:00
Nicolás Badano
d3a50bce53
Merge pull request #1214 from acemod/reliableSettings
...
Reliable settings framework
2015-05-27 12:10:08 -03:00
esteldunedain
39fec12528
Merge branch 'master' into reliableSettings
2015-05-27 12:09:06 -03:00
esteldunedain
bb99d5a860
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
2015-05-27 12:08:47 -03:00
Nicolás Badano
8d9ebebb90
Merge pull request #1405 from Legolasindar/master
...
added spanish translate
2015-05-27 10:52:18 -03: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
BaerMitUmlaut
f2e6a98eb4
Killed tabs
2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a
Removed duplicate private var
2015-05-27 13:51:15 +02:00
PabstMirror
d2eb08594b
Merge branch 'master' into fixUAVandInteractionInhert
...
Conflicts:
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-05-27 00:36:43 -05:00
PabstMirror
adf29d75e3
Explosives - Local Defuse Helpers
2015-05-26 23:15:50 -05:00
BaerMitUmlaut
f7578a92c9
Reverted in favour of onProgress treatment
2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9
Switched to callbackPogress for treatment
2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225
Implemented dynamic treatment time
2015-05-27 00:45:22 +02:00
Glowbal
05d780d781
new build
2015-05-26 22:43:52 +02:00
Glowbal
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +02:00
ulteq
b2330ae641
Merge pull request #1401 from acemod/atragNightGUIGlow
...
New nighttime picture.
2015-05-26 22:27:28 +02:00
ulteq
5223455174
New nighttime picture.
2015-05-26 22:26:30 +02:00
Nicolás Badano
32325fc784
Merge pull request #1394 from acemod/sortWaitAndExecute
...
Single PFEH for waitAndExecute - using sort
2015-05-26 16:40:17 -03:00
ulteq
5e6e62280e
Fixed a typo
2015-05-26 15:00:52 +02:00
ulteq
bfd31b293d
Merge pull request #1396 from acemod/atragDayNightGUI
...
Nighttime GUI for the ATragMX.
2015-05-26 12:36:18 +02:00
ulteq
dc1bfa9c92
Nighttime GUI for the ATragMX.
2015-05-26 12:32:37 +02:00
ViperMaul
388d6c3519
Change to the proper isAwake function
...
#1375
2015-05-25 20:47:28 -07:00
PabstMirror
4e70bf6e83
Single PFEH for waitAndExecute - using sort
2015-05-25 22:46:56 -05:00
BaerMitUmlaut
41892fd6df
Added surgicalKit treatment
2015-05-26 00:33:20 +02:00
PabstMirror
d410350a25
Make code less smelly
2015-05-25 14:01:59 -05:00
ViperMaul
6a1724343d
remove debug
...
#1375
2015-05-25 11:38:28 -07:00
ViperMaul
789e92d8ef
Ensuring a proper return value and removing unnecessary code.
...
#1375
2015-05-25 10:32:52 -07:00
ViperMaul
3bdb27386c
removing obsolete drag code
...
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
9a07a9bfd6
modify unloadPerson to use unloadPersonLocal
...
#1375
2015-05-25 09:43:29 -07:00
jaynus
3a810aba70
Merge pull request #1387 from acemod/titanInheritBandaid
...
Titan inheritance fix
2015-05-25 09:42:25 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612
revert missing actionDragUnit file
...
#1375
2015-05-25 09:39:12 -07:00
