Commit Graph

5248 Commits

Author SHA1 Message Date
gienkov
5136215e79 finger, parachute and spectator translation 2015-07-27 01:46:58 +02:00
gienkov
5bb1dded4b Merge remote-tracking branch 'origin' into pl-translation-4 2015-07-27 00:47:54 +02:00
PabstMirror
bf4e95e750 Merge pull request #1548 from acemod/fingering
Fingering
2015-07-26 16:47:41 -05:00
PabstMirror
4f9dba61ee Mk6 - Misc cleanup 2015-07-26 16:45:34 -05:00
Glowbal
41196c15aa Merge pull request #1686 from acemod/fixFrag
Fix frag
2015-07-26 23:42:16 +02:00
ViperMaul
951afef495 Merge pull request #1911 from acemod/fixLoadUnloadUnconscious
Fix load unload unconscious
2015-07-26 14:33:46 -07:00
Glowbal
0af6c5d852 Merge pull request #1913 from acemod/improveSwitchUnits
Improve SwitchUnits
2015-07-26 21:13:21 +02:00
Glowbal
d1809e597c Removed requirement for the medical dll
Medical extension is now an optional requirement that improves performance for advanced medical when used.
2015-07-26 20:54:49 +02:00
SilentSpike
159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
SilentSpike
e6f016f195 GVAR typo 2015-07-26 13:13:46 +01:00
SilentSpike
e431365586 Spectate on death setting 2015-07-26 13:12:58 +01:00
SilentSpike
ec6a0da01c Adjust camera speed while moving 2015-07-26 12:23:01 +01:00
SilentSpike
b0adf2e2ee Fix 3D icons not rendering 2015-07-26 12:13:05 +01:00
SilentSpike
efbd5189ce Close all dialogs when exiting 2015-07-26 12:05:41 +01:00
SilentSpike
f0f6edb549 Transition camera post-escape menu 2015-07-26 11:28:14 +01:00
bux578
cff54efbe0 add missing private 2015-07-26 09:20:38 +02:00
bux578
993f6bde16 remove respawnCounter in certain respawn template conditions 2015-07-26 09:19:29 +02:00
bux578
4ab1123efd fix unlimited growing array 2015-07-26 09:19:09 +02:00
Glowbal
dfec850aa8 Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs
addX macro in configs
2015-07-26 08:37:47 +02:00
PabstMirror
0b9d1fb05d Disabled by default - Safe FOV Check 2015-07-26 00:48:53 -05:00
SilentSpike
5cfe180d3b Fix camPan normalization 2015-07-26 02:17:09 +01:00
SilentSpike
697997ca8f Escape menu 2015-07-26 02:17:08 +01:00
SilentSpike
878bcf819e Fix map double click event 2015-07-26 00:25:31 +01:00
PabstMirror
c6f21f48a4 Merge branch 'master' into fingering 2015-07-25 17:28:22 -05:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
Glowbal
c9d4395a42 Merge pull request #1870 from SzwedzikPL/ah6_gun_fix
M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots
2015-07-25 21:39:21 +02:00
PabstMirror
fba457999e #1899 - Remove AV_ESS_blk config 2015-07-25 14:32:24 -05:00
Glowbal
ea8dc0a5ec Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant
Fix for 'Treat at...' option
2015-07-25 21:22:44 +02:00
Glowbal
3a53991ed0 fixed rvmat and texture paths 2015-07-25 21:21:31 +02:00
PabstMirror
ffc5615abd Merge pull request #1886 from acemod/windDeflectionSinglePFEH
Wind deflection single pfeh
2015-07-25 14:01:45 -05:00
PabstMirror
7da258111d Merge pull request #1739 from acemod/virtualAttachObject
Virtual attach object
2015-07-25 13:55:48 -05:00
Glowbal
3514f07d31 Merge pull request #1806 from jonpas/sittingFixes
Akward Sitting Fixes Part 2
2015-07-25 20:42:38 +02:00
Glowbal
f0a2c7c454 Merge pull request #1854 from jonpas/lookUp
Increased ability to look up
2015-07-25 20:41:46 +02:00
Glowbal
2f186ffbf1 Merge pull request #1897 from acemod/vectorCtrlTextGroupFix
#1871 - Don't do ctrlText(set) on RscControlsGroup
2015-07-25 19:57:55 +02:00
PabstMirror
40ed985d34 Config Fixes 2015-07-25 12:56:57 -05:00
Glowbal
c729672e53 Merge pull request #1885 from acemod/kestullHeightFix
Fix Kestrel Y position on large interface
2015-07-25 19:53:48 +02:00
Glowbal
6422c20e46 Merge pull request #1867 from acemod/cWire-localVehDamage
concWire - Apply damage where vehicle is local
2015-07-25 19:52:42 +02:00
PabstMirror
e616f2240e Merge pull request #1863 from acemod/huntIR-itemRemoved
Close huntIR monitor if item removed
2015-07-25 12:50:05 -05:00
PabstMirror
1008567cba Merge pull request #1847 from acemod/optionsOnIntroOutro
Show Options on Intro/Outro in Missions
2015-07-25 12:49:20 -05:00
Glowbal
0e872a5ed5 Merge pull request #1845 from acemod/huntir-deadProjectile
HuntIR - Handle Dead Projectile
2015-07-25 19:48:32 +02:00
ViperMaul
38bd2896ab Merge pull request #1851 from SzwedzikPL/hearing_in_zeus
Disable hearing in zeus camera
2015-07-25 10:44:34 -07:00
ViperMaul
55614b9ac3 Merge pull request #1839 from acemod/hearingUnification
Hearing PFEH unification / Flashbangs
2015-07-25 10:44:11 -07:00
PabstMirror
2a19521f68 Merge pull request #1820 from acemod/mk6-fixBISleveling
Mk6 fix leveling
2015-07-25 12:36:28 -05:00
KoffeinFlummi
88a5609016 Merge branch 'master' of https://github.com/acemod/ACE3 2015-07-25 19:35:26 +02:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
9e831d257d Merge pull request #1768 from acemod/10digitGrids2
10 digit grids 2
2015-07-25 12:32:02 -05:00
Glowbal
9d7374c893 Merge pull request #1307 from jokoho48/master
Cut Parachute/Reserve parachute
2015-07-25 19:17:37 +02:00
SilentSpike
21ce877115 Handle unit icons and provide setting 2015-07-25 14:13:37 +01:00
SilentSpike
2f1639822c Fix incorrect variable 2015-07-25 13:24:50 +01:00
SilentSpike
7107514b05 New function to precisely control spectatable sides 2015-07-25 13:24:49 +01:00
SzwedzikPL
6569fe1d62 macro_addbackpack 2015-07-25 13:13:31 +02:00
SilentSpike
69d1db2872 String updates 2015-07-25 11:41:31 +01:00
PabstMirror
bca5fa1f4a Spall - execNextFrame instead of addPerFrameHandler 2015-07-25 03:20:03 -05:00
PabstMirror
e29fb477f9 Merge branch 'master' into fixFrag 2015-07-25 02:38:10 -05:00
Glowbal
0ce50d7b17 Merge pull request #1896 from acemod/medicalTreatmentEndAnim
Medical - Don't play *_medic anims at end
2015-07-25 09:27:18 +02:00
SilentSpike
5ac77fa996 Corrected default param value 2015-07-24 22:31:51 +01:00
SilentSpike
c9750919a4 PFHs only as needed 2015-07-24 20:29:43 +01:00
SilentSpike
e2e6091c1f Close dialogs before open 2015-07-24 17:55:33 +01:00
SilentSpike
e4aee1da2c Add categories to help splash 2015-07-24 17:50:33 +01:00
SilentSpike
bafb261c01 Adding icon toggle 2015-07-24 17:37:07 +01:00
SilentSpike
e413cb3d91 Cache unit information 2015-07-24 17:17:00 +01:00
SilentSpike
8ef6364b59 Use localized side strings 2015-07-24 16:40:29 +01:00
SilentSpike
eaeda2667c Map icons 2015-07-24 16:40:28 +01:00
SilentSpike
fa306a0fb8 Further populate help splash 2015-07-24 11:39:41 +01:00
SilentSpike
9b3b5e9750 Prevent repeating key down events 2015-07-24 11:39:40 +01:00
PabstMirror
aa3b9e7b1c #1871 - Don't do ctrlText(set) on RscControlsGroup
Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control
type [15]`
2015-07-23 16:46:30 -05:00
PabstMirror
1b590bf0f9 More nametag fixes / setSetting casting 2015-07-23 14:05:20 -05:00
jonpas
817dfe94e2 Added possible values 2015-07-23 20:29:51 +02:00
jonpas
964f32a721 Fixed NameTags Settings defaults 2015-07-23 20:26:31 +02:00
gienkov
2f24b240b4 Fix end line marker 2015-07-23 13:59:50 +02:00
gienkov
61fa466a53 Medical and slideshow pl translation 2015-07-23 13:56:54 +02:00
PabstMirror
cbd74d768b Medical - Don't play *_medic anims at end 2015-07-23 02:43:19 -05:00
SilentSpike
53a0a9343b Populating help splash 2015-07-22 15:21:36 +01:00
SilentSpike
3d290977e5 Preserve unit name in toolbar 2015-07-22 15:21:33 +01:00
SilentSpike
766b1e1dcd Retain current settings when invalid settings given 2015-07-22 15:21:32 +01:00
SilentSpike
248cdf1f3f Public function error messages 2015-07-22 15:21:30 +01:00
PabstMirror
4d7a2888eb Remove Debug 2015-07-22 03:27:40 -05:00
PabstMirror
8f18fd7eaa Single PFEH for wind deflection 2015-07-22 03:04:54 -05:00
PabstMirror
24cda6e37c #1655 - Fix Kestrel Y position on large interface 2015-07-22 01:06:36 -05:00
SilentSpike
78ae59b223 Default value update 2015-07-21 22:56:47 +01:00
SilentSpike
aa67e296c0 User feedback when no units left 2015-07-21 22:54:46 +01:00
SilentSpike
9f0415b9fa Safeguard against removal of all modes 2015-07-21 22:45:54 +01:00
SilentSpike
53dc519336 Improved side handling in unit tree 2015-07-21 21:23:11 +01:00
SilentSpike
ec58c0061a Public functions to tweak available vision/camera modes 2015-07-21 20:19:54 +01:00
SilentSpike
43ecd308eb Fix empty array error 2015-07-21 20:00:09 +01:00
SilentSpike
c8a7bbba3b Improved mouse handling 2015-07-21 19:48:33 +01:00
SilentSpike
0d798264b0 Enforcing the speed limit 2015-07-21 19:43:03 +01:00
SilentSpike
341f3a253e Stop dolly on mouse button release 2015-07-21 18:44:24 +01:00
SilentSpike
f65b18f558 Keyup events 2015-07-21 18:26:49 +01:00
SilentSpike
7234c928bc setCameraAttributes should use ATL 2015-07-21 18:17:29 +01:00
SilentSpike
e81f9f5e59 Mouse dollying 2015-07-21 18:06:38 +01:00
SilentSpike
b6ff45e8bd Add vision mode to toolbar 2015-07-21 17:48:32 +01:00
SilentSpike
1890bc1d59 Unit cycling 2015-07-21 16:06:51 +01:00
SilentSpike
dc19bff189 Improve handling of invalid modes 2015-07-21 15:53:20 +01:00
SilentSpike
dcea8f4929 Adding vision to setCameraAttributes 2015-07-21 15:44:11 +01:00
SilentSpike
c0fd26f706 Add new setting to module 2015-07-21 15:15:31 +01:00
SilentSpike
37ffdab2ca Add camera cycling function 2015-07-21 15:15:21 +01:00
SilentSpike
2c1e346cca Header cleanup 2015-07-21 13:31:00 +01:00
SilentSpike
40f32b604a Camera vision modes 2015-07-21 12:46:34 +01:00
Glowbal
5508eae314 Merge pull request #1875 from jokoho48/3dModelUpdate2
3D Model Update 2.0
2015-07-21 12:22:28 +02:00
SilentSpike
21942eb5a1 Preserve z axis on map transport 2015-07-20 23:30:18 +01:00
SilentSpike
005b2ad406 camTilt should persist 2015-07-20 23:25:05 +01:00
SilentSpike
7a45c6543e Truncate speed values to 2 DP 2015-07-20 23:17:22 +01:00
SilentSpike
c3329ca8fc Set camera attributes 2015-07-20 23:17:03 +01:00
SilentSpike
34d2ec1d5a Altered naming conventions 2015-07-20 23:15:52 +01:00
SilentSpike
186d4d0583 Fix for #1665 2015-07-20 21:14:30 +01:00
SilentSpike
0d94bfe8bd Primative map interaction 2015-07-20 20:30:13 +01:00
ViperMaul
22d41797ac Merge pull request #1804 from acemod/misGuideStuff
Missle Guidance / Javelin Fixes
2015-07-20 11:28:18 -07:00
SilentSpike
52244c1647 Rejiggling toolbar 2015-07-20 18:38:18 +01:00
SilentSpike
5af5284bee Adding sides to unit tree 2015-07-20 18:37:17 +01:00
SilentSpike
8509646f88 Correct side usage 2015-07-20 18:37:07 +01:00
SilentSpike
841f939012 Improve toggling code and UX 2015-07-20 17:13:38 +01:00
SilentSpike
2ffa3c9a85 Prevent AI group chat 2015-07-20 00:09:52 +01:00
SilentSpike
77941c4f27 Remove help button 2015-07-20 00:09:51 +01:00
SilentSpike
08d5a8364f Improve overhead reduction 2015-07-19 23:03:40 +01:00
SilentSpike
e09342b7ea Improved toggle controls 2015-07-19 22:50:13 +01:00
SilentSpike
cc9283ed96 Minor UX tweaks 2015-07-19 22:47:21 +01:00
SilentSpike
e95186f550 Handle focus 2015-07-19 22:15:19 +01:00
SilentSpike
e406a794f2 Add hostile sides filter 2015-07-19 22:14:08 +01:00
SilentSpike
ac56702e33 Handle toolbar values 2015-07-19 20:02:52 +01:00
SilentSpike
0de56740c0 Improved camera mode transition 2015-07-19 16:50:59 +01:00
SilentSpike
d8cd1eeb1a Minimising PFH overhead 2015-07-19 16:50:58 +01:00
SilentSpike
3b1afe930e Handle the clock 2015-07-19 16:50:57 +01:00
Joko
9bdb192c8a Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
2015-07-19 15:31:15 +02:00
Glowbal
da5afde324 Merge pull request #1874 from jokoho48/TacticalLadderShootFix
Fix shoot through Tacticalladder
2015-07-19 15:08:12 +02:00
SilentSpike
619c2d780b Removing debug message 2015-07-19 13:03:49 +01:00
SilentSpike
935430ea59 Interface tweaks 2015-07-19 13:03:40 +01:00
SilentSpike
123825a6fe Updating zeus waypoint actions icon 2015-07-19 12:23:57 +01:00
SilentSpike
8d6f167d97 Safer unit updates 2015-07-19 12:09:57 +01:00
Joko
2615d99178 Fix shoot through Tacticalladder 2015-07-19 03:32:07 +02:00
SilentSpike
d680789d04 Enable compass, auto-refresh units, pass display to PFHs 2015-07-19 02:25:52 +01:00
SilentSpike
1ba0bcee95 Correct DIK code 2015-07-18 19:05:18 +01:00
SilentSpike
7091ac21e9 Function cleanup 2015-07-18 18:53:30 +01:00
SilentSpike
f7cf983e92 Corrected current unit updating 2015-07-18 18:53:28 +01:00
SilentSpike
e4ba5aaf1b Camera mode cycling 2015-07-18 18:53:27 +01:00
SilentSpike
7b28214c80 More reliable freecam PFH termination 2015-07-18 17:06:13 +01:00
SilentSpike
fb2b2bc9e5 Improve freecam handling 2015-07-18 16:59:05 +01:00
SilentSpike
60b3c6c0f8 Improved camUnit handling 2015-07-18 16:50:11 +01:00
SilentSpike
bfd9be9ce1 Naming consistency 2015-07-18 16:20:31 +01:00
SilentSpike
382c9fbc35 Variable handling and consistency 2015-07-18 15:52:44 +01:00
SilentSpike
5d279e11ec Interface toggles 2015-07-18 15:42:07 +01:00
SzwedzikPL
99e1b36712 AH6 gun fix, hearing protection change 2015-07-18 15:51:16 +02:00
SilentSpike
c6e71fbc36 Interface prettification 2015-07-18 13:12:34 +01:00
SilentSpike
359b81f2ef Spectator position fix 2015-07-18 13:04:23 +01:00
SilentSpike
2f8432699b Fix side filtering 2015-07-18 00:40:20 +01:00
PabstMirror
bf802f4f5d Merge branch 'master' into virtualAttachObject 2015-07-17 17:56:22 -05:00
SilentSpike
13201866bd Module icon 2015-07-17 23:31:31 +01:00
PabstMirror
ddc83e0889 #1639 - Apply damage where vehicle is local 2015-07-17 15:43:00 -05:00
SilentSpike
10c1c26c69 Improved unit switching 2015-07-17 20:51:06 +01:00
SilentSpike
832fa1e832 Side filter 2015-07-17 20:51:04 +01:00
SilentSpike
c48719a644 Attribution for F3 project devs 2015-07-17 16:45:16 +01:00
SilentSpike
cfcb9fedb6 Updating ace settings 2015-07-17 16:13:24 +01:00
SilentSpike
6de18416bc Interface tweaks 2015-07-17 13:14:09 +01:00
SilentSpike
3b9a364a26 Expanding the unit tree 2015-07-17 12:57:34 +01:00
Glowbal
015fd1afb0 Merge pull request #1864 from jokoho48/TextureUpdate
Update IV Blood and Plasma Texture
2015-07-17 11:06:49 +02:00
Joko
1b9d02a8a5 Update IV Blood and Plasma Texture 2015-07-17 09:40:43 +02:00
Glowbal
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
2015-07-17 08:17:42 +02:00
SilentSpike
6540971298 Tweaking a controls group 2015-07-17 02:58:31 +01:00
SilentSpike
27d85180f1 Improve handling of unit tree 2015-07-17 02:38:42 +01:00
SilentSpike
6cb1813527 Fix button y value 2015-07-17 02:16:35 +01:00
SilentSpike
81f87ee13c params for public functions 2015-07-17 02:05:24 +01:00
SilentSpike
78a8149cc2 Viewpoint order UX 2015-07-17 01:52:08 +01:00
SilentSpike
e012fbc7f9 Unit tools control group 2015-07-17 01:47:21 +01:00
SilentSpike
840d766d83 Fixing typos, updating interface 2015-07-17 01:22:38 +01:00
PabstMirror
b6e124d340 #1856 - Close huntIR monitor if item removed 2015-07-16 19:12:11 -05:00
PabstMirror
f845d54290 #1634 - Integrate with DAGR 2015-07-16 18:35:38 -05:00
PabstMirror
f438c6d0c5 Revert "Use new worldSize command instead of whileLoop"
This reverts commit 7d26519b2e.
2015-07-16 18:10:10 -05:00
PabstMirror
7d26519b2e Use new worldSize command instead of whileLoop 2015-07-16 17:47:39 -05:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
Nicolás Badano
04e137090b Merge pull request #1753 from jonpas/slideshow
Slideshow
2015-07-16 18:25:05 -03:00
Nicolás Badano
67d83d0d49 Merge pull request #1862 from acemod/disappearingActionsFix
Cache the objects actions for nearby objects and set the GVAR(objectA…
2015-07-16 18:24:55 -03:00
jonpas
77631eb61c Only add ACE_MainActions if one doesn't exist yet, Cleaned comments 2015-07-16 23:16:09 +02:00
SilentSpike
e823ec681d Toggle help key 2015-07-16 21:45:52 +01:00
jonpas
23e7e19100 Fixed macro, Added privates 2015-07-16 22:39:02 +02:00
SilentSpike
78e17c4bdc Fix function calls with switch to params 2015-07-16 21:37:20 +01:00
SilentSpike
a7a87c40f0 Using control groups 2015-07-16 21:33:50 +01:00
esteldunedain
8da43d25c6 Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly. 2015-07-16 17:28:27 -03:00
jonpas
a136545b85 Merge branch 'master' into slideshow 2015-07-16 22:20:56 +02:00
SilentSpike
723a0f96f6 Improve view switching UX 2015-07-16 19:43:16 +01:00
SilentSpike
20f05d9906 Improve unit switching UX 2015-07-16 18:31:49 +01:00
SilentSpike
458fe363ff Fixing typo 2015-07-16 17:56:50 +01:00
SilentSpike
3895a51f02 Correcting view transition 2015-07-16 17:48:32 +01:00
SilentSpike
e3c9e52fdd Tree events to update camUnit 2015-07-16 17:29:10 +01:00
SilentSpike
549d53d919 Use RscPicture for compass 2015-07-16 15:51:32 +01:00
SilentSpike
d043a471b3 Improving unit list handling 2015-07-16 15:49:02 +01:00
Joko
d92e6af1c2 Add IRStrobe to CfgMagazines 2015-07-16 15:17:09 +02:00
Joko
0ba8a39dc5 Add LoD to Wirecutter 2015-07-16 14:46:08 +02:00
Joko
c9a47ec053 Add LoDs for IVBag 250/500/1000
Add LoDs for Kestrell
2015-07-16 14:41:42 +02:00
Joko
b2b7015b8e Remove Unessesary Comments in RVMAT 2015-07-15 21:35:30 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
SilentSpike
7f04164653 Handling the spectatable unit list 2015-07-15 14:58:38 +01:00
SilentSpike
147571c76f Better method of updating camera view 2015-07-15 14:58:08 +01:00
SilentSpike
784865d634 Clear workspace 2015-07-15 13:50:10 +01:00
SilentSpike
5dc4dbeb88 Handle camera attributes 2015-07-15 12:34:44 +01:00
SilentSpike
d2345a398a Handle free cam movement 2015-07-15 12:23:25 +01:00
SilentSpike
90b6fd3d8b Initalize interface 2015-07-15 12:09:28 +01:00
SilentSpike
d7cc309591 setSpectator correct group handling, disable user input 2015-07-15 11:48:49 +01:00
SilentSpike
a02470c341 Unify interface as display 2015-07-15 11:43:09 +01:00
jonpas
e1fb4db63a Fixed chairs inheritance in sitting 2015-07-15 00:42:41 +02:00
jonpas
174ef91b82 Fixed comment typo 2015-07-15 00:36:05 +02:00
jonpas
338aa19aaa Increased ability to look up #1846, Cleaned up new and empty lines in movement 2015-07-15 00:35:12 +02:00
PabstMirror
14eae93f4b #1814 - Save and restore last mortar charge setting 2015-07-13 19:09:55 -05:00
PabstMirror
78d0767051 #1838 - Remove base airFriction test (broke smokes) 2015-07-13 18:42:59 -05:00
SilentSpike
7b88280988 Merge pull request #1852 from jonpas/fixELSTRINGmacroWord
Fixed ELSTRING macro typo
2015-07-14 00:02:34 +01:00
jonpas
01ba50bbb2 Fixed ELSTRING macro typo 2015-07-13 22:12:54 +02:00
jonpas
b266effe5b Made object actions dynamic 2015-07-13 22:07:21 +02:00
SzwedzikPL
60641d57d2 Disable hearing in zeus camera 2015-07-13 21:01:41 +02:00
Nicolás Badano
01d8d7957c Merge pull request #1824 from Legolasindar/master
Update spanish translation
2015-07-13 15:36:36 -03:00
jonpas
4fa1c7dc0a Moved verification to public function, removed unnecessary str 2015-07-13 19:56:25 +02:00
PabstMirror
061ddbd8de Remove debug testing code 2015-07-12 14:09:27 -05:00
PabstMirror
46cee06f07 #1812 - Show Options on Intro/Outro 2015-07-12 10:26:08 -05:00
PabstMirror
d4f70134e6 medical/setUnconscious header 2015-07-12 10:25:00 -05:00
jonpas
89c5218bbd Fixed module init exit condition 2015-07-12 16:45:09 +02:00
jonpas
b83b161e3d Fixed default duration value in module init, Added error if required fields left empty, Combined 2 lines 2015-07-12 16:32:48 +02:00
PabstMirror
05d98370e4 Handle enableCombatDeafness and/or ringing enabled 2015-07-11 21:00:40 -05:00
PabstMirror
7a204cbdb1 #1843 - HuntIR - Handle Dead Projectile 2015-07-11 19:48:52 -05:00
PabstMirror
6de3df6474 Update README.md 2015-07-11 12:42:19 -05:00
PabstMirror
040f4a92a0 #1696 - Flashbangs make big boom 2015-07-10 21:39:35 -05:00
PabstMirror
c27afca485 DisableEarRinging / Cleanup 2015-07-10 21:30:47 -05:00
PabstMirror
d11fa939e1 Hearing - Merge PFEH (ringing/volume) 2015-07-10 21:01:32 -05:00
jonpas
c90c83831d Removed Tripod PBOPREFIX newline 2015-07-10 23:36:30 +02:00
jonpas
ef18006423 Tripod indentation to 4 spaces, removed empty first lines 2015-07-10 23:34:36 +02:00
SilentSpike
97f3ec4f65 Merge pull request #1835 from jonpas/disableEarRingingOnTheFly
Exit Ear Ringing PFH when disabled during ringing
2015-07-10 22:08:53 +01:00
jonpas
4826fd5c1c Exit Ear Rining PFH when disabled during ringing 2015-07-10 22:52:04 +02:00
jonpas
e437fbbacd Removed safety from binoculars/designators 2015-07-10 22:42:40 +02:00
SilentSpike
a1ec2eb7c3 Update handleRespawn to new function parameters 2015-07-09 21:24:45 +01:00
SilentSpike
1e13758ad8 Better group handling, more functional function 2015-07-09 21:20:09 +01:00
SilentSpike
1e8b869117 Reshuffling toolbar tools 2015-07-09 18:08:34 +01:00
SilentSpike
877d4e7cd9 Using common defines, further cleanup 2015-07-09 17:53:22 +01:00
Glowbal
d3bed7aedb fixed -1 to disable the revive timer does not work 2015-07-09 13:02:48 +02:00
PabstMirror
499a63e8e3 External - Move to right of head 2015-07-08 15:53:31 -05:00
Ivan Navarro Cabello
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
SilentSpike
46bd42d59e Cleanup interface config 2015-07-08 15:31:54 +01:00
PabstMirror
ba8c9186bb Show leveled azimuth/elevation 2015-07-08 01:00:43 -05:00
jonpas
815b7984aa Fixed event statement arguments, reworded comment 2015-07-07 03:46:54 +02:00
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
SilentSpike
98e9245ed9 Basic respawning support 2015-07-05 21:53:09 +01:00
SilentSpike
2aebabdb2c Safeguard against repeat usage 2015-07-05 21:31:26 +01:00
SilentSpike
788c23c940 Allow resetting existing spectators 2015-07-05 21:30:19 +01: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
PabstMirror
88e0b67364 Merge branch 'master' into fingering 2015-07-05 12:30:31 -05:00
SilentSpike
9026db9b3c Major cleanup 2015-07-05 16:44:16 +01: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
SilentSpike
069ab2432a Keybinds should always be present 2015-07-05 01:32:06 +01:00