ulteq
7fed1085a6
Merge pull request #1509 from acemod/SSWT_Kit
...
Ported the ACE2 Tripod
2015-06-05 16:53:47 +02:00
PabstMirror
3f3ffe117e
Inherit ACE_Actions - addToInventory
2015-06-05 03:32:55 -05:00
gienkov
de13985492
interact_menu translation
2015-06-05 09:55:13 +02:00
gienkov
c1a7374404
Merge remote-tracking branch 'upstream/master' into pl-translation-1
...
Conflicts:
addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02:00
ulteq
993ee2d498
Ported the ACE2 spotting scope
2015-06-05 09:34:27 +02:00
PabstMirror
e01ba64683
Fix Missing Strings
2015-06-04 22:51:40 -05:00
ulteq
04e6acfc6a
Merge pull request #1479 from acemod/sandbag
...
Ported the ACE2 sandbags
2015-06-04 23:02:55 +02:00
ulteq
52b40a50d9
Merge pull request #1491 from acemod/Yardage450
...
Ported the ACE2 Yardage 450 laser rangefinder
2015-06-04 23:02:06 +02:00
ulteq
618e7e6ea1
Added polish translation.
2015-06-04 23:01:07 +02:00
PabstMirror
9997b94fb1
Merge pull request #1510 from acemod/settingInDebug
...
Dump settings to debug
2015-06-04 15:54:29 -05:00
jonpas
e7cfda5c77
Added Macro Guard to string macros
2015-06-04 22:46:06 +02:00
PabstMirror
1cb1468183
Remove unused control
2015-06-04 15:40:56 -05:00
Glowbal
e13992d896
Merge pull request #1508 from SilentSpike/strings
...
Macroified ACE_Zeus Strings
2015-06-04 22:36:34 +02:00
PabstMirror
1221498357
Dump settings to debug
2015-06-04 15:31:10 -05:00
Glowbal
7f2ada38a2
Merge branch 'checkpboSettings' of github.com:usecforce/ACE3
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/config.cpp
2015-06-04 21:51:54 +02:00
Glowbal
e103007ae7
Merge pull request #1492 from GitHawk/master
...
Disabled pain effect while unconscious
2015-06-04 21:45:48 +02:00
ulteq
f88d23d3ca
Update $PBOPREFIX$
...
Fixed a typo
2015-06-04 21:39:39 +02:00
ulteq
91c288123a
Fixed dragging position
2015-06-04 21:20:15 +02:00
ulteq
e7add69556
Ported the ACE2 Tripod
2015-06-04 21:13:44 +02:00
SilentSpike
2b79838555
Use existing disabled string
2015-06-04 19:40:11 +01:00
Nicolás Badano
ddc6688d03
Merge pull request #1505 from alganthe/strobe-intensity
...
strobe light more bearable
2015-06-04 15:34:20 -03:00
SilentSpike
94a6eefa32
using new string macros
2015-06-04 19:33:19 +01:00
PabstMirror
cecc133a59
Missing </Key> in stringtable
2015-06-04 13:22:55 -05:00
PabstMirror
b466566104
Switch to new CSTRING
2015-06-04 13:19:05 -05:00
PabstMirror
e5edc0345b
Merge branch 'master' into captiveModuleSettings
...
Conflicts:
addons/captives/CfgVehicles.hpp
2015-06-04 13:15:53 -05:00
PabstMirror
21db1bcf46
Fix Ammo check / formating
2015-06-04 13:08:01 -05:00
ulteq
fb2f3f8c3f
Added function headers / Fixed requiredAddons
2015-06-04 17:51:04 +02:00
Josuan Albin
70e83707c4
strobe light more bearable
...
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
2015-06-04 17:40:49 +02:00
ulteq
e728003725
Removed newline bracket
2015-06-04 17:23:01 +02:00
jonpas
9fbf256acd
Merge branch 'master' into macroSTR
...
Conflicts:
addons/hearing/functions/fnc_putInEarplugs.sqf
addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
ulteq
39a6c29e3e
ACE2 concertina wire port.
2015-06-04 17:11:09 +02:00
Nicolás Badano
aae8f4cf19
Merge pull request #1487 from SzwedzikPL/interact_menu_background
...
Interact menu - background options
2015-06-04 11:23:11 -03:00
bux578
ee85aab791
fix #1439
2015-06-04 14:30:38 +02:00
bux578
2bf2b5737a
Merge pull request #1489 from acemod/DocumentationFixes
...
fix documenation typos
2015-06-04 13:48:08 +02:00
ulteq
da28aa3c64
More sandbag features:
...
* You can now carry sandbags
* Different sandbag model during deployment (no geometry)
* Deploying sandbags now requires an appropriate surface
* Proper PhysX activation chain when you deploy/pickup sandbags
* Sandbags are now destructible
* Some stringtable fixes
2015-06-04 11:13:12 +02:00
Glowbal
9bbeb7183e
Fixed find file extension in playChangefiremode
2015-06-04 10:39:43 +02:00
gienkov
46dbd3113c
Fix
2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b
PL translation for new things
2015-06-04 01:34:58 +02:00
gienkov
b5eb39291c
Merge remote-tracking branch 'origin' into pl-translation-1
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/frag/stringtable.xml
2015-06-04 00:52:35 +02:00
ulteq
68b652cee9
Initial draft of the ACE2 tactical ladder port.
2015-06-03 20:27:52 +02:00
ViperMaul
237f5c1130
Merge pull request #1304 from acemod/debugButton
...
Export debug report from options menu
2015-06-03 09:28:37 -07:00
IngoKauffmann
ede8d74c54
Disabled pain effect while unconscious
...
If the player is unconscious the pain effect is disabled.
2015-06-03 17:53:09 +02:00
IngoKauffmann
e60cfddc77
Limited strength of pain effect while unconscious
...
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
2015-06-03 17:17:35 +02:00
ulteq
24f70e1012
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450
...
Conflicts:
addons/apl/data/default.rvmat
2015-06-03 16:28:22 +02:00
ulteq
682af84425
Ported the ACE2 Yardage 450 laser rangefinder
2015-06-03 16:26:30 +02:00
bux578
9096f38777
Ear Plugs -> Earplugs
...
http://en.wikipedia.org/wiki/Earplug
2015-06-03 15:29:38 +02:00
ulteq
dc66e6e1d8
Merge pull request #1476 from acemod/mx2a
...
Ported the ACE2 MX-2A thermal imaging device
2015-06-03 14:54:03 +02:00
PabstMirror
3a2e32b800
#1444 - Javelin Locking
2015-06-03 02:32:53 -05:00
PabstMirror
701aa7e343
Add New Icons
2015-06-03 00:55:20 -05:00
SzwedzikPL
18940d0787
Interaction menu background options
2015-06-03 06:04:47 +02:00
PabstMirror
5dc94487c5
Module Settings for Captivity
...
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -05:00
ulteq
1777719f20
Merge pull request #1485 from acemod/abFixes
...
Ab fixes
2015-06-02 23:13:05 +02:00
ulteq
f0849e70ff
Slightly increased the alpha value of the bullet trace effect.
2015-06-02 23:11:44 +02:00
Nicolás Badano
8f15856084
Merge pull request #1415 from GitHawk/master
...
runOnHover can now be CODE & SurgicalKits
2015-06-02 18:07:36 -03:00
ulteq
16f6650486
Decreased the velocity threshold for the bullet trace effect
2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13
Removed newline brackets
2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9
Increased the protractor size
2015-06-02 22:37:27 +02:00
jonpas
3206e3b537
Fixed a syntax error, Fixed nametags module order as per last pull request
2015-06-02 22:36:06 +02:00
jonpas
5496333c26
Merge branch 'master' into macroSTR
...
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/CfgVehicles.hpp
addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Nicolás Badano
0022548748
Merge pull request #1204 from usecforce/nametagsToggle
...
Disablable NameTags Module option
2015-06-02 17:03:47 -03:00
ulteq
5b2ad32c3f
Added model.cfg
2015-06-02 20:22:37 +02:00
ulteq
81a0f5147e
Stringtable cleanup
2015-06-02 20:18:30 +02:00
ulteq
f767f7eb2b
Removed duplicate code
2015-06-02 20:15:31 +02:00
ulteq
663ae1db4a
Fixed spelling
2015-06-02 20:07:35 +02:00
ulteq
c2be6ffef6
Added additional abort condition.
2015-06-02 20:06:56 +02:00
ulteq
4580168080
Fixed incorrect execution order
2015-06-02 20:01:48 +02:00
ulteq
2b6157bdb8
Fixed a typo
2015-06-02 20:01:00 +02:00
Glowbal
324aee1e57
Merge pull request #1471 from acemod/bodybagCleanup
...
Body bag cleanup:
2015-06-02 20:00:12 +02:00
ulteq
3f10eed73c
All TMR code was removed.
2015-06-02 19:56:42 +02:00
ulteq
d733527f71
Ported the ACE2 sandbags
2015-06-02 19:30:50 +02:00
bux578
6ebf9067ef
Merge pull request #1478 from acemod/switchunitscleanup
...
cleanup switchunits
2015-06-02 19:20:34 +02:00
PabstMirror
d727cb400a
Modules - fix addEventHandler
2015-06-02 12:15:58 -05:00
bux578
0bd358c415
cleanup switchunits
2015-06-02 19:13:58 +02:00
Josuan Albin
7bc7e51ad7
flares modified
...
- all UGL flares have a 60s lifespan now
- handheld signals and 20mm flares have smaller flare sizes
2015-06-02 14:02:46 +02:00
ulteq
d0b8a97e79
Fixed requiredAddons[]
2015-06-02 13:40:10 +02:00
ulteq
f1dbe0fffc
Ported the ACE2 MX-2A thermal imaging device
2015-06-02 12:58:47 +02:00
ulteq
048e5b6f6d
Body bag cleanup:
...
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
Glowbal
cf0b2c2a52
Merge pull request #1469 from acemod/placeInBodyBagFix
...
Fixes random body bag teleports
2015-06-01 22:06:35 +02:00
SilentSpike
e3c09a7099
Added icon to unconscious module
2015-06-01 20:56:58 +01:00
SilentSpike
bfd1f8a102
Localise module names
2015-06-01 20:56:57 +01:00
SilentSpike
a30f6be713
Better module naming convention
2015-06-01 20:56:56 +01:00
SilentSpike
8fe1a65207
Cleaned up event handler
2015-06-01 20:56:54 +01:00
SilentSpike
bfce854be3
Localise module messages
2015-06-01 20:50:19 +01:00
SilentSpike
4c1641b64a
Generalized contextual modules system
2015-06-01 20:44:54 +01:00
SilentSpike
7d71d85ffc
Death to tabs
2015-06-01 20:44:53 +01:00
SilentSpike
e27ac53713
Implemented contextual modules
2015-06-01 20:44:51 +01:00
SilentSpike
eefe995a0c
Transfer curator functionality from ace_captives
2015-06-01 20:44:50 +01:00
SilentSpike
b72512e3f1
Zeus modules require larger icons
2015-06-01 20:44:50 +01:00
SilentSpike
97a1ff9bd6
Include no longer needed
2015-06-01 20:44:48 +01:00
SilentSpike
cd6474c748
Adding module icons
2015-06-01 20:44:47 +01:00
SilentSpike
9619b7d167
Improved naming and removed pointless category
2015-06-01 20:43:21 +01:00
SilentSpike
44ca13fe3a
Implemented capture module
2015-06-01 20:36:06 +01:00
SilentSpike
6251248a09
Fixed conditions
2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b
Corrected macro
2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea
Forgot my privates
2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591
Updated function headers
2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f
Missing setUnconscious parameter
2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941
Use zeus category
2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740
Implemented surrender module
...
Improved knockout module
2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671
Implemented knockout module
2015-06-01 20:36:00 +01:00
ulteq
14607f7aba
Fixes random body bag teleports
2015-06-01 21:23:00 +02:00
ulteq
47acb0f470
Merge pull request #1458 from acemod/drag_carry_fix
...
Fixes random teleport when dragging/carrying inside of buildings.
2015-06-01 20:22:29 +02:00
PabstMirror
25a597e5fe
Merge pull request #1460 from acemod/hitReactionsMounted
...
HitReactions - Don't do when mounted, add setting
2015-06-01 13:17:06 -05:00
PabstMirror
f57427ec96
switch waitAndExecute with 0 delay to execNextFrame
...
Should Fix #1463
2015-06-01 13:14:05 -05:00
ulteq
9d4c572261
Fixes build error: "config.cpp has externs but no RequiredAddons"
2015-06-01 20:12:07 +02:00
Nicolás Badano
9ed851a966
Merge pull request #1265 from gienkov/module-translations-2
...
Stringtable Zeus and View Distance
2015-06-01 14:44:04 -03:00
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
ulteq
8de5129313
Merge pull request #1464 from acemod/densityAltitude
...
Implemented Density Altitude calculation
2015-06-01 16:22:41 +02:00
ulteq
e626794866
Fixes array init
2015-06-01 16:21:30 +02:00
ulteq
0364975c12
Implemented Density Altitude calculation
2015-06-01 16:09:35 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
PabstMirror
473ab7d7c0
Fix mmg UBC
2015-05-31 23:48:20 -05:00
PabstMirror
e2217220eb
HitReactions - Don't do when mounted, add setting
2015-05-31 16:16:14 -05:00
gienkov
a173b5b048
TABS
2015-05-31 22:46:32 +02:00
gienkov
212862a401
Merge remote-tracking branch 'origin' into pl-translation-1
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/frag/stringtable.xml
2015-05-31 22:45:09 +02:00
Macusercom
53e0b35c12
German 1 correction for Advanced Ballistics
2015-05-31 20:31:38 +02:00
ulteq
4802ffeebf
Fixes random teleport when dragging/carrying inside of buildings.
2015-05-31 18:34:48 +02:00
ulteq
3a2fd9dc08
Merge pull request #1457 from acemod/weatherReadme
...
New weather module readme/feature description.
2015-05-31 17:39:52 +02:00
ulteq
a1f199bfdc
New weather module readme/feature description.
2015-05-31 17:39:24 +02:00
ulteq
903fb89d77
Overcast > 0.7 no longer implies rain:
...
* The higher the overcast value the higher the chance for rain
* But you can end up having no rain with an overcast value of 1.0
2015-05-31 17:30:52 +02:00
ulteq
5c8e79c50a
Updated all airFriction values according to: extras/airFrictionAnalysis.txt
2015-05-31 16:45:59 +02:00
Macusercom
0a47396d10
Corrections for German translation
2015-05-31 14:25:52 +02:00
Glowbal
0b8896239c
Progress bar stops on death - fix for #1449
2015-05-31 09:23:36 +02:00
Macusercom
5d1f2eafaa
Fix German Translation
2015-05-30 23:34:19 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52
Merge pull request #1417 from acemod/localDefuseObjects
...
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
Glowbal
3e3fdcf66e
Merge pull request #1429 from acemod/cseNVGadjustment
...
NightVision adjustment - use CSE's gamma
2015-05-30 21:50:56 +02:00
jonpas
66ceaa1d31
Fixed IS_STRING error due to regex replacing it with LSTRING
2015-05-30 20:09:53 +02:00
ulteq
5746128a0f
Further improved error handling when AB is enabled with incomplete configs:
...
* Calculates correct solutions when parts of the ammo config are missing
* Calculates correct solutions when parts of the weapon config are missing
* Performance improvement when AB is enabled
2015-05-30 20:06:55 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
PabstMirror
d7d225cebc
Send waiting debug msg only once
2015-05-30 01:28:15 -05:00
PabstMirror
b49b2fa3d1
Send to RPT and Clipboard
2015-05-30 01:21:47 -05:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05: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
esteldunedain
333cb80171
Delay initialization of ACE_Modules until settings are properly setup
2015-05-30 01:18:23 -03:00
esteldunedain
afa6a2fad9
Remove the "ServerSettingsReceived" event, which is not longer needed. As per @pabstmirror solution, the GVAR(Settings) variable is monitored to determine when the server info has arrived. Fix #1273
2015-05-30 00:43:51 -03:00
PabstMirror
5efde25585
Fix ace_settings
2015-05-29 21:03:47 -05:00
Glowbal
552b2f390f
Merge pull request #1256 from acemod/medicalExtension
...
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
PabstMirror
d457d9ffea
NightVision adjustment - use CSE's gamma
2015-05-29 15:37:53 -05:00
Nicolás Badano
8fbd7e8575
Merge pull request #1426 from alganthe/barrel_swap_fix
...
navid and SPMG barrel swapping added
2015-05-29 17:11:01 -03:00
Josuan Albin
7603e71468
removed useless entries
2015-05-29 22:08:13 +02:00
Glowbal
00acbaf44d
Added blur background client setting
2015-05-29 21:56:07 +02:00
ulteq
a57d8486ca
Removed some unneeded code
2015-05-29 20:51:20 +02:00
ulteq
65b9e67991
Refined the abort condition for the range card calculation
2015-05-29 20:11:07 +02:00
ulteq
d0e1af6e47
Improved missing config error handling
2015-05-29 19:39:54 +02:00
Josuan Albin
26a9f7f38e
navid and SPMG barrel swapping added
...
- added navid class to barrel swapping config
- added SPMG class to barrel swapping config
2015-05-29 15:31:48 +02:00
ulteq
6d1e8eebce
Reworked the range card output when AB is disabled
2015-05-29 15:07:30 +02:00
ulteq
a5a96052b8
Made use of the newly implemented speed of sound calculation
2015-05-29 13:34:34 +02:00
ulteq
ade2cc1c56
Refined the reference barometric pressure calculation
2015-05-29 12:55:16 +02:00
ulteq
988a12327f
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rangecard
2015-05-29 12:44:11 +02:00
ulteq
1ec37aabed
Merge pull request #1424 from acemod/barometricPressureFix
...
Fixed incorrect barometric pressure calculation
2015-05-29 12:40:17 +02:00
ulteq
abf0149b1d
Added speed of sound calculation:
...
* Influences the advanced ballistics transonic instability
* Influences the ATragMX range card output
2015-05-29 11:36:37 +02:00
ulteq
69b9d0e122
More in-depth barometric pressure calculation:
...
* Temperature is now taken into account
2015-05-29 11:18:40 +02:00
ulteq
83f2e35907
Fixed incorrect unit conversion in the barometric pressure calculation
2015-05-29 10:30:30 +02:00
ulteq
01810b8723
- Altitude is only taken into account when AB is enabled
...
- Separate solution caches for Vanilla and AB ballistics
2015-05-29 09:49:07 +02:00
Garth "L-H" de Wet
e2970ab40e
Merge pull request #1414 from acemod/Explosives_ZeusCompatible
...
Made explosives Zeus and AI compatible specifically in regards to Dea…
2015-05-29 07:48:50 +02:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e
Merge branch 'master' of github.com:acemod/ACE3
2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0
Merge branch 'surgicalkit'
2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f
minor refactor
2015-05-28 20:54:13 +02:00
jonpas
baca5a25d5
Merge branch 'master' into checkpboSettings
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-05-28 20:52:35 +02:00
jonpas
86264a7b7d
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
2015-05-28 20:49:30 +02:00
ulteq
4ad82d9629
Switched to ctrlCreate to avoid aspect ratio problems with the listbox.
2015-05-28 20:13:22 +02:00
jonpas
d597149fc6
Merge branch 'master' into nametagsToggle
...
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/XEH_postInit.sqf
addons/nametags/functions/fnc_onDraw3d.sqf
addons/nametags/stringtable.xml
2015-05-28 19:51:40 +02:00
ulteq
697710d40d
Initial draft of the range card implementation.
2015-05-28 19:17:29 +02:00
IngoKauffmann
ab31891b8d
runOnHover can now be CODE
...
Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
2015-05-28 18:16:05 +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
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +02:00
Nicolás Badano
5f70001ac0
Merge pull request #1409 from acemod/gogglesCacheSurfaceDust
...
Goggles - Cache Surface Dust
2015-05-28 09:48:42 -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
2cf9519702
Send to extension directly
2015-05-28 04:33:13 -05:00
PabstMirror
bfa75b833d
Merge branch 'master' into debugButton
2015-05-28 04:12:30 -05:00
PabstMirror
b29a75b7f6
Use new ace version html
2015-05-28 03:22:19 -05:00
PabstMirror
0c31adab61
Merge branch 'master' into mainMenuVersionHTML
2015-05-28 03:15:38 -05: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
jonpas
700c4cb962
Removed mistakenly added quotes in realisticnames comments
2015-05-27 22:57:50 +02:00
jonpas
b85ae8f194
Fixed missed external strings
2015-05-27 22:34:57 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
a99c02ff02
Added ESTRING and ECSTRING for external module references
2015-05-27 22:02:03 +02:00
jonpas
1c58ff823d
Stringtable fixes medical
2015-05-27 21:58:35 +02:00
jonpas
6f6f2a55f0
Stringtable fixes except medical
2015-05-27 21:43:30 +02:00
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +02: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
Macusercom
5cb0953094
Fixed German translations
...
Fixed some typos and phrases
2015-05-27 19:11:32 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02: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
jonpas
600fe61f72
Added STRING and CSTRING Macros
2015-05-27 17:10:34 +02: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
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
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +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
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
ulteq
5e6e62280e
Fixed a typo
2015-05-26 15:00:52 +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
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
PabstMirror
c7d9074f3f
Javelin - Only run if weapon and ammo supported
2015-05-25 05:38:45 -05:00
PabstMirror
0452270380
Add Javelin CfgAmmo
...
Leave M_Titan_AT alone for A3 Vehicles / Mods that use it
2015-05-25 05:34:07 -05:00
ulteq
cc7639ea22
Merge pull request #1386 from acemod/airFrictionUpdate
...
airFriction update
2015-05-25 12:00:31 +02:00
ulteq
2327a493c5
Updated the ATragMX gun profiles and optimized the airFrictions some more.
2015-05-25 10:28:20 +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
ulteq
21f4fcada3
Updated all airFriction values to minimize the drop difference when AB is disabled.
2015-05-25 00:53:41 +02:00
ViperMaul
06932f0c03
Restore missing actionDragUnit function file
...
#1375
2015-05-24 15:14:11 -07:00
Grzegorz
d96873b8a0
Fix line ending
2015-05-23 21:16:36 +02:00
gienkov
8ef41b7523
Translate missing frag and adv. ball. strings to PL
2015-05-23 21:16:34 +02:00
gienkov
00c5abecc2
Merge remote-tracking branch 'origin' into module-translations-2
...
Conflicts:
addons/viewdistance/ACE_Settings.hpp
addons/viewdistance/functions/fnc_changeViewDistance.sqf
2015-05-23 17:55:06 +02:00
ulteq
ee022e1dea
Fixes broken scope config ( #1312 )
2015-05-23 17:06:46 +02:00
Glowbal
7170db5dc2
Merge pull request #1368 from acemod/medicalBloodBags
...
Medical blood bags size matters
2015-05-23 10:07:58 +02:00
PabstMirror
d82fcd1f96
Advanced - Bloodbag lookup by treatment not item
2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0
Basic - Bloodbag size matters
2015-05-23 01:16:18 -05:00
bux578
04dd791374
Merge pull request #1367 from jonpas/stringtableABfix
...
Fixed missing close tag in Advanced Ballistics stringtable
2015-05-23 07:48:56 +02:00
PabstMirror
437db22ab8
#1364 - Prevent script error if bad muzzle
2015-05-22 23:38:16 -05:00
PabstMirror
e31a49283b
Merge branch 'master' into nameTagFixes
...
Conflicts:
addons/nametags/functions/fnc_drawNameTagIcon.sqf
2015-05-22 21:56:42 -05:00
jonpas
030b509ec5
Fixed missing close tag in Advanced Ballistics stringtable
2015-05-23 03:34:11 +02:00
PabstMirror
8fd0aef7d4
Medical - Fix Handle Damage
...
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
2015-05-22 16:35:48 -05:00
Glowbal
48ed51b03c
Merge pull request #1361 from acemod/FixUnconsciousCondition
...
Medical - Fix Unconscious Condition
2015-05-22 22:39:18 +02:00
PabstMirror
f785fcc0d4
Merge pull request #1362 from acemod/timeHasComeToday
...
Fix Time Calc
2015-05-22 14:32:56 -05:00
PabstMirror
f4bf6ea26d
Fix Time Calc
2015-05-22 14:29:56 -05:00
PabstMirror
537bba1382
Medical - Fix Unconscious Condition
2015-05-22 13:56:45 -05:00
ulteq
308b0aa0f9
Fixed incorrect barrel length.
2015-05-22 20:41:36 +02:00
ulteq
9536423f2e
Merge pull request #1353 from acemod/cleanup_ATragMX_AB
...
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:09 +02:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
PabstMirror
72020a43f1
Privates / Remove Debug
2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8
Create Defuse Helpers for spawned Explosives
2015-05-21 17:47:54 -05:00
jaynus
46751fd912
Merge pull request #1163 from acemod/fragSpallOptimization
...
Frag spall optimization
2015-05-21 15:08:07 -07:00
jaynus
3cb4094429
Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization
2015-05-21 15:07:12 -07:00
jaynus
c297257421
Disable frag by default. Add @pabstmirror fix closes #1339 closes #820
2015-05-21 15:06:55 -07:00
