AKALegman
|
5915e24f5d
|
some fixes
|
2015-06-14 16:09:01 +01:00 |
|
Nicolás Badano
|
a730469868
|
Merge pull request #1623 from Legolasindar/master
Updated spanish translation
|
2015-06-14 11:57:49 -03:00 |
|
ulteq
|
32f02b72a5
|
Fixed missing 'HitEngine' RPT warning.
|
2015-06-14 13:57:38 +02:00 |
|
Ivan Navarro Cabello
|
76f7962dac
|
Updated spanish stringatable
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
|
2015-06-14 13:52:55 +02:00 |
|
Legolasindar
|
4d598d27cd
|
Merge pull request #2 from acemod/master
update my master fork
|
2015-06-14 13:26:58 +02:00 |
|
ulteq
|
14fd5c930b
|
You can no longer connect to destroyed HuntIR cameras
|
2015-06-14 12:54:10 +02:00 |
|
ulteq
|
af2e2f71fd
|
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
* You can now shoot the parachute to make it fall faster
* And you can shoot the camera to kill the video feed
|
2015-06-14 12:25:56 +02:00 |
|
PabstMirror
|
1c5788baab
|
Medical - change hrIncrease random min/max
|
2015-06-14 03:54:50 -05:00 |
|
ulteq
|
8d6b7de0ad
|
Fixed model.cfg and requiredAddons
|
2015-06-14 10:37:21 +02:00 |
|
AKALegman
|
0690e6f745
|
fixed conflicts
|
2015-06-14 09:36:03 +01:00 |
|
Glowbal
|
6d94f69cd8
|
Merge pull request #1620 from acemod/master
Master > release for upcoming release
|
2015-06-14 10:01:22 +02:00 |
|
ulteq
|
55fa94ebc4
|
Merge pull request #1619 from acemod/dagrMultipleDevices
DAGR now supports the new multiple devices framework
|
2015-06-14 09:59:20 +02:00 |
|
ulteq
|
906e365b94
|
DAGR now supports the new multiple devices framework
|
2015-06-14 09:59:06 +02:00 |
|
ulteq
|
48d8d5e076
|
Empty default keys for the DAGR to prevent conflicts
|
2015-06-14 09:38:25 +02:00 |
|
PabstMirror
|
dff99c4736
|
Tweak HTML Size
|
2015-06-13 20:41:57 -05:00 |
|
Glowbal
|
07ac512465
|
Merge pull request #1618 from acemod/add_sqf_assignWounds_backup
Adds a back up function in sqf to assign open wounds.
|
2015-06-13 23:39:42 +02:00 |
|
Glowbal
|
91b54bfc3a
|
Adds a back up function in sqf to assign open wounds.
|
2015-06-13 23:20:01 +02:00 |
|
Glowbal
|
8d30e3fde0
|
Build medical extension for new version.
|
2015-06-13 23:11:52 +02:00 |
|
ViperMaul
|
4c572ef298
|
Set version number to 3.1.0
|
2015-06-13 13:46:24 -07:00 |
|
PabstMirror
|
9300a92dd5
|
Merge pull request #1617 from jonpas/fixCellphoneDisplay
Fixed Black Cellphone Display after 1.46
|
2015-06-13 15:29:00 -05:00 |
|
Glowbal
|
973835fcd8
|
Merge pull request #1605 from acemod/Fix-injuryToAdd-Med-Extension
Fixed select new injuryToAdd always selects first
|
2015-06-13 22:28:33 +02:00 |
|
jonpas
|
670d23e14c
|
Fixed Black Cellphone Display after 1.46
|
2015-06-13 22:12:32 +02:00 |
|
jonpas
|
1eeca28a3d
|
Enabled DAGR, Kestrel4500, Laser switching, Mag Repack, Markers, MicroDAGR, NVG Adjusting and Check Ammo while Sitting
|
2015-06-13 22:08:13 +02:00 |
|
PabstMirror
|
4a8344e1a4
|
Merge branch 'master' into userActionPrototype
Conflicts:
addons/interact_menu/ACE_Settings.hpp
addons/interact_menu/stringtable.xml
extensions/CMakeLists.txt
|
2015-06-13 15:05:57 -05:00 |
|
PabstMirror
|
f811fc797e
|
Suppress optionsmenu debug
|
2015-06-13 15:03:22 -05:00 |
|
jonpas
|
254b386805
|
Allowed Kestrel4500 Inside and Sitting
|
2015-06-13 21:46:55 +02:00 |
|
ViperMaul
|
1322da5537
|
Merge pull request #1587 from acemod/fixVehicleUnconcious
fix animation and consistently unload units from vehicle
|
2015-06-13 12:44:34 -07:00 |
|
jonpas
|
29ce8f635e
|
Merge branch 'master' into sitting
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
|
2015-06-13 21:43:42 +02:00 |
|
ViperMaul
|
132ec343b0
|
Suppress debug
|
2015-06-13 12:39:29 -07:00 |
|
ViperMaul
|
911a18d169
|
Expand maxDistance for findEmptyPosition from 10 to 13 to support the GhostHawk
Convert ASLtoPosition
#1575 and #1577
|
2015-06-13 12:37:10 -07:00 |
|
PabstMirror
|
849a45d68b
|
DAGR - has item check
|
2015-06-13 14:29:34 -05:00 |
|
PabstMirror
|
b2d69611d7
|
Merge pull request #1118 from acemod/multipleDevices
Multiple Devices
|
2015-06-13 14:20:38 -05:00 |
|
PabstMirror
|
e7347be47b
|
Increase delete delay for attached IR grenades (#1615)
|
2015-06-13 14:08:25 -05:00 |
|
Nicolás Badano
|
d262dc790f
|
Merge pull request #1616 from acemod/addMk16ToClaymore
Make claymores detonatable by MK16. Close #1603
|
2015-06-13 16:07:56 -03:00 |
|
PabstMirror
|
0c45d2308a
|
Merge pull request #1150 from acemod/mainMenuVersionHTML
Show Version / HTML Git Version on main menu
|
2015-06-13 14:07:36 -05:00 |
|
Nicolás Badano
|
179ad6c214
|
Merge pull request #1526 from acemod/rainExperiment
Update rain each frame
|
2015-06-13 16:07:25 -03:00 |
|
esteldunedain
|
1237b1cb4a
|
Make claymores detonatable by MK16. Close #1603
|
2015-06-13 16:05:18 -03:00 |
|
PabstMirror
|
f68a2310a8
|
Merge pull request #1589 from acemod/laserPointerSetting
Optional setting to disable laser pointer system
|
2015-06-13 13:56:01 -05:00 |
|
ulteq
|
c459a80bcb
|
Merge pull request #1613 from ProfessorCZ/master
CZ - Translation (medical, tacticalladder)
|
2015-06-13 20:48:34 +02:00 |
|
Glowbal
|
5013254769
|
Merge pull request #1530 from legman/akalegman_zeus_unconscious
Fixed Zeus Unconscious
|
2015-06-13 20:48:18 +02:00 |
|
Nicolás Badano
|
5884eb0d5b
|
Merge pull request #1612 from acemod/removeFrisk
Remove Frisk
|
2015-06-13 15:20:13 -03:00 |
|
esteldunedain
|
d53ee1cf85
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk
Conflicts:
addons/captives/CfgVehicles.hpp
|
2015-06-13 15:19:52 -03:00 |
|
PabstMirror
|
fdb30f4e68
|
Merge pull request #1599 from acemod/captivesFixes
Captives fixes
|
2015-06-13 13:15:29 -05:00 |
|
Glowbal
|
1c066a0b3f
|
Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
PAK treatment time based on total amount of damage.
|
2015-06-13 20:14:57 +02:00 |
|
PabstMirror
|
6dba8b33da
|
Merge pull request #1507 from acemod/fixJavelinLocking
Fix javelin locking
|
2015-06-13 12:54:06 -05:00 |
|
Glowbal
|
3e24749948
|
Merge pull request #1477 from alganthe/longer_flares
flares modified
|
2015-06-13 19:51:27 +02:00 |
|
ProfessorCZ
|
c9f29aefa2
|
CZ - Translation (medical, tacticalladder)
|
2015-06-13 19:49:59 +02:00 |
|
ProfessorCZ
|
bf464ffe00
|
CZ - Translation (medical, tacticalladder)
|
2015-06-13 19:46:31 +02:00 |
|
ulteq
|
c3340b174e
|
Merge pull request #1609 from acemod/ace2EarRinging
Ported the ACE2 ear ringing logic
|
2015-06-13 19:44:15 +02:00 |
|
esteldunedain
|
3d5afd7d8f
|
Close #1018
|
2015-06-13 14:32:18 -03:00 |
|