SzwedzikPL
defc82694b
Fix for 'Treat at...' option
2015-07-06 21:30:49 +02:00
PabstMirror
f6973c61fa
Merge branch 'master' into mk6-fixBISleveling
2015-07-06 01:35:55 -05:00
Joko
fa900452ea
Add DAGR (by Blackpixxel)
...
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
2015-07-05 22:21:17 +02:00
jonpas
cb210f92a0
Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves
2015-07-05 17:07:34 +02:00
jonpas
34dea7d971
Fixed #1796 sitting above ground level
2015-07-05 13:55:45 +02:00
PabstMirror
6e982018d3
Don't use uiNamespace to store PEFH
2015-07-04 23:14:44 -05:00
PabstMirror
183c03a3a4
Add missing PREP
2015-07-04 22:54:21 -05:00
Joko
815365fd2e
Small Performace Improvement in Nametags
2015-07-04 23:03:16 +02:00
Joko
0c099dc4d1
Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues)
...
Add PaxJaromeMalues to AUTHORS
2015-07-04 22:50:32 +02:00
Joko
240b26b9ac
Add IRStrobe 3D Object to attach
...
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
SilentSpike
19c16b1f59
Comment out dev branch command
2015-07-04 17:40:23 +01:00
bux578
fcb6383337
remove some empty xml nodes
2015-07-04 16:19:53 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
PabstMirror
ab2ebf5fcf
MissleGuidance - Move PARAMS up to top
2015-07-03 21:06:13 -05:00
SilentSpike
909fbb5dc4
Merge pull request #1732 from acemod/checkPBOfix
...
CheckPBO should ensure client isn't running any addons the server isn't
2015-07-03 22:33:17 +01:00
Glowbal
57c4bc453a
Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect
...
disable pain effect in zeus camera
2015-07-03 23:20:33 +02:00
Glowbal
44de95ea81
Merge pull request #1790 from acemod/medicalImprovements
...
Medical improvements
2015-07-03 22:21:20 +02:00
Glowbal
fd649aee38
Changed default value for surgical kit. Should be use anytime
2015-07-03 22:17:31 +02:00
Glowbal
9edf1b1adf
Implemented use conditions for PAK and SurgicalKit
...
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
Glowbal
07303633e4
Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
...
Fix vanilla damage effects
2015-07-03 21:41:26 +02:00
SilentSpike
bbadc9242b
Further zeus actions cleanup
2015-07-03 14:21:21 +01:00
SilentSpike
ca36b62356
Zeus interactions string cleanup
2015-07-03 13:20:32 +01:00
PabstMirror
1c6b12126e
Merge branch 'master' into mk6-fixBISleveling
2015-07-02 22:03:25 -05:00
Nicolás Badano
8052dd8ea3
Merge pull request #1782 from gienkov/pl-translation
...
PL translation
2015-07-02 23:06:13 -03:00
SilentSpike
d036639b46
Adding hideUnit functions to ace_common
2015-07-03 02:14:58 +01:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31
finddisplay into curatorcamera
2015-07-02 19:36:34 +02:00
Nicolás Badano
13f5b08892
Merge pull request #1760 from voiperr/master
...
ACE_Spectator
2015-07-02 10:52:59 -03:00
SzwedzikPL
c2e4ee431f
no pain effect in zeus camera
2015-07-02 13:56:56 +02:00
PabstMirror
89305473a2
Add performance note.
2015-07-01 15:50:14 -05:00
PabstMirror
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
PabstMirror
b02086ca52
Intersection Check / FOV adjustment
2015-07-01 14:53:59 -05:00
SzwedzikPL
6b4eeedbad
headgear influence on hearing
2015-07-01 21:21:09 +02:00
PabstMirror
319e50a9cc
Viewdistance - Fix Error Missing )
2015-07-01 12:39:49 -05:00
Nicolás Badano
10ef88b655
Merge pull request #1596 from SzwedzikPL/interaction_box_inventory
...
Open action for boxes
2015-07-01 12:59:24 -03:00
Nicolás Badano
9d0dcc5ea2
Merge pull request #1757 from Winter259/viewdistance-settings-init
...
Viewdistance settingsInitialized
2015-07-01 12:58:07 -03:00
jonpas
8f0101a1d9
Merge branch 'master' into addEarplugsEnhancement
...
Conflicts:
addons/hearing/functions/fnc_addEarPlugs.sqf
2015-07-01 17:45:00 +02:00
Nicolás Badano
f175490298
Merge pull request #1772 from acemod/aceModuleSyncronizedObjects
...
Ace_modules - Pass synced objects to functions
2015-07-01 11:33:03 -03:00
Nicolás Badano
f1f31cd94a
Merge pull request #1769 from acemod/mapShakePanning
...
Allow moving map while shake effect active
2015-07-01 11:31:31 -03:00
Nicolás Badano
d06ac6cace
Merge pull request #1771 from acemod/fixRallyPoint
...
Rally point object names
2015-07-01 11:30:32 -03:00
Nicolás Badano
1e8d4327df
Merge pull request #1763 from naizarak/patch-1
...
Update fnc_addEarPlugs.sqf
2015-07-01 11:22:59 -03:00
PabstMirror
57f88fe77a
Ace_modules - Pass synced objects to functions
2015-07-01 01:53:15 -05:00
PabstMirror
7eb26c8710
#1699 - Rally point object names
2015-07-01 01:27:06 -05:00
PabstMirror
c58ff8d31d
#1736 - Allow moving map while shake effect active
2015-07-01 00:13:55 -05:00
Joko
30111b4f15
Fix Merge Problems
...
Use CString Macro
2015-07-01 03:03:51 +02:00
Joko
a74bc3a748
Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master
...
Conflicts:
AUTHORS.txt
addons/parachute/CfgVehicles.hpp
2015-07-01 02:49:29 +02:00
PabstMirror
c1dd2df57a
Move grid funcs and map long,lat,altitude to common
2015-06-30 12:26:51 -05:00
PabstMirror
ccebb4f86a
Merge branch 'master' into 10digitGrids2
...
Conflicts:
addons/microdagr/functions/fnc_updateDisplay.sqf
2015-06-30 11:25:55 -05:00
PabstMirror
923018a9f6
mdagr use getMapPosFromGrid
2015-06-30 11:18:47 -05:00
PabstMirror
1f47ffc5de
Error checking, handle out of bounds grids
2015-06-30 11:11:53 -05:00
PabstMirror
1f7994e10f
Calc real X and Y offsets
2015-06-29 21:18:21 -05:00
jonpas
f08bd7acc2
Improved Slide Duration module option description
2015-06-29 22:24:16 +02:00
Nicolás Badano
a284cc3f6b
Merge pull request #1755 from ToasterBR/master
...
Translation to Brazilian Portuguese (PT-BR)
2015-06-29 17:22:38 -03:00
jonpas
a9c6e3c065
Disabled debug
2015-06-29 22:14:38 +02:00
jonpas
bb3495468e
Replaced PFH for waitAndExecute with PFH-like handling
2015-06-29 22:13:28 +02:00
jonpas
9ee75dbb21
Multiple modules support
2015-06-29 21:54:40 +02:00
jonpas
3ac520eb3e
Corrected typo
2015-06-29 21:23:47 +02:00
naizarak
75e322e6ae
Update fnc_addEarPlugs.sqf
...
Do not automatically add earplugs to units if combat deafness is disabled.
2015-06-29 12:23:32 -07:00
jonpas
038de8b5cf
Added Slideshow module icon
2015-06-29 21:22:59 +02:00
jonpas
7e200afa04
Added automatic slide transitions with custom duration
2015-06-29 21:07:51 +02:00
voiper
0d3601da47
Tiny fix to description.
2015-06-29 09:51:19 -07:00
SilentSpike
873936dc31
Simplify addon checking code
2015-06-29 14:15:46 +01:00
voiper
3dab207b65
Add Spectator.
2015-06-28 19:34:21 -07:00
jonpas
475e4673eb
Fixed typo
2015-06-28 22:28:26 +02:00
jonpas
9e6ce52fb6
Added check to addEarplugs if earplugs are used
2015-06-28 21:25:01 +02:00
Simon AM
8bdf243ab9
Removed extra ]
2015-06-28 10:19:21 +02:00
Simon AM
0e7c6a8e19
Set Viewdistance to start on settingsInitialized
2015-06-28 10:18:53 +02: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
SilentSpike
f2e5f729e8
Merge branch 'master' into gm_revamp
2015-06-27 18:26:30 +01:00
jonpas
34b270d89d
Added Flat TV support
2015-06-27 04:23:21 +02:00
jonpas
a7d58f3b9f
Fixed project name
2015-06-27 04:13:20 +02:00
jonpas
77cb278f61
Added Slideshow mission tool
2015-06-27 04:11:57 +02:00
PabstMirror
6bb235f38a
Merge pull request #1711 from acemod/mdagr-ambientBrightness
...
mdagr use ambientBrightness
2015-06-26 20:23:32 -05:00
PabstMirror
ca145cce26
Merge pull request #1705 from acemod/animSourceAmmoBox
...
#1704 - Add missing AnimationSources
2015-06-26 20:23:09 -05:00
ulteq
241e8acdd9
Merge pull request #1541 from jonpas/sitting
...
Sitting
2015-06-26 21:34:34 +02:00
jonpas
c8c1f76e7d
Macro usage, privates fix
2015-06-26 21:31:48 +02:00
ulteq
b78ece7114
Merge pull request #1706 from jonpas/settingsBFT
...
Blue Force Tracking ACE_Settings
2015-06-26 20:06:20 +02:00
SilentSpike
5e38ba9b20
Correcting some spacing
2015-06-24 17:09:43 +01:00
SilentSpike
e4f89a96b7
CheckPBO should ensure client isn't running any addons the server isn't
2015-06-23 15:01:55 +01:00
PabstMirror
d5757c090a
Calc gridOffsets at mission start.
2015-06-22 20:36:37 -05:00
jonpas
293fa4f16b
Coding standards applied to common/CfgVehicles.hpp
2015-06-22 19:29:19 +02:00
jonpas
ec5cc606c3
Fixed CheckPBOs Whitelist default value in module
2015-06-22 19:24:10 +02:00
jonpas
922e88d31e
Fixed handcuffing not breaking sitting animation
2015-06-22 15:25:10 +02:00
SilentSpike
27a4ecd747
Expanded readme
2015-06-22 00:43:39 +01:00
SilentSpike
378b39db77
Merge remote-tracking branch 'upstream/master'
2015-06-22 00:37:28 +01:00
SilentSpike
398f1c768f
Fix the module on dedicated servers
2015-06-22 00:17:29 +01:00
SilentSpike
e3e415c727
Added readme
2015-06-21 23:46:23 +01: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
PabstMirror
2d6e862237
Merge branch 'master' into 10digitGrids2
2015-06-21 13:07:58 -05:00
PabstMirror
ce2a617c7b
#1709 - Remove ACE_Comanche_Test from zeus
2015-06-21 13:00:51 -05:00
PabstMirror
f0adf256a8
#573 - mdagr use ambientBrightness
2015-06-21 12:25:16 -05: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
PabstMirror
4570f77249
Privates / Cleanup
2015-06-20 20:40:17 -05:00
PabstMirror
2c64abb816
#1704 - Add missing AnimationSources
2015-06-20 20:17:27 -05:00
Glowbal
e153e47bb2
Disabled litter on treatment failure. #1403
...
We give back the items, so litter does not make sense at the moment.
In the future we need to expand this with conditions for success/failure.
2015-06-20 12:54:00 +02:00
Glowbal
9e00fc479b
CPR local is now also only executed when the target is still alive.
...
Otherwise it's quite useless
2015-06-20 12:51:42 +02:00
Glowbal
c4283404e8
Changed CPR to be available for all unconscious units
...
Including dead
2015-06-20 12:51:01 +02:00
Glowbal
ea0be1f563
Only execute the local handling of CPR when in a valid state
2015-06-20 12:46:26 +02:00
Glowbal
385baf1331
Using CPR while in revive state will extend the life timer
2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c
While in revive state, ensure vitals are never above 0 for adv medical
2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745
Fixed #1693
2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c
Removed always unconscious for basic medical
2015-06-20 12:23:40 +02:00
ulteq
8d1d0c5480
Merge pull request #1672 from acemod/hearingAmmoClassCaching
...
Improved config caching
2015-06-20 09:48:07 +02:00
Macusercom
cac8dd8b02
German translations fixes
2015-06-20 02:16:30 +02:00
Glowbal
5887c59c05
Made fix properly for advanced medical
2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a
Initial work
2015-06-19 22:53:25 +02:00
PabstMirror
25df7aad09
Attach use purely virtual object (no setPos)
2015-06-19 13:32:42 -05:00
ulteq
474e694309
Enable interaction with explosives while swimming
2015-06-19 11:49:38 +02:00
ViperMaul
394bcafc4a
Set version to 3.1.2
2015-06-18 15:49:27 -07:00
PabstMirror
d7717448fa
#1670 - Laser pointer - pass _brightness to drawFnc
2015-06-18 17:16:53 -05:00
ulteq
5d2905ca42
Improved config caching
2015-06-18 11:56:58 +02:00
ulteq
c3fea42bce
Merge pull request #1622 from acemod/huntirHitpoints
...
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
2015-06-18 11:03:15 +02:00
ulteq
bb877bc54c
Added HuntIR and tactical ladder to ACE_Box_Misc
2015-06-18 11:02:04 +02:00
Glowbal
0631a6ae7d
Merge pull request #1647 from acemod/medicalStringtableFix
...
Fixes : #1646
2015-06-18 08:34:42 +02:00
Glowbal
160d659523
Merge pull request #1656 from acemod/wireCutterCwire
...
Add concertinawire to wirecutters
2015-06-18 08:34:02 +02:00
ViperMaul
85c40a4cf2
Merge pull request #1668 from acemod/release
...
Release v3.1.1 merge into Master
2015-06-17 19:15:35 -07:00
Macusercom
500504d93b
Further improvements as suggested for German translation
2015-06-18 00:43:23 +02:00
jonpas
083d34b62b
Removed redundant GVAR
2015-06-18 00:21:56 +02:00
ViperMaul
bab33bfbe2
Bump the build number from 0 to 1
2015-06-17 08:15:19 -07:00
ViperMaul
e5a5832cac
Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release
2015-06-16 22:43:46 -07:00
ViperMaul
47ef53201a
Set version number to 3.1.1
2015-06-16 22:41:04 -07:00
Glowbal
a8998690ea
Merge pull request #1650 from acemod/tacticalladderFixes
...
Fixed model.cfg and requiredAddons
2015-06-17 07:36:01 +02:00
Macusercom
ed4fbb5d33
More corrections
2015-06-16 23:19:47 +02:00
Macusercom
cf2f36a775
Corrections suggested by others
2015-06-16 23:17:34 +02:00
ulteq
82d80359d1
Fixes: https://github.com/acemod/ACE3/issues/1646
2015-06-16 21:57:12 +02:00
Nicolás Badano
2afcf92643
Merge pull request #1440 from legman/akalegman
...
IED Class Inheritance Fixes
2015-06-16 13:35:19 -03:00
PabstMirror
196f3bd86b
Add concertinawire to wirecutters
2015-06-15 23:59:21 -05:00
Macusercom
f1691f2562
Fixed a typo
2015-06-16 03:23:32 +02:00
Macusercom
24cea18ae5
Revert "Revert "Added German translations""
...
This reverts commit 4403e3c665
2015-06-16 03:21:25 +02:00
Macusercom
09f7473d7b
Added German translations
2015-06-16 03:06:47 +02:00
Macusercom
4403e3c665
Revert "Added German translations"
...
This reverts commit 0adc07d284
2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284
Added German translations
2015-06-16 03:06:13 +02:00
AKALegman
c027db2e0e
final fixes
2015-06-15 20:55:49 +01:00
Nicolás Badano
fbf99224c4
Merge pull request #1635 from jonpas/fixCheckPBOkick
...
Fixed CheckPBO Kick
2015-06-15 15:43:28 -03:00
jonpas
04c06b51ed
Fixed #1632 - CheckPBOs kick serverCommand changed to display 46
2015-06-15 20:23:16 +02:00
jonpas
f61066f11a
Fixed checkPBO function not executing on server
2015-06-15 19:55:30 +02:00
Glowbal
f8aa9a3171
Merge pull request #1621 from acemod/hrIncrease
...
Medical - change hrIncrease random min/max
2015-06-15 10:42:43 +02:00
AKALegman
5915e24f5d
some fixes
2015-06-14 16:09:01 +01: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
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
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
bb414dd10f
Redo Some UI - Try to fix vectorUp problems
2015-06-14 00:52:30 -05:00
