Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,206 Commits 73 Branches 88 Tags 752 MiB
59d0e6e788
Commit Graph

6753 Commits

Author SHA1 Message Date
PabstMirror
7c276d9d25 Grenade Cleanup 2015-08-14 20:25:27 -05:00
PabstMirror
e160a62599 Merge pull request #2145 from jokoho48/codeCleanupGrenades 
Code cleanup of Grenades module
 2015-08-14 20:18:30 -05:00
PabstMirror
b9db03de20 Fix count problems 2015-08-14 20:13:41 -05:00
PabstMirror
e3a31687a8 Merge pull request #2084 from jokoho48/codeCleanupDisarming 
Code cleanup of Disarming module
 2015-08-14 20:01:23 -05:00
PabstMirror
253fb6e66a Merge pull request #1986 from acemod/addMainAction 
Always make sure ACE_MainActions exists
 2015-08-14 19:48:04 -05:00
PabstMirror
f9b3cbc02a Merge pull request #1956 from SzwedzikPL/laser_default_keybinds 
default laser code down keybind fix
 2015-08-14 19:36:02 -05:00
PabstMirror
6932014b9d Merge pull request #1993 from acemod/fixMapCompassChange 
Fix ace_map changes to compass display object
 2015-08-14 19:34:09 -05:00
PabstMirror
fc51ad9a5e Merge pull request #2137 from acemod/checkPBO-spawnloop 
CheckPBO Fix endless waitUntil if checkAll is false
 2015-08-14 19:31:36 -05:00
PabstMirror
13abee2612 Merge pull request #2106 from acemod/optionMenuFiltering 
Option Menu Fixes for categories
 2015-08-14 19:31:17 -05:00
PabstMirror
21400b0174 UBC, privates, LSTRING 2015-08-14 15:46:51 -05:00
PabstMirror
2be74dfdca Privates 2015-08-14 15:14:36 -05:00
Glowbal
2062f5dcb6 fixed incorrect variable name 2015-08-14 22:07:49 +02:00
Glowbal
96ec435d0d Added load in cargo containers 2015-08-14 22:01:14 +02:00
Glowbal
55ad706761 fixed car check - invalid variable name 2015-08-14 22:00:55 +02:00
PabstMirror
066a78d9aa Fix var 2015-08-14 14:36:54 -05:00
Glowbal
83f46be990 Fixes and improvements for the repair module 
1. Added full repair,
2. Added missing settings to modules and settings framework,
3. added assign engineer module.
4. Fixed animation bug
 2015-08-14 20:49:51 +02:00
PabstMirror
ef5a3d69f5 Merge pull request #2148 from acemod/nameTagFixes 
nametag cleanup and fix cursortarget distance
 2015-08-14 12:58:02 -05:00
PabstMirror
09296e42a0 Merge pull request #2143 from acemod/removeBreifingPFEH-hack 
Remove PFEH hack
 2015-08-14 12:50:35 -05:00
ViperMaul
c3f6ee7141 Merge pull request #2140 from acemod/addActionParamChecking 
AddAction basic param checking
 2015-08-14 10:48:07 -07:00
Joko
ec5a1f038a fix Typo issue 2015-08-14 18:42:22 +02:00
jokoho48
c4ed18f39f Fix findNearestVehicle dont return BOOL 
Fix that findNearestVehicle dont return any time the nearest car
Small Performance Improvement in getSizeItem/handleDestroyed/startUnload
Enhance Some legibility
 2015-08-14 18:07:31 +02:00
jokoho48
8e7e9b9ee3 Fix Typo 2015-08-14 14:57:29 +02:00
Michael Braun
eaae6dfb7d Replaced padding chain with params defaults 2015-08-14 11:43:36 +02:00
Michael Braun
2bbf631e71 Fixed missing semi-colon in safemode. 2015-08-14 11:39:22 +02:00
IngoKauffmann
6dc5050dc3 Missed one return type 2015-08-14 03:21:16 +02:00
IngoKauffmann
de500fb80b First batch of fixes 2015-08-14 03:18:54 +02:00
jokoho48
84685f4a84 add dayOfWeek and updateMemory to Own File 
Update some Comments
Fixing Spelling Issue
 2015-08-14 02:22:15 +02:00
jokoho48
183aac1911 Code cleanup of Kestrel 4500 module. 2015-08-14 01:55:54 +02:00
jokoho48
bd56d1bb83 ok that is my fault 2015-08-14 00:36:36 +02:00
jokoho48
cb8d009ef0 Woops 2015-08-14 00:31:42 +02:00
PabstMirror
28ac2fbec6 Merge pull request #2147 from jokoho48/codeCleanUpHitReaction 
Code cleanup of HitReaction module
 2015-08-13 17:11:19 -05:00
jokoho48
d62f00146e Comment CleanUp 2015-08-14 00:02:19 +02:00
jokoho48
0656418cd1 Code cleanup of HuntIR module. 2015-08-14 00:00:34 +02:00
PabstMirror
68517756c4 #2139 and nametag cleanup 2015-08-13 17:00:24 -05:00
jokoho48
e890b310c1 Code cleanup of HitReaction module 2015-08-13 23:50:51 +02:00
jokoho48
27babd351d Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupHearing 2015-08-13 23:43:01 +02:00
jokoho48
c6fbdb420c Code cleanup of Hearing module 2015-08-13 23:42:20 +02:00
PabstMirror
2d8261ddb5 Merge pull request #2135 from acemod/nameTagsWhenPaused 
Don't draw nametags when escape menu is open
 2015-08-13 16:09:32 -05:00
PabstMirror
43e9c420c4 Merge pull request #2136 from acemod/captiveHeliFix 
Don't use old Helicopter_F
 2015-08-13 16:01:59 -05:00
jokoho48
7bf7066cfd Code cleanup of grenades module. 2015-08-13 22:36:58 +02:00
PabstMirror
7c60375105 Merge pull request #2102 from acemod/disposableFixes 
Disposable fixes
 2015-08-13 15:13:03 -05:00
PabstMirror
05def2f62b Merge pull request #2016 from jokoho48/codeCleanupBackpack 
Code cleanup of the Backpack module.
 2015-08-13 15:10:39 -05:00
PabstMirror
8f142e26f8 Merge pull request #2094 from jokoho48/codeCleanupFingering 
Code cleanup of Finger module.
 2015-08-13 15:09:18 -05:00
jokoho48
acb4e44c19 Code cleanup of Finger module is Incomming(Part 2). 2015-08-13 22:04:35 +02:00
jokoho48
fcd60650b2 PATHTOF dont work with say3d 2015-08-13 21:57:58 +02:00
jokoho48
5597b7e40c Code cleanup of Backpacks module 2015-08-13 21:56:02 +02:00
PabstMirror
a7ad6dafc9 Remove PFEH hack 2015-08-13 14:09:25 -05:00
PabstMirror
4f0dab23b8 Nametag category 2015-08-13 13:27:24 -05:00
PabstMirror
763f793d0e Localize Catagoires in loadSettingsLocalizedText 
Minor, but allows us to use CSTRINGS in configs for consistancy
 2015-08-13 13:20:37 -05:00
IngoKauffmann
7d75f9cd2c Initial draft 2015-08-13 19:33:55 +02:00
PabstMirror
6ca3761710 AddAction basic param checking 2015-08-13 11:54:26 -05:00
PabstMirror
cfaf046e29 CheckPBO Fix endless waitUntil if checkAll is false 2015-08-13 00:31:29 -05:00
PabstMirror
3425913d27 #2132 - Don't use depreciated Helicopter_F 2015-08-12 23:32:57 -05:00
PabstMirror
b94cb3b85d #2129 - Don't draw nametags when escape menu is open 2015-08-12 16:14:12 -05:00
jonpas
936e6868bc Added README.md to viewdistance and Arkhir to AUTHORS.txt 2015-08-12 22:34:16 +02:00
jonpas
e46bd16df0 More cleaning to ACE_Settings in viewdistance 2015-08-12 22:20:07 +02:00
jonpas
b1408af43a Mk 1 eyeballs integration 2015-08-12 22:09:59 +02:00
jonpas
47fbe9bca5 Changed postInit to clientInit 2015-08-12 20:18:23 +02:00
jonpas
e20811c0f2 Cleaned up headers, newlines in viewdistance 2015-08-12 20:16:01 +02:00
bux578
3b3d99fd60 fix gienkov's stuff 2015-08-12 18:46:56 +02:00
bux
3dc53ec492 replace <Original> with <English> 2015-08-12 10:25:37 +02:00
Michael Braun
58b697e292 Fixed missing space invalidating some xml parsers. 2015-08-12 10:06:45 +02:00
Glowbal
0080335617 Added config attributes for cargo on wheel and tracks 2015-08-11 23:21:44 +02:00
Glowbal
aadddaa2c5 Added wheel as initial cargo when cargo module is enabled 2015-08-11 23:20:25 +02:00
Glowbal
abc732ac35 Added support for cargo configuration on vehicle spawn 2015-08-11 23:18:01 +02:00
Glowbal
c7b7418ae0 Removed "can only remove damaged wheels" 2015-08-11 21:42:20 +02:00
Glowbal
b45aa51d47 hacked approach for repair tracks. 
Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.
 2015-08-11 21:35:13 +02:00
Glowbal
660f8debf6 Merge branch 'master' into repair 2015-08-11 21:09:44 +02:00
Glowbal
17115b8846 test switch to adv medical handleDamage 2015-08-11 20:58:00 +02:00
voiper
f676f605f3 Fix 00000101. 2015-08-11 11:18:54 -07:00
voiper
f5b6eb5ca9 Git fix Nummer 5. 2015-08-11 11:14:32 -07:00
voiper
4aa28368ad Git fix numero 5. 2015-08-11 11:10:42 -07:00
voiper
8230dbd272 Git fix #4. 2015-08-11 11:08:01 -07:00
voiper
2d101d064e Git fix #3. 2015-08-11 10:59:50 -07:00
voiper
e0ed81dc67 Git fix #2. 2015-08-11 10:59:21 -07:00
voiper
2144a56be1 Fix attempt. 2015-08-11 10:49:39 -07:00
Michael Braun
4babfa0bf8 Fixed missing return value description in safemode module 2015-08-11 17:56:46 +02:00
Michael Braun
42e7340b79 Code cleanup of Safemode module 2015-08-11 16:50:05 +02:00
SilentSpike
95aa9f604b Fix manual pre-setting of spectator camera unit 
If the spectator camera unit was set before the camera had ever opened then the unit list wouldn't be populated and as such the camera would automatically abort to free mode since the unit wasn't available to spectate.

So now I'm running the updateUnits function before opening the camera to pre-populate the list.
 2015-08-11 13:53:55 +01:00
PabstMirror
a908863317 Use proper lnbXXX commands 2015-08-11 04:15:55 -05:00
PabstMirror
bdca10eac4 Close Client Settings When open Server Settings 2015-08-11 01:38:31 -05:00
PabstMirror
4cce799ace #2045 - Push SDV sub, cleanup push 2015-08-10 22:08:13 -05:00
PabstMirror
2565a80a22 #2098 - Option Menu Fixes for categories 
Use lbValue to store the index of the filtered selection
 2015-08-10 17:19:30 -05:00
Glowbal
ffa476bee2 Improved action display text 2015-08-10 23:16:58 +02:00
Glowbal
c016d01414 Initial load in cargo module 2015-08-10 23:07:47 +02:00
PabstMirror
4377bbeb75 Delete unused file 2015-08-10 15:26:44 -05:00
PabstMirror
512011a756 Remove Debug Code 2015-08-10 15:16:16 -05:00
PabstMirror
47b18b2b39 Cleanup disposables also fix #2090 (alt add for AI) 2015-08-10 15:12:42 -05:00
Michael Braun
a315596c5a Fixed isValidColorArray returning true when array had the right size, but wrong datatypes/value ranges 2015-08-10 20:32:26 +02:00
Michael Braun
3e82391a36 Added validation and various fixes 2015-08-10 19:04:49 +02:00
Glowbal
27a57d89f8 Merge branch 'master' into cargo 2015-08-10 17:59:19 +02:00
Michael Braun
5287455c0b Fixed aborting data transmission on no owner id encounter 2015-08-10 17:07:01 +02:00
Michael Braun
5e4316d0e2 Fixed missing semi-colon 2015-08-10 16:43:33 +02:00
Michael Braun
5788705821 Fixed code style issues and added missing variable initialization in map_gestures 2015-08-10 15:24:57 +02:00
Michael Braun
b1d3654a97 Fixed owner id not getting assigned in map gestures 2015-08-10 14:54:28 +02:00
Glowbal
e5eaefafdb fixed #2097 - script error because of global variable in params 2015-08-10 09:51:14 +02:00
Michael Braun
90e4d005ee Give credit where credit is due 2015-08-10 08:45:43 +02:00
Michael Braun
a38cdda8e3 First iteration on implementing Dslyecxi's ST Map Gestures 2015-08-10 04:40:30 +02:00
jokoho48
f3fbf0c5ff Code cleanup of Finger module is Incomming. 2015-08-10 00:19:27 +02:00
Glowbal
0c2c71e70e Merge pull request #2056 from MikeMatrix/codeCleanupSandbag 
Code cleanup of Sandbag module
 2015-08-09 23:56:25 +02:00
jokoho48
5db5e34edf Fix Git Shit 2015-08-09 23:50:02 +02:00
gienkov
1c537c6739 fix captives again 2015-08-09 23:04:16 +02:00
gienkov
0914193e14 fix captives module 2015-08-09 22:45:01 +02:00
jokoho48
a3fd072328 Make New Model 2015-08-09 22:44:39 +02:00
gienkov
be787883f2 captives translation 2015-08-09 22:38:34 +02:00
gienkov
49668a25f8 Merge remote-tracking branch 'origin/master' into pl-translation-5 2015-08-09 22:36:41 +02:00
SilentSpike
c30cb45bd6 Optimize spectator UI held key prevention system 2015-08-09 20:59:57 +01:00
PabstMirror
dc06927418 missing ; 2015-08-09 13:57:39 -05:00
PabstMirror
b57ca91f69 Merge branch 'master' into virtualExplosivesPlace 2015-08-09 13:45:51 -05:00
PabstMirror
6755b8766a Merge pull request #2085 from jokoho48/codeCleanupDisposable 
Code cleanup of Disposable module
 2015-08-09 13:24:18 -05:00
Glowbal
9c8a03b0b3 fixes #2070 - medication is not translated on activity log 2015-08-09 20:12:31 +02:00
Glowbal
aa4840d860 fixes #2075 - menu doesn't show which bodypart is selected on Basic medical 2015-08-09 20:08:45 +02:00
Glowbal
298f64a7bf fixes #2078 
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
 2015-08-09 20:07:06 +02:00
PabstMirror
207c002f3a params 2015-08-09 13:02:08 -05:00
PabstMirror
5723c5eaac Merge branch 'master' into addMainAction 2015-08-09 13:00:56 -05:00
jokoho48
fb56517099 Merge branch 'master' of https://github.com/acemod/ACE3 into repair 2015-08-09 18:58:02 +02:00
Glowbal
e4abf7c8cc added spare wheel to config 2015-08-09 18:26:49 +02:00
Glowbal
ed6a53a402 Attempt at repairing tracks. Improved repair wheel actions 2015-08-09 18:08:53 +02:00
Glowbal
872d026cd0 All repair actions are now functional 2015-08-09 17:23:32 +02:00
Glowbal
9adbb07367 Moved replace and repair wheel actions into the repair action framework 2015-08-09 15:53:52 +02:00
jokoho48
fab0eee5dd corrected some small point 2015-08-09 15:28:11 +02:00
jokoho48
79cf8dd98e Fixing Some Spelling 
Remove Some forgotten Commands
 2015-08-09 15:20:50 +02:00
jokoho48
323832474f Code cleanup of Dragging module 2015-08-09 14:53:13 +02:00
Glowbal
3cac137851 Fixed #1893 - Menu closes when patient is more as 10 meters away 2015-08-09 09:14:42 +02:00
Glowbal
58fc69c2a6 Updated litter configuration. Closes #2002 2015-08-09 08:59:04 +02:00
PabstMirror
ec97cd2edd Fix wheel texture 2015-08-09 01:58:49 -05:00
PabstMirror
4b603ff46f Localization, params 2015-08-09 01:54:44 -05:00
PabstMirror
0e17bebd23 Merge branch 'master' into repair 2015-08-09 00:33:08 -05:00
jokoho48
b23f9c0de2 Code cleanup of Disposable module 2015-08-09 05:25:19 +02:00
jokoho48
156609aab2 Code cleanup of Disarming module 2015-08-09 05:18:26 +02:00
PabstMirror
7624a459eb Merge pull request #2010 from jokoho48/codeCleanupInteractMenu 
Code cleanup Interact_menu module
 2015-08-08 21:35:54 -05:00
PabstMirror
95d88b920e #2079 - RemoveTourniquet doesn't require any items 2015-08-08 21:25:36 -05:00
PabstMirror
5628ce1bcd #2074 - Medical Menu Module not unique 2015-08-08 20:27:56 -05:00
PabstMirror
879826de8b Merge pull request #2077 from jonpas/fixNametagsString 
Fixed incorrect string path in nametags
 2015-08-08 19:58:52 -05:00
PabstMirror
c949daae1f OptionMenu C->LStrings 2015-08-08 19:57:57 -05:00
jokoho48
bd1a6d14a8 Code cleanup of Dagr module 2015-08-09 02:33:00 +02:00
jokoho48
7bdfe03c92 Code cleanup of Concertina_wire module 2015-08-09 02:19:34 +02:00
gienkov
ce99404200 move english strings from original to english, remove original 2015-08-09 01:52:22 +02:00
gienkov
1c0a6fb457 PL translation of common, medical_menu, optionsmenu 2015-08-09 01:47:55 +02:00
jonpas
7d36d80072 Fixed incorrect string path in nametags 2015-08-09 01:23:20 +02:00
Glowbal
2b3c936e99 count should be a foreach 2015-08-09 00:41:43 +02:00
Glowbal
c7ac190f58 Finalized settings 2015-08-09 00:21:59 +02:00
gienkov
6bd4fcc4fd Fix stringtable error 2015-08-08 23:39:29 +02:00
Glowbal
54ad9d1444 Merge branch 'master' into require-surrender-captive 2015-08-08 23:21:00 +02:00
Glowbal
493254619c Merge pull request #2039 from acemod/medical-menu 
Medical menu
 2015-08-08 23:11:11 +02:00
Glowbal
f02a00ae69 Merge pull request #2058 from acemod/add-category-optionsmenu 
Add category optionsmenu #852
 2015-08-08 22:59:19 +02:00
SilentSpike
416d559354 Expand common isFeatureCameraActive function 
The function is currently only used by ace_goggles and it makes sense to expand it to detect if any common feature camera is active rather than just BI cameras
 2015-08-08 20:51:24 +01:00
PabstMirror
a6acff9178 Setting to disable hearing for zeus RC 2015-08-08 14:40:19 -05:00
PabstMirror
d5a3c66b89 Minor Spelllings Fixes 2015-08-08 14:17:03 -05:00
Glowbal
c0562aaf6c clean up debug messages 2015-08-08 20:31:19 +02:00
Glowbal
696546de5c Finalized ACE medical menu settings 2015-08-08 20:22:19 +02:00
SilentSpike
d294989cb0 Allow chat use on input disabled listen server 
Listen server technically doesn't have serverCommandAvailable.
 2015-08-08 19:11:41 +01:00
SilentSpike
182eef39de Adjust spectator camera pan and tilt with zoom 2015-08-08 18:41:38 +01:00
PabstMirror
c6be0bbb8c Merge branch 'master' into add-category-optionsmenu 
Conflicts:
	addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
 2015-08-08 12:39:14 -05:00
PabstMirror
feceff2746 Polish the stringtable 2015-08-08 12:36:42 -05:00
SilentSpike
213deeffb4 Add keys to adjust spectator camera speed and zoom 
Allows for finer control of the speed and zoom, as well as a quick way to reset either.
 2015-08-08 18:31:37 +01:00
PabstMirror
0719a3c1c6 Merge pull request #2055 from MikeMatrix/codeCleanupScopes 
Code cleanup Scopes module
 2015-08-08 11:42:40 -05:00
Glowbal
4c7bcbb6fe Added triage card display 2015-08-08 18:29:30 +02:00
SilentSpike
d7730103c9 Update ace_spectator readme 2015-08-08 17:22:04 +01:00
PabstMirror
7fe6c2fe1b Merge pull request #2063 from jonpas/fixMissingString 
Fixed missing string
 2015-08-08 11:19:27 -05:00
PabstMirror
8e905af444 Merge pull request #1977 from acemod/attachClickCooldown 
Mouse cooldown for click to interact option
 2015-08-08 11:18:20 -05:00
Glowbal
31a5f8899b Changed default keybinding value to be H 2015-08-08 18:16:25 +02:00
PabstMirror
451c88c601 Merge pull request #2027 from acemod/joinGroupTeamManagement 
EnableTeamManagement setting for joinGroup
 2015-08-08 11:16:20 -05:00
Glowbal
bb79feeaf1 Clean up duplicate files 2015-08-08 18:16:11 +02:00
jonpas
8e3a961ee3 Fixed missing string 2015-08-08 18:11:28 +02:00
PabstMirror
7c7fb35cee Merge pull request #2036 from acemod/mapToolsOnOtherMaps 
MapTools work on children of itemMap
 2015-08-08 11:10:32 -05:00
Glowbal
054ac3443d Merge pull request #2062 from jonpas/removeDuplicatedStrings 
Removed duplicated strings
 2015-08-08 18:04:44 +02:00
jonpas
1aecd54fc3 Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common 2015-08-08 18:02:20 +02:00
Glowbal
364e0455ee Merge branch 'master' into medical-menu 2015-08-08 17:55:43 +02:00
Glowbal
bd0593f8f4 fixed missing semi-column 2015-08-08 17:49:43 +02:00
Glowbal
12f0808784 Merge branch 'master' into hearingRingingModule 
Conflicts:
	addons/common/stringtable.xml
 2015-08-08 17:42:18 +02:00
Glowbal
c69aa09d55 Merge pull request #2054 from MikeMatrix/codeCleanupSitting 
Code cleanup of Sitting module
 2015-08-08 17:00:07 +02:00
SilentSpike
be7b156c49 Add "focus on unit" to spectator free camera 
Pressing F will move the free camera to a position viewing the unit currently selected in the list. Fixes map teleporting functionality also.
 2015-08-08 15:49:07 +01:00
Glowbal
9fc94eefd9 Merge pull request #2006 from jokoho48/codeCleanupWinddeflection 
Code cleanup Winddeflection module
 2015-08-08 15:03:26 +02:00
Glowbal
a65495fb14 Merge pull request #2011 from jokoho48/codeCleanupBallistic 
Code cleanup Ballistics module.
 2015-08-08 15:00:08 +02:00
Glowbal
ff421db3df Merge pull request #1980 from MikeMatrix/headDirBasedWindIndication 
Headdirection based wind indication
 2015-08-08 14:51:37 +02:00
Glowbal
66f2dfa31e Merge pull request #2059 from MikeMatrix/documentationFixWeaponselect 
Updated function documentation of Weaponselect
 2015-08-08 14:45:28 +02:00
Michael Braun
e4a4a942d0 Updated function documentation of Weaponselect 2015-08-08 14:40:23 +02:00
Glowbal
65c06551a5 Merge pull request #1652 from gienkov/patch-22 
Fix checking vitals anim
 2015-08-08 14:32:36 +02:00
SilentSpike
5b881224c5 Allow admins to use chat in the spectator UI 2015-08-08 13:31:10 +01:00
Glowbal
d8d706eb04 Merge pull request #1974 from jokoho48/parachutePrivateScope 
Fix that Reserve Parachute can get in Arsenal or in Crate
 2015-08-08 14:25:40 +02:00
Glowbal
be00f7ffe4 Merge pull request #2000 from acemod/treatmentResetWeaponMode 
Treatment reset weapon mode
 2015-08-08 14:20:10 +02:00
Glowbal
94be0d9fbd Merge pull request #2008 from jokoho48/codeCleanupViewdistance 
Code cleanup Viewdistance module
 2015-08-08 14:18:45 +02:00
Glowbal
e8961e3d0e Use display instead of just idc 2015-08-08 13:41:25 +02:00
Michael Braun
9c29ff0c57 Inlined PFHs in Switchunits 2015-08-08 13:34:35 +02:00
SilentSpike
e59f0ce822 Fix spectator respawn template for types 0 and 1 
Type 0 worked, but the mission didn't end when all players were killed.
Type 1 didn't work because isPlayer isn't true for seagulls. So spectator virtual state is now entirely unassociated from objects in the game.
 2015-08-08 12:33:34 +01:00
Glowbal
13f7d0f632 Merge pull request #2003 from jokoho48/codeCleanupWeaponselect 
Code cleanup Weaponselect module
 2015-08-08 13:32:45 +02:00
Glowbal
872c257901 Used the wrong string macro. 2015-08-08 13:21:13 +02:00
Glowbal
25597704ed Added fail save for incorrect string value input 2015-08-08 13:07:40 +02:00
Glowbal
e7a607ca35 Finalized server export category select 2015-08-08 13:07:22 +02:00
jonpas
12399db0ac Merge branch 'master' into slideshowFixes 
Conflicts:
	addons/slideshow/functions/fnc_createSlideshow.sqf
 2015-08-08 13:00:11 +02:00
Glowbal
c6af8aaeb6 Localized category name for interaction menu related settings 2015-08-08 11:52:53 +02:00
Glowbal
e9151d921c Localized category names for medical settings 2015-08-08 11:52:37 +02:00
Glowbal
0601aa80bb Localized All categories string 
Enabled categories for config export menu
 2015-08-08 11:52:23 +02:00
Glowbal
38b9fdab4d fixes #1948 2015-08-08 11:51:31 +02:00
Michael Braun
2b56b919db Fixed missing private in Switchunits 2015-08-08 11:28:08 +02:00
Michael Braun
680bbebc02 Fixed missing private in scopes 2015-08-08 11:25:45 +02:00
Glowbal
b798058ef8 Merge pull request #2032 from acemod/unloadVehicleBug 
isTouchingGround is unreliable for ground vehicles
 2015-08-08 11:04:09 +02:00
Glowbal
831af1bbf8 Merge pull request #2043 from MikeMatrix/keybindCategoryLocalization 
Added localizations for keybinding categories
 2015-08-08 10:59:34 +02:00
Glowbal
7c24d9dbad Merge pull request #2057 from jonpas/sittingFixes 
Sitting Fixes
 2015-08-08 10:58:47 +02:00
Glowbal
2951c9a965 Merge pull request #2046 from MikeMatrix/codeCleanupTripod 
Code cleanup in Tripod module
 2015-08-08 10:58:01 +02:00
Glowbal
02bffce4c4 Merge pull request #2047 from MikeMatrix/codeCleanupTacticalladder 
Code cleanup in Tacticalladder module
 2015-08-08 10:57:13 +02:00
Glowbal
df0e13b21c Merge pull request #2050 from MikeMatrix/codeCleanupSpottingscope 
Cleanup code of Spottingscope module
 2015-08-08 10:52:50 +02:00
Glowbal
6b256a604c Merge pull request #2051 from MikeMatrix/codeCleanupSlideshow 
Code cleanup of Slideshow module
 2015-08-08 10:52:08 +02:00
Michael Braun
940cd8e921 Small documentation correction in sandbag module 2015-08-08 02:28:27 +02:00
jonpas
52ac13273c Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting 2015-08-08 02:13:14 +02:00
Michael Braun
d1a2bec7fd Code cleanup of sandbag module 2015-08-08 02:00:00 +02:00
Michael Braun
8355558db1 Small readability improvement in slideshow 2015-08-08 01:18:48 +02:00
PabstMirror
a3a481f96d Some fixes 2015-08-07 15:08:52 -05:00
jonpas
9e64e8c2aa Increased sitting interaction distance - fixes #1950 2015-08-07 21:41:07 +02:00
Glowbal
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
PabstMirror
a9ed1052dd vehLock - debug trace / type checking 2015-08-07 13:24:47 -05:00
Glowbal
cd5b5f1d24 clean up of the config 2015-08-07 20:15:09 +02:00
PabstMirror
50adc7c096 Merge pull request #2004 from jokoho48/codeCleanupVehiclelock 
Code cleanup Vehiclelock module
 2015-08-07 13:01:56 -05:00
SilentSpike
57bda372f0 Adjust spectator free camera speed with zoom 2015-08-07 19:00:31 +01:00
SilentSpike
c5d9ec5d50 Add speed boost button to spectator free camera 
Sometimes you just want a burst of speed rather than to adjust it and then adjust it back. Also swapped the speed/zoom scrolling modifier around.
 2015-08-07 18:59:48 +01:00
jonpas
256536467b Fixed no interaction menu support condition 2015-08-07 19:36:10 +02:00
Glowbal
f21023b4ee Added logs for quick view and activity view separate from the activity log for medical menu 2015-08-07 19:11:57 +02:00
Glowbal
d7db2e159c Split up into activity and quick view logs 2015-08-07 19:11:27 +02:00
Glowbal
471e8d27df Fixed clean up 2015-08-07 19:11:10 +02:00
Michael Braun
fb32bbf8de Code cleanup of scopes module 2015-08-07 16:43:06 +02:00
SilentSpike
1c79c8fa45 Update spectator UI styling 
Adds a title to the unit tree to match the help list and enters the title text.
 2015-08-07 15:15:04 +01:00
Glowbal
f21da3ead6 Merge pull request #2026 from acemod/cleanBandages 
Clean bandages if no damage on hitpoint
 2015-08-07 15:46:44 +02:00
Michael Braun
1cec4400b3 Missing count replacement in slideshow module 2015-08-07 15:44:41 +02:00
Michael Braun
d192f7eea4 Added parentheses back 2015-08-07 15:35:52 +02:00
Michael Braun
b2e7cf04c0 Fixed function argument documentation in slideshow 2015-08-07 15:19:59 +02:00
Michael Braun
60e4c2e601 Code cleanup of sitting module 2015-08-07 15:12:24 +02:00
Glowbal
27ec3adeac Added stringtable entries requireSurrender setting 2015-08-07 14:51:56 +02:00
Glowbal
997ac53c11 Added isSurrendering check 2015-08-07 14:49:01 +02:00
Glowbal
4c935bb504 Added setting for require surrender 2015-08-07 14:46:28 +02:00
SilentSpike
702e50b731 Improve spectator UI respawn counter blending 
When the BI respawn counter is blended with the spectator UI its colours are also updated to match
 2015-08-07 12:30:50 +01:00
SilentSpike
f143db7fc0 Draw player names on spectator map 2015-08-07 12:20:39 +01:00
Michael Braun
7839224aa2 Added Polish Keybind Category translations thanks to @gienkov 2015-08-07 13:01:36 +02:00
Michael Braun
da97472600 Added ace specific logging methods 2015-08-07 12:56:10 +02:00
Michael Braun
fa56196fe3 Code cleanup of slideshow module 2015-08-07 12:11:34 +02:00
Michael Braun
2f5f282431 Cleanup code of Spottingscope module 2015-08-07 11:47:23 +02:00
Michael Braun
a330e7b0c5 Code cleanup of Switchunits module 2015-08-07 09:18:42 +02:00
Michael Braun
0fafe27da9 Code cleanup in Tacticalladder module 2015-08-07 08:19:15 +02:00
Michael Braun
ef01660ab3 Code cleanup in Tripod module 2015-08-07 08:07:10 +02:00
Michael Braun
c6cb18749d Fixed translation typo 2015-08-07 05:51:26 +02:00
Michael Braun
d9eb7a3d2c Added localizations for keybinding categories 2015-08-07 05:48:51 +02:00
Michael Braun
5f313c75d5 Cleanup of medical_menu 2015-08-07 05:37:41 +02:00
SilentSpike
485f9438bb Change spectator UI toggle to include help window 
With new layout of help window the toggle UX also changes. User expects help window to toggle as part of overall UI.
 2015-08-07 01:51:46 +01:00
SilentSpike
043c5c47c5 Improve spectator help window layout 
Having the help window in the centre of the screen blocked too much of the users view and also clashed with the MPTable element (the table that appears on death, aka "respawnDialog"). It was moved to the right of the screen and now mirrors the unit list. To save screen space, the action keys are given as tooltips for the listbox entries so users must mouse over for more info.
 2015-08-07 01:44:32 +01:00
SilentSpike
f59536b5a3 Remove legacy spectator settings module argument 2015-08-07 00:28:54 +01:00
SilentSpike
4c9b6e94cf Overhaul and improve spectator unit tree UX 
The old method of refreshing the tree on each update would reset all expanded/collapsed nodes. Now the code will cull any units/groups/sides no longer spectatable from the list and cache the ones that are still valid. The cached data is then used to populate the list with new units.

Add coloured unit icons beside units in the list for quick user reference of side and type.

Store group netIDs in respective nodes for possible use in code.
 2015-08-07 00:06:22 +01:00
jonpas
8b802006a4 Moved no interaction menu support inside the function, made code run selectively on server/clients, fixes #2037, closes #1945 2015-08-07 00:32:12 +02:00
Glowbal
abaf43be11 Selection restrictions 2015-08-07 00:09:40 +02:00
Glowbal
9b380315e5 First working version of the medical menu 2015-08-06 23:51:17 +02:00
Glowbal
5ac2972573 Added local event upon successful treatment. 2015-08-06 23:50:44 +02:00
Glowbal
4b5632a8f6 Added categories and missing displayName entries 2015-08-06 23:50:23 +02:00
jonpas
2e386038b7 Added support without ace_intract_menu 2015-08-06 23:43:18 +02:00
PabstMirror
016f45f0e8 fix speling 2015-08-06 15:41:24 -05:00
PabstMirror
598c1766d8 Merge pull request #2017 from jokoho48/codeCleanupCaptives 
Code cleanup of the Captives module.
 2015-08-06 14:02:50 -05:00
PabstMirror
7ef13cd546 Merge pull request #2009 from jokoho48/codeCleanupVehicle 
Code cleanup Vehicle module
 2015-08-06 13:24:35 -05:00
PabstMirror
f1d44972c9 Attach fix and param trace 2015-08-06 13:17:59 -05:00
PabstMirror
b5a6e1e883 Merge pull request #2013 from jokoho48/codeCleanupAttach 
Code cleanup of the Attach module.
 2015-08-06 12:50:43 -05:00
PabstMirror
6086553fce Move DoNotForce to common 2015-08-06 12:24:56 -05:00
PabstMirror
d8c36663da #2033 - MapTools work on children of itemMap 2015-08-06 12:14:45 -05:00
SilentSpike
bcb21b782e Overhaul spectator icon handling and rendering 
- Optimize and improve 3D icon drawing
- Combine 2D and 3D PFHs into 1
- Render group icons outside of 200m, unit icons within
- Store list of groups on units update to cut down on what needs to be done each frame
- Change map control type to 100 to remove all default unit icons
- Improve colour caching, group colours don't change, unit colours do
- Remove icon setting, toggling should be at users discretion
 2015-08-06 16:03:32 +01:00
jokoho48
87b9b5019c AB Performance Optimization (Part 8) 2015-08-06 13:35:55 +02:00
SilentSpike
92ef0bfe99 Whitelist spectator free camera boom keys 
Now that booming the free camera is influenced by the camera speed, the keys should be whitelisted from the held-key prevention system to allow the speed to be adjusted on the move. Also includes a failed attempt to fix the free camera map teleporting functionality.
 2015-08-06 11:39:32 +01:00
jokoho48
15a1a0d535 AB Performance Optimization (Part 7) 2015-08-06 10:58:07 +02:00
PabstMirror
e45bd43e5e CreateLitter / syncEvents performance fixes 2015-08-06 00:28:43 -05:00
SilentSpike
d6cc14a39d Add zeus support to spectator UI 
Can only use zeus while alive, so it won't work using the respawn template. However it's useful for communities usign custom frameworks
 2015-08-06 00:53:49 +01:00
SilentSpike
d1975a593d Improve spectator pause menu emulation 
Makes the fake pause menu closer to the real thing for UX purposes
 2015-08-06 00:53:48 +01:00
PabstMirror
0bd1e1afce #2024 - EnableTeamManagement setting for joinGroup 2015-08-05 18:02:57 -05:00
Michael Braun
d16a33bee4 Fixed issue with params being incorrectly being parsed in Weaponselect 2015-08-06 00:36:28 +02:00
PabstMirror
6ab72e905c #1807 - Clean bandages if no damage on hitpoint 2015-08-05 17:32:00 -05:00
SilentSpike
c808021c7c Tweak spectator interface layout 
- Swap the FOV and vision mode tools into a more logical order.
- Shorten the unit list to prevent overlay with main UI
- Fix name tool on dead units
 2015-08-05 21:11:39 +01:00
SilentSpike
42b5abae11 Add support for respawn counter to spectator UI 
Rather than hiding the BI respawn counter, it should be "integrated" into the UI via code if present.
 2015-08-05 20:35:48 +01:00
ViperMaul
d3d3ea756d isTouchingGround is unreliable for ground vehicles 
#2020
 2015-08-05 11:48:04 -07:00
PabstMirror
7203bb2a3d Cleanup Debug, Limit Satchel Mass 2015-08-05 12:22:43 -05:00
PabstMirror
a6292db1e8 #2018 - Dead Mans Switch / unconscious 2015-08-05 11:54:45 -05:00
jokoho48
0ab865171d AB Performance Optimization (Part 6) 
Add some todo comments
 2015-08-05 18:50:37 +02:00
PabstMirror
72273c5ad0 Merge branch 'master' into virtualExplosivesPlace 2015-08-05 11:36:58 -05:00
jokoho48
c4e4f184ff AB Performance Optimization (Part 5) 2015-08-05 18:33:28 +02:00
SilentSpike
5200fd6a02 Add new option to spectator unit filter setting 
Adds an option to use playableUnits for scenarios where AI playable units are enabled.
 2015-08-05 14:55:02 +01:00
SilentSpike
07e09b60fa Stop spectator camera unit changing on corpses 
Previously the camera would be automatically moved away from corpses (when the unit currently being watched dies). This changes it to stay on them until the view is manually switched as users might want to stick around and watch whatever was going on at the time of death.
 2015-08-05 14:55:02 +01:00
Grzegorz
fb072811fc Proper PL concertina wire translation 2015-08-05 14:49:20 +02:00
SilentSpike
d2f7913c9f Merge pull request #2005 from jokoho48/codeCleanupZeus 
Code cleanup Zeus module
 2015-08-05 12:38:02 +01:00
Michael Braun
9eb560ff3d AB Performance Optimization (Part 4) 2015-08-05 10:28:02 +02:00
Michael Braun
8fbcdfec5a Fixed missing bracket and parameter list issue in AB 2015-08-05 10:04:24 +02:00
Michael Braun
1b488a17b5 Fixed typo that slipped into the code 2015-08-05 08:36:01 +02:00
ViperMaul
78d4da85cd Updated version to 3.2.2 2015-08-04 21:36:03 -07:00
Michael Braun
441baf3f86 Fixed documentation typo in Vehicles module 2015-08-05 06:02:21 +02:00
Michael Braun
eca7f83cca AB Performance Optimization (Part 3) 2015-08-05 06:01:38 +02:00
Michael Braun
b8f1fa82ae AB Performance Optimization (Part 2) 2015-08-05 05:19:08 +02:00
Michael Braun
f6bc361734 Minimal performance improvement and fixed missing semicolon 2015-08-05 05:04:34 +02:00
Michael Braun
6b58b0b3bd AB Performance Optimization and documentation cleanup 2015-08-05 05:01:30 +02:00
jokoho48
c7e104437f Update Docu Comments in AB 2015-08-05 04:38:04 +02:00
jokoho48
12aa0b5584 revert Merge Issue 2015-08-05 04:27:11 +02:00
jokoho48
d95bc3c299 AB Performance Optimization (Part 1) 2015-08-05 04:13:36 +02:00
jokoho48
3a2963c252 Fixed mission semicolon 2015-08-05 02:09:51 +02:00
Michael Braun
83e13e3cd3 Fixed non-private function and slightly improved performance 2015-08-05 01:53:11 +02:00
jokoho48
24dd320c3c Updated parameterization in Captives module. 2015-08-05 01:15:20 +02:00
jokoho48
469445a030 Updated parameterization in Ballistics module. 2015-08-05 01:14:03 +02:00
jokoho48
57d484d382 Updated parameterization in Backpack module. 2015-08-05 01:12:55 +02:00
jokoho48
3ea545782f Updated parameterization in Attach module. 2015-08-05 00:47:31 +02:00
Michael Braun
77e62946ae Updated parameterization in Interact_menu module. 2015-08-05 00:47:18 +02:00
jokoho48
7a0a1ead6e Updated parameterization in Advanced Ballistics module. 2015-08-05 00:32:48 +02:00
SilentSpike
1b12d37284 Replace spectator respawn changes with a template 
Hacking the BI respawn framework to support a spectator setting was intrusive and limiting. Instead of using a setting, I've opted to introduce a new respawn template that can be used within BI's respawn framework. The benefits of this approach are:
- Compatibility isn't a concern, that responsibility is shifted onto mission designers.
- Mission designers can use the functionality of the BI framework alongside the spectator system (combining templates, using different templates for different sides, etc.).
- If a custom respawn framework is used, then this doesn't change anything. Custom frameworks are still fully supported via the public functions provided.
- Remains simple to set up, just requires a description.ext edit
 2015-08-04 23:21:10 +01:00
Michael Braun
1b7f7534da Small correction 2015-08-05 00:16:23 +02:00
Michael Braun
95f055f5a4 Small correction 2015-08-05 00:14:50 +02:00
Michael Braun
820d1c50a5 Small correction 2015-08-05 00:13:50 +02:00
Michael Braun
13b7e7ae72 Updated parameterization in Zeus module. 2015-08-05 00:10:54 +02:00
Michael Braun
b1f9e17ab0 Updated parameterization in Weather module. 2015-08-05 00:03:15 +02:00
Michael Braun
f5a497332a Updated parameterization in Winddeflection module. 2015-08-04 23:52:16 +02:00
Michael Braun
d51d87ba2c Updated parameterization in Weaponselect module. 2015-08-04 23:35:47 +02:00
Michael Braun
ade6c99dac Updated parameterization in Viewdistance module. 2015-08-04 23:33:03 +02:00
Michael Braun
84be21c64e Updated parameterization in Vehicle module. 2015-08-04 23:30:51 +02:00
Michael Braun
2423798753 Updated parameterization in Vehiclelock module. 2015-08-04 23:18:29 +02:00
SilentSpike
7e9500f2ca Enable ace_spectator respawn framework integration 
Seamlessly integrates the spectator system with the vanilla respawn framework when the onDeath setting is enabled. This commit makes a lot of changes:
- Edit BI functions used by the vanilla respawn framework to enable support for ace_spectator.
- Set spectator state is now tracked using a GVAR for the local player since using a unit won't be reliable all of the time. However unit is still marked for any filtering purposes.
- Instead of NV being used based on the sun to moon transition state by default, that functionality only takes place in the integrated system so that custom frameworks can do what they want.
- Seagull units are hidden when using framework integration since they're spawned by the engine with respawn type 1 and they just hang around undesirably
 2015-08-04 22:03:46 +01:00
Glowbal
275b0c4300 Merge branch 'release' 
Conflicts:
	README.md
	addons/finger/stringtable.xml
 2015-08-04 22:29:05 +02:00
Glowbal
43f8c87387 Merge pull request #1972 from jokoho48/MedicalModelUpdate 
Medical Litter model update
 2015-08-04 20:06:51 +02:00
ViperMaul
8ac98ed950 Better immersion through using hideUnit 2015-08-04 07:43:42 -07:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
710135ae3f Opps 2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53 #1866 - Restore weapon mode after treatment 2015-08-03 19:57:49 -05:00
PabstMirror
52130d5a45 Switch to some already translated CSTRINGs 2015-08-03 15:52:35 -05:00
PabstMirror
98649e2bdf Additional output to dumpPerformanceCounters 
For `[] call ace_common_fnc_dumpPerformanceCounters`   Requires `#define
ENABLE_PERFORMANCE_COUNTERS`
 2015-08-03 13:53:44 -05:00
SilentSpike
5bfa4e5971 Improve spectator camera vision mode on start 
The spectator camera should start in night vision mode if the sun to moon transition state is appropriate
 2015-08-03 15:18:09 +01:00
SilentSpike
17e6aca0c8 Fix ace_map changes to compass display object 
1. RscDisplayDiary doesn't even have a compass object that needs to be changed
2. The briefing displays (RscDisplayGetReady, RscDisplayClientGetReady, RscDisplayServerGetReady) were all inheriting from base class RscDisplayMainMap and re-defined the compass object subclasses was overriding that subclass inheritance chain (producing missing idc errors in the .rpt).
 2015-08-03 13:30:08 +01:00
SilentSpike
f5e7185aec Fix spectator camera exiting mechanism 
When using ACE_Player the camera would return to the dead body. It makes sense to simply pass the reset unit by reference to the camera exit code.
 2015-08-03 13:04:36 +01:00
SilentSpike
98b088f26f Fix pre-spectator position saving 
When staging a spectator (physically applying the spectator state) the unit position is saved for potential later restoration. This shouldn't be done multiple times since the function can be called again to reset staged units.
 2015-08-03 00:24:36 +01:00
SilentSpike
b87b4ea16a Improve spectator GUI reopening prevention 
Using boolean instead of simply checking for the display. Checking for diplay was unreliable since it can be technically closed while theoretically open during the escape menu and such.
 2015-08-03 00:22:50 +01:00
PabstMirror
93d2035fed #1984 - Always make sure ACE_MainActions exists 
Also add debuging output when adding action with no parent
 2015-08-02 15:33:16 -05:00
ViperMaul
59a3e62d69 Attempt to improve the immersion of the magic 2015-08-02 10:44:49 -07:00
PabstMirror
f99e8ba5bc Don't allow forcing the tinnitus effect 2015-08-02 12:30:35 -05:00
PabstMirror
c0fb2e1b65 Add Ear Ringing setting to module (Ref #1981) 2015-08-02 12:15:26 -05:00
SilentSpike
9b764bbba4 Preserve Polish translations from master branch 
Since spectator was pushed back to a feature branch from the release branch these translations from a PR were also lost (as the commits were prior to the removal commit) when it was merged after the fact.
 2015-08-02 17:27:32 +01:00
SilentSpike
52460182c9 Enable spectator on death system 
New spectator on death system should enter spectator mode upon dying and exit upon respawning. Only virtual spectator state is suitable for this system since the body should remain as is.
 2015-08-02 16:42:24 +01:00
KoffeinFlummi
261cd42202 Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge 2015-08-02 17:14:41 +02:00
KoffeinFlummi
8f848947ac Merge https://github.com/Clon1998/ACE3 into german-merge 2015-08-02 17:11:06 +02:00
Glowbal
4dfef8025b Medical menu port from CSE 2015-08-02 16:56:27 +02:00
SilentSpike
63c034e348 Differentiate between staged and set spectators 
Existing variable "ace_spectator_isSpectator" split into counterparts "ace_spectator_isSet" and "ace_spectator_isStaged" in order to better manage spectator events
 2015-08-02 12:51:42 +01:00
SilentSpike
38e08d513a Clear spectator display variable at preInit 
uiNamespace persists between missions and should be reset on mission start
 2015-08-02 12:34:35 +01:00
PabstMirror
eb5ac22b8d Cleanup 2015-08-02 01:05:28 -05:00
Michael Braun
f3e8a8ae42 Updated wind indicator to use head direction instead of player direction. Fixes #1892. 2015-08-02 03:29:53 +02:00
ViperMaul
876a039e36 Disable headbugfix for Handcuffed/Surrender,unconscious,water surface and log the situation locally and on server. 2015-08-01 18:01:35 -07:00
PabstMirror
5bcc867bac #1785 - Handle option for all "deploy" actions 2015-08-01 18:26:38 -05:00
PabstMirror
c5a371e9b6 #1965 - Mouse cooldown for click to interact option 2015-08-01 15:07:09 -05:00
jokoho48
d0d585d0f5 Fix that Parachute can get in Arsenal or in Crate 2015-08-01 20:47:40 +02:00
SilentSpike
612aa2d679 Separate spectator physical and virtual states 
With the changes planned to allow spectator in the true death state, physical changes aren't applicable in all of the possible usage cases. This separates the physical process into new function ace_spectator_fnc_stageSpectator
 2015-08-01 18:10:11 +01:00
Glowbal
19a4f3fbb1 Merge pull request #1954 from acemod/improve-adv-med-pain 
Improvement for handling minor levels of pain in advanced medical
 2015-08-01 19:05:47 +02:00
jokoho48
ee11622cd5 Fix Position 2015-08-01 16:10:08 +02:00
jokoho48
9d8daf84a4 add New Medical Models 2015-08-01 15:46:25 +02:00
Harakhti
861119f22f Sync rephrasing with upstream 
The humor wilts quickly.
 2015-08-01 14:54:29 +02:00
SilentSpike
f6d8625fcb Transfer zeus module fixes from master into hotfix 2015-08-01 12:55:33 +01:00
Glowbal
02cfbeda8c Updated version to 3.2.1 2015-08-01 12:10:42 +02:00
Glowbal
b33d377b9d Merge pull request #1940 from acemod/fixRemoveAction 
#1939 - Fix Remove Action From Class
 2015-08-01 11:54:41 +02:00
PabstMirror
6ea1b95179 #1939 - Fix Remove Action From Class 2015-08-01 11:53:49 +02:00
bux578
1ad1a4b561 rename fingering to pointing 2015-08-01 11:49:28 +02:00
PabstMirror
fb34efdd04 Cleanup stringtable phrasing 2015-08-01 11:48:41 +02:00
Glowbal
a2eeff53a8 Merge pull request #1960 from acemod/laserHandleWeirdData 
Laser - Handle Bad Data Returns
 2015-08-01 11:41:04 +02:00
Glowbal
1878d448ae Merge pull request #1968 from acemod/fixBftModule321 
Fix BFT Module / Settings (for 3.2.1)
 2015-08-01 11:39:01 +02:00
PabstMirror
efb1f356db Cleanup stringtable phrasing 2015-08-01 01:30:54 -05:00
PabstMirror
2d051188a7 #1957 - Fix BFT Module / Settings (for 3.2.1) 2015-08-01 00:01:33 -05:00
PabstMirror
1d82a3c193 #1962 - Fix Changes in Wind Deflection s in AB 2015-07-31 23:39:05 -05:00
SilentSpike
777d8f6d43 Merge branch 'master' into spectator 
Restores spectator that was removed from release branch
 2015-07-31 23:35:45 +01:00
SilentSpike
33314f8a9e Adjust spectator camera boom speed 
Vertical camera movement (boom) was previously at a constant speed. However this felt too slow at times, half the horizontal (dolly) speed should improve this.
 2015-07-31 23:32:25 +01:00
SilentSpike
e147138274 Update setUnconscious module with to be indefinite 
The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)
 2015-07-31 17:32:13 +01:00
PabstMirror
822115214f Laser - Handle Bad Data Returns 2015-07-31 03:06:27 -05:00
SzwedzikPL
eb6abd69b8 default laser code down keybind fix 2015-07-30 22:37:08 +02:00
Glowbal
ca2a16af02 fix #1946 2015-07-30 18:21:24 +02:00
Glowbal
a4d5d9cb27 Possible improvement for handling minor levels of pain in advanced medical 2015-07-30 17:43:52 +02:00
Harakhti
b2aa5eee45 Row 3 
BINGO FUEL
 2015-07-30 16:28:50 +02:00
Harakhti
2b23958fd1 Row 2 
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
 2015-07-30 16:06:32 +02:00
Harakhti
d0f91c5ebf Row 1 
Not a miracle, but it's something.
 2015-07-30 14:40:51 +02:00
SilentSpike
67e5e31394 Change zeus modules to run globally 
Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.
 2015-07-29 12:25:04 +01:00
PabstMirror
6f90185f18 #1939 - Fix Remove Action From Class 2015-07-28 17:26:23 -05:00
ViperMaul
63dd19825b moveInAny seems to work better than moveInDriver. WIP 2015-07-28 13:56:22 -07:00
PabstMirror
214fda074a Merge branch 'master' into virtualExplosivesPlace 2015-07-28 15:48:37 -05:00
PabstMirror
bfd3aa71c4 Manual Fix #1931 2015-07-28 15:25:52 -05:00
ViperMaul
626a9cf5f9 Disable headBugFix if unconscious 2015-07-28 13:06:58 -07:00
SilentSpike
16597515f0 Adding remaining missing English straings 2015-07-28 20:55:22 +01:00
PabstMirror
9b551e3fdf #1931 - Fix Explosives Module Strings 2015-07-28 14:42:23 -05:00
Glowbal
6289601b4e Merge pull request #1935 from jokoho48/ParachuteFix 
change form addBackpack to addBackpackGlobal
 2015-07-28 20:11:42 +02:00
Glowbal
7a65af4926 Merge pull request #1928 from acemod/headbugfix 
Headbugfix
 2015-07-28 20:10:51 +02:00
Joko
46531b916a change form addBackpack to addBackpackGlobal 2015-07-28 20:08:38 +02:00
Joko
baa1aab257 Fix Spelling 2015-07-28 19:24:34 +02:00
Joko
b2eeaacfc1 Fix Double Config Entry 2015-07-28 18:51:17 +02:00
Joko
55cac4b6d9 posible fix for #1932 2015-07-28 18:36:13 +02:00
ViperMaul
92940ea1a9 Removed improper translations 
#1738
 2015-07-28 15:17:22 +01:00
ViperMaul
675996d67b Adding HeadBugFix button to the ACE Options dialog (missing file) 
#1738
 2015-07-28 15:17:20 +01:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
SilentSpike
c73eef28ed Pushing back ace_spectator to feature branch 2015-07-27 21:25:39 +01:00
Glowbal
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
SilentSpike
47d96835c6 Fix arrayIntersect oversight 2015-07-27 18:32:21 +01:00
Grzegorz
d23cab06aa + and - 2015-07-27 13:20:07 +02:00
PabstMirror
ceb12662e0 Version To 3.2.0 2015-07-27 02:05:58 -05:00
ViperMaul
4f53bdefb9 Suppress debug in fnc_unloadPersonLocal.sqf 2015-07-26 23:54:42 -07:00
ViperMaul
9a98530392 Add support for loading unconscious into boats, refs #1729 2015-07-26 18:33:25 -07:00
ViperMaul
6142d99626 Add support for loading unconscious into co-pilot seat 
fixes #1727
 2015-07-26 18:20:36 -07:00
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
Jonathan Pereira
5609ec7b6b Added PT-BR translations 
New PT-BR translations, including the slideshow and spectator module.
 2015-07-25 12:56:50 -03: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
PabstMirror
9f078d405b Tweak Place when Prone 2015-07-25 02:10:33 -05:00
PabstMirror
bff629be9c Fix PositionAsl / Update mouse hints 2015-07-25 01:42:17 -05: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
PabstMirror
bc953b32bc More Stuff 2015-07-18 00:36:47 -05:00
SzwedzikPL
d60d5fe1f3 disable a10 tracers, commanche tracers only nvg 2015-07-18 06:47:13 +02: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
Joko
41edf3dd38 Rework after Comments form esteldunedain 2015-07-17 21:26:18 +02: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
PabstMirror
df90c4b88e More Attach Stuff 2015-07-16 23:59:31 -05: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
PabstMirror
1f4488253d Only attach some triggers 2015-07-15 23:52:47 -05: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
PabstMirror
7cc2628c53 Stuff 2015-07-15 03:18:19 -05:00
PabstMirror
104d1a1cc7 Attaching (Rotate to verticle) 2015-07-15 02:54:38 -05: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
6130b5b373 Working Demo 2015-07-14 00:24:55 -05: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
Joko
83e74d848d fix that cachedOverPressureValue is called Multible per Weapon 2015-07-11 00:50:12 +02:00
Joko
9bb9df59ec Add caching for Backblast 2015-07-11 00:09:20 +02: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
Joko
8cd8504b3f Add Posibility to Change Backblast Values in Magazine Config 2015-07-10 22:30:07 +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
Glowbal
e9d51aa57b Updated repair config 2015-07-05 10:31:12 +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
SilentSpike
ad30b28f34 Improved death handling 2015-07-05 01:29:14 +01:00
SilentSpike
bedde2197b Only cache info on death if not a spectator 2015-07-05 01:12:16 +01:00
SilentSpike
950aec38b7 Fixed macro 2015-07-05 01:04:07 +01:00
SilentSpike
01a5ab619e handleKilled and handleRespawn 2015-07-05 00:49:47 +01:00
SilentSpike
6596bbdb0a Coding standards 2015-07-05 00:17:15 +01:00
SilentSpike
83e5309654 Updated side GVAR 2015-07-05 00:11:38 +01:00
SilentSpike
27610b78e1 Blank space cleanup 2015-07-05 00:10:01 +01:00
SilentSpike
5e7c094c98 Cache details on respawn (not at postInit) 2015-07-05 00:09:43 +01: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
SilentSpike
c09314027f "isNotSpectator" canInteractWith condition 2015-07-04 19:41:18 +01: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
975bc229c6 Merge branch 'master' into ace_spectator 
Conflicts:
	addons/spectator/stringtable.xml
 2015-07-04 18:53:20 +01: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
Clon1998
08fecbf1f3 Fixed german translation 2015-07-04 14:30:42 +02:00
Clon1998
93871c4675 Added german translation 2015-07-04 10:01:58 +02:00
voiper
981c961ce1 -Switched to CBA keybinds. 
-Localized keybinds.
-Removed fnc_cameraIntro.sqf; superfluous.
-Various code clean ups.
-Changed: Condition for mission end now checks allUnits (todo: change to allPlayers when available).
 2015-07-04 01:00:27 -07:00
Clon1998
c61a0f03cd Fixed german translation. 
Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description
 2015-07-04 09:43:42 +02:00
PabstMirror
ab2ebf5fcf MissleGuidance - Move PARAMS up to top 2015-07-03 21:06:13 -05:00
voiper
d4b5f88a76 Last remnants of view distance. 2015-07-03 15:00:00 -07: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
071a673f28 Implemented repair action framework 
copied across treatment framework from medical and adjusted it to suit the repair actions
 2015-07-03 23:14:23 +02:00
Glowbal
0bf56d64bd Readding file that git removed 2015-07-03 22:31:30 +02:00
Glowbal
1ad2a5cdf1 Merge branch 'master' into repair 
Conflicts:
	addons/interaction/CfgVehicles.hpp
 2015-07-03 22:29:29 +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
voiper
206a976013 Merge branch 'ace_spectator' into ace_spectator_dev 
Conflicts:
	addons/spectator/functions/fnc_camera.sqf
 2015-07-03 12:59:47 -07:00
Glowbal
07303633e4 Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing 
Fix vanilla damage effects
 2015-07-03 21:41:26 +02:00
voiper
81889aef2d Viewdistance dialogue remove. 2015-07-03 12:23:49 -07:00
voiper
56aa87ce8b Removed view distance changing. 2015-07-03 12:14:41 -07:00
SilentSpike
a23f401695 Removing all references to penPos 2015-07-03 19:07:10 +01:00
SilentSpike
58b1c0f3a9 Solve crashing caused by off map position and disableSimulation to stop underwater issues 2015-07-03 18:44:40 +01: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
ff4fce3950 Initial enter/exit function implementation 2015-07-03 02:16:23 +01:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
SilentSpike
91ca532496 Preserve equipment, added comments 2015-07-02 23:43:33 +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
SilentSpike
8c98f98472 Fixed end mission code on server 2015-07-02 16:42:40 +01:00
SilentSpike
eeeb543424 Simplified default pen position assignment 2015-07-02 16:30:37 +01:00
SilentSpike
4df1738b43 Don't move respawn markers 
Exit on HC
Only run end mission PFH on server
 2015-07-02 16:23:25 +01:00
SilentSpike
3a4a32382d Removed empty stringtables 2015-07-02 15:56:01 +01: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
PabstMirror
fde8f7383f Map Opened/Closed Events + use in maptools 2015-06-28 13:08:47 -05: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
ViperMaul
7e6be08153 Improved unloading on roof tops 
Less chance of patient being unloaded directly to the ground instead of the roof top where the helo has landed.
Probably not fool proof yet due to randomness. #1728
 2015-06-23 16:11:00 -07:00
SilentSpike
e4f89a96b7 CheckPBO should ensure client isn't running any addons the server isn't 2015-06-23 15:01:55 +01:00
ViperMaul
6b6ad93848 Fix for unable to unload from driver seat. 
Improvement for helo's on roof tops and boats.
#1728
 2015-06-22 19:48:28 -07: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
PabstMirror
6c7ba7b5ae Zeus module on dedicated server 2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0 Connect Zeus module to Frag 2015-06-18 22:13:06 -05:00
PabstMirror
9c0478ddfd Cleanup 2015-06-18 22:04:48 -05:00
PabstMirror
e235ebcc15 Fix frag always killing thrower 2015-06-18 21:48:23 -05: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
Grzegorz
1de569656d Fix checking vitals anim 
It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are:
* Checking pulse
* Checking BP
* Checking response
 2015-06-17 14:58:35 +02: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
PabstMirror
ccb30e0a47 use master pfh for frag 2015-06-16 22:39:37 -05: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
PabstMirror
dff99c4736 Tweak HTML Size 2015-06-13 20:41:57 -05:00
Glowbal
91b54bfc3a Adds a back up function in sqf to assign open wounds. 2015-06-13 23:20:01 +02:00
ViperMaul
4c572ef298 Set version number to 3.1.0 2015-06-13 13:46:24 -07: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
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
PabstMirror
6ab8b129fa Merge branch 'master' into multipleDevices 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-06-13 12:30:35 -05:00
ulteq
badfc4017c Reset 'deaf' on respawn 2015-06-13 19:27:30 +02:00
PabstMirror
e9750ddc9b Merge pull request #1611 from acemod/refineStaticInteration 
Manual MainActions position for some statics weapons
 2015-06-13 12:18:28 -05:00
ulteq
6d6c3a4285 Fixed function header 2015-06-13 19:17:26 +02:00
ulteq
022f9286e2 Fixed a bug in the caching routine 2015-06-13 19:12:24 +02:00
ulteq
3427f655b9 Removed debug output 2015-06-13 19:01:40 +02:00
ulteq
6d4f58c18e weapon magazines caching 2015-06-13 18:57:02 +02:00
ulteq
d9722db15e Abort if distance > 50m 2015-06-13 18:42:09 +02:00
ulteq
2509f1d840 Missing privates 2015-06-13 18:34:30 +02:00
ulteq
b6a710d282 Implemented a proper magazine lookup routine 2015-06-13 18:32:48 +02:00
ulteq
38dca2bb9e New loudness calculation for different ammo types 2015-06-13 18:19:35 +02:00
PabstMirror
2efc095c93 Merge branch 'master' into laserPointerSetting 
Conflicts:
	addons/laserpointer/XEH_postInit.sqf
 2015-06-13 11:02:00 -05:00
ulteq
db68b6c155 Increased loudness of missles and rockets. 2015-06-13 17:43:27 +02:00
Nicolás Badano
b17b44b869 Merge pull request #1601 from acemod/laserpointerCleanup 
Privates, newline braces, typos
 2015-06-13 12:25:21 -03:00
ulteq
feec8a14b7 Removed debug output 2015-06-13 17:23:45 +02:00
ulteq
eacd8e5a49 Removed debug output 2015-06-13 17:22:45 +02:00
ulteq
833634f010 Ported the ACE2 ear ringing logic 2015-06-13 17:16:18 +02:00
Nicolás Badano
c168afe8bb Merge pull request #1598 from acemod/serverModulesFirst 
Fix Server not reading modules
 2015-06-13 12:01:22 -03:00
ViperMaul
cb1d016a39 Merge pull request #1592 from ProfessorCZ/master 
CZ - Translation
 2015-06-13 07:39:18 -07:00
ViperMaul
cbb620ba98 Change setPos to setPosASL to support roof tops and multi-level objects and faster code. 
#1575 and #1577
 2015-06-13 07:24:50 -07:00
gienkov
3d440fc0da PL tactical ladder translation 2015-06-13 14:36:42 +02:00
Glowbal
e0bb3c0a4e Merge pull request #1602 from acemod/medicalFallingFix2 
[Adv. Medical] Improved falling damage
 2015-06-13 13:39:22 +02:00
Glowbal
ce908f0fb3 Merge pull request #1579 from acemod/medicalModuleOptions 
[Adv. Medical]  New module options
 2015-06-13 13:37:02 +02:00
ulteq
1c4566984f Removed debug output 2015-06-13 12:13:58 +02:00
ulteq
84d20f9794 Further improved the handling of falling damage: 
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
 2015-06-13 11:53:30 +02:00
ulteq
234b62b409 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalFallingFix2 2015-06-13 11:12:37 +02:00
ulteq
9b2ebfcbe8 Privates, newline braces, typos 2015-06-13 10:41:19 +02:00
ulteq
6eeeb22fcd Made use of the new stringtable macros 2015-06-13 09:51:49 +02:00
ulteq
b86e6b6043 Merge pull request #1493 from acemod/tacticalladder 
Initial draft of the ACE2 tactical ladder port.
 2015-06-13 09:37:41 +02:00
PabstMirror
45912c6ddb Handcuff icon for passengerActions 2015-06-13 00:12:13 -05:00
PabstMirror
9f15cfb650 Merge branch 'master' into captivesFixes 2015-06-13 00:02:41 -05:00
PabstMirror
58e5bc3581 Switch unload captive to passenger actions 2015-06-13 00:02:30 -05:00
PabstMirror
affe323435 Fix bodybag string macro 2015-06-12 23:19:17 -05:00
PabstMirror
177f590dda Make "InitSettingsFromModules" pfeh run on dedicated 2015-06-12 22:57:01 -05:00
PabstMirror
1804c6ceab Merge branch 'master' into serverModulesFirst 2015-06-12 22:40:04 -05:00
ViperMaul
1c0811aa31 Change from globalEvent to targetEvent 
#1575 and #1577
 2015-06-12 16:56:13 -07:00
ulteq
4160c7668c Workaround to prevent accidentally canceling the ladder deployment 2015-06-13 00:01:48 +02:00
ulteq
8336f1d192 Complete overhaul of the ladder interaction routine 2015-06-12 23:54:51 +02:00
ulteq
9499592322 Cleanup 2015-06-12 22:45:41 +02:00
ulteq
fd40c3a947 New backpack model from raspu: 
* Fixes incorrect positioning
 2015-06-12 22:14:19 +02:00
ulteq
1cbe972999 Merge pull request #1585 from acemod/huntirParachuteSpeed 
HuntIR parachute falling speed experiment
 2015-06-12 21:41:46 +02:00
ulteq
62fc0a90e6 Removed the model.cfg 2015-06-12 21:41:17 +02:00
ulteq
6fe7b15832 Removed debug output 2015-06-12 21:40:44 +02:00
Nicolás Badano
c45b443bbc Merge pull request #1597 from SzwedzikPL/interact_passengers_icons 
slot icons in passengers menu
 2015-06-12 15:38:45 -03:00
SzwedzikPL
ac87a28daa role icon for passengers 2015-06-12 20:32:10 +02:00
ulteq
1393b79a82 Reduced the descending speed of the parachute: 
* Adjusted the geometry LOD mass in the huntir.p3d
* Fixed the calculating of the recording time
 2015-06-12 20:22:09 +02:00
SzwedzikPL
19d3cd168c del extra space 2015-06-12 19:54:45 +02:00
SzwedzikPL
805c0e1c68 Open action for boxes 2015-06-12 19:48:28 +02:00
ulteq
9130546c8c DAGR overlay auto hide 2015-06-12 18:23:01 +02:00
ulteq
4b0c4b9dd6 handleDamage EH for the HuntIR 2015-06-12 18:01:53 +02:00
ProfessorCZ
acc5f4d29f CZ - Translation 2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3 CZ - Translation 
Already in README
 2015-06-12 14:50:50 +02:00
ulteq
604cd122d3 Experiment 2015-06-12 13:54:52 +02:00
ulteq
f84a936d95 Merge pull request #1504 from acemod/concertina_wire 
Ported the ACE2 Concertina Wire
 2015-06-12 13:42:32 +02:00
ulteq
2e0b837190 Merge pull request #1534 from acemod/dagr 
Initial draft of the ACE2 DAGR port
 2015-06-12 13:42:25 +02:00
ulteq
6ac2ca9208 Fixes _projectile not being updated 2015-06-12 11:48:49 +02:00
ulteq
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00
PabstMirror
b960ae5d6b Optional setting to disable laser pointer system 2015-06-12 00:58:04 -05:00
PabstMirror
f48777462f Text Spacing 2015-06-11 23:59:51 -05:00
ViperMaul
072f2cc3a7 fix animation and consistently unload units from vehicle 
#1575 and #1577
 2015-06-11 15:56:11 -07:00
ulteq
99b13a584a PAK treatment time based on total amount of damage. 2015-06-11 22:54:08 +02:00
ulteq
be6d72606a Pain is always suppressed again 2015-06-11 22:35:50 +02:00
jonpas
b974a63947 Lowercased function, comment 2015-06-11 21:51:41 +02:00
ulteq
eff31db128 HuntIR parachute falling speed experiment 2015-06-11 21:50:43 +02:00
ulteq
d8877d0dbd Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder 2015-06-11 21:28:44 +02:00
jonpas
491e2a4429 Handle handcuffing 2015-06-11 20:01:38 +02:00
jonpas
0a71bd6931 Restricted sitting rotation 2015-06-11 19:46:16 +02:00
ulteq
ab85a9ceb6 Merge pull request #1582 from acemod/destroyableHuntIR 
Made the HuntIR camera destroyable:
 2015-06-11 19:40:00 +02:00
ulteq
f7a76480f9 Made the HuntIR camera destroyable: 
* Shooting the parachute will increase its damage
* The falling speed now increases with damage
* Damaged cameras won't be able to transmit video
* The HuntIR spawn positions now really depends on the grenade trajectory
 2015-06-11 19:37:51 +02:00
Nicolás Badano
0981a8dc3e Merge pull request #1581 from acemod/execNextFramePFEH 
One PFEH for execNextFrame and waitAndExec
 2015-06-11 13:53:08 -03:00
ulteq
35e2047dca Fixed two RVMAT files 2015-06-11 17:56:25 +02:00
ulteq
eef7c1295a Added new adv. medical module option 'painIsOnlySuppressed' 2015-06-11 17:36:18 +02:00
jonpas
46020259fd Fixed typo 2015-06-11 16:48:08 +02:00
ulteq
0c40c1b439 Added Adv. Medical module option 'healHitPointAfterAdvBandage': 
* Changed the default value to '0'
 2015-06-11 15:30:39 +02:00
ulteq
5394131fd1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into tacticalladder 2015-06-11 12:44:15 +02:00
ulteq
0ec729ccd8 Allow configuring the DAGR while the map is opened. 2015-06-11 12:43:42 +02:00
ulteq
292e24e414 Merge pull request #1576 from acemod/keybindExceptions 
Allowed using the ATrag, Kestrel and Rangecards inside of vehicles.
 2015-06-11 12:06:01 +02:00
ulteq
ba15db7d6a Allowed using the ATrag, Kestrel and Rangecards inside of vehicles. 2015-06-11 12:05:46 +02:00
ulteq
b3538c972f Finished the DAGR port: 
* Added keybinds
* Shortened the function names
* Made use of the GVAR macro for all global variable names
 2015-06-11 11:56:25 +02:00
Glowbal
9d82b9a1f3 Merge pull request #1550 from acemod/medicalVanillaDamageFix 
Attempt to fix #1465 and #1354
 2015-06-11 10:25:50 +02:00
Glowbal
b6ed944123 Merge pull request #1563 from acemod/medicalCleanup 
Cleanup
 2015-06-11 10:25:28 +02:00
PabstMirror
3e396b416a One PFEH for execNextFrame and waitAndExec 2015-06-11 02:45:42 -05:00
PabstMirror
84a12bcd56 Can't escort when mounted (passenger actions) 2015-06-10 22:44:54 -05:00
ulteq
eb7a38e137 Merge pull request #1567 from acemod/rangecardMenu 
Reordered the rangecard menu entries:
 2015-06-10 22:57:16 +02:00
ulteq
3c753d74ec Reordered the rangecard menu entries: 
* Also added the ability to copy your own rangecards
* Reference: https://github.com/acemod/ACE3/pull/1118
 2015-06-10 22:56:35 +02:00
ulteq
3e25a8b4a9 Finished ACE2 port: 
* The concertina wire can now be placed in the editor
* Added handleDamage EH to avoid wire destruction with bullets/grenades
* Added proper detection routine of what killed the wire
 2015-06-10 22:29:33 +02:00
AKALegman
5431ab5e01 fixed conflicts 2015-06-10 20:03:00 +01:00
ulteq
f0f36ea9b2 Fixed incorrect CSTRING 2015-06-10 18:10:12 +02:00
ulteq
249a55d041 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into dagr 2015-06-10 17:44:01 +02:00
ulteq
8a7d3e9ede handleDamage_advanced cleanup 2015-06-10 17:10:09 +02:00
ulteq
91ce327580 Newline 2015-06-10 17:07:35 +02:00
ulteq
caae62b2af Reverted handleDamage_advanced 2015-06-10 17:07:00 +02:00
ulteq
245151d8c2 Removed spaces 2015-06-10 17:03:09 +02:00
ulteq
1c2c7ef8d7 Fixed empty selectionNames in vehicle crashes 2015-06-10 17:02:14 +02:00
ulteq
9336e7c9e1 [WIP] Various handleDamage_caching fixes 2015-06-10 16:51:46 +02:00
ulteq
772a1e508b Cleanup 2015-06-10 16:07:09 +02:00
ulteq
0661d25ae3 Removed debug output 2015-06-10 16:06:46 +02:00
ulteq
3d744be2a8 Fixes the map grid calculation for negative stepY values: 
* On maps like Utes, Chernarus, ...
 2015-06-10 15:54:50 +02:00
ulteq
d2ad0255e9 Fixed DAGR icon size 2015-06-10 13:48:39 +02:00
ulteq
c617372612 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into concertina_wire 2015-06-10 13:40:34 +02:00
ulteq
0f6c93852c Fixed handling of falling damage 2015-06-10 12:59:55 +02:00
ulteq
8bb3dbbaf6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix 2015-06-10 12:59:11 +02:00
ulteq
7318aae629 Cleanup 2015-06-10 12:47:22 +02:00
Glowbal
efa9cf4709 Fix handleDamage caching return value 
Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.
 2015-06-10 12:21:06 +02:00
PabstMirror
e2890b0699 #1473 - Fix Medical Log Localization 
also swap some common EFUNCs
 2015-06-09 17:30:02 -05:00
ulteq
9d0c034b72 Merge pull request #1556 from acemod/kestrel_rvmat 
Increased specular of the Kestrel texture
 2015-06-09 23:02:23 +02:00
ulteq
b16d341c0d Increased specular of the Kestrel texture 2015-06-09 23:01:48 +02:00
ulteq
2a929c4c6b Replaced all spawn, sleep, and fsm code. 2015-06-09 22:46:04 +02:00
PabstMirror
a48aded5e5 Fix Keybind 2015-06-09 15:02:22 -05:00
PabstMirror
c5c36c42e1 GVAR(enabled) - readme 2015-06-09 14:02:19 -05:00
jonpas
51e83ba0fa Handle kileld and disconnect while sitting 2015-06-09 18:52:12 +02:00
jonpas
5bfa2425bb Git hates me 2015-06-09 18:33:39 +02:00
jonpas
3a4cd99001 Changed setPos to setPosASL for reliability, Fixed module icon name 2015-06-09 18:33:07 +02:00
jonpas
f1f9ee1365 Added module icon, removed comment 2015-06-09 18:27:58 +02:00
jonpas
36d4d01a30 Adjusted Chair (Plastic) sitting position 2015-06-09 16:55:06 +02:00
jonpas
3e0d4d1f7b Fixed Rattan Chair position, doAnimation before moving player 2015-06-09 16:48:58 +02:00
jonpas
3510d43a17 Removed isNotInside from Sandbag, SpottingScope and Tripod placement 2015-06-09 16:20:43 +02:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
jonpas
951f9d32c3 Allow interaction menu while sitting 2015-06-09 16:04:37 +02:00
jonpas
f9d292e9c2 Missing privates 2015-06-09 15:52:41 +02:00
ulteq
d454a2ccfc Attempt to fix #1465 and #1354 2015-06-09 15:46:00 +02:00
PabstMirror
8abd488a43 Read server modules before "SettingsInitialized" on clients 2015-06-09 01:27:59 -05:00
PabstMirror
7cf77de8cf Opps 2015-06-09 00:53:40 -05:00
PabstMirror
5ce7ec48e7 Minor Cleanup 2015-06-09 00:51:48 -05:00
PabstMirror
7d08469df9 Module for setting 2015-06-09 00:00:00 -05:00
PabstMirror
9d914d655a Convert Finger to CBA/ACE format 2015-06-08 20:34:29 -05:00
jonpas
95ec2ea1f9 Added isNotSitting exception, Renamed sitting QGVAR 2015-06-08 23:39:14 +02:00
jonpas
c6b5c705c7 Added Sitting Settings and Module 2015-06-08 23:25:15 +02:00
PabstMirror
b61bd1fb75 1.46 New RscInfoType (fix UBC) 2015-06-08 13:26:18 -05:00
AKALegman
1ae8e29ac2 updated isPlayer v2 2015-06-08 19:12:16 +01:00
Nicolás Badano
1def1ee7e4 Merge pull request #1546 from SilentSpike/zeusUpdate 
Update ace_zeus with 1.46 changes
 2015-06-08 14:44:12 -03:00
SilentSpike
f9d1a39adf Updated edited BI functions with 1.46 changes 2015-06-08 18:18:40 +01:00
jonpas
2104e5b45f Optimized condition functions, Removed redundant toLower for animation names 2015-06-08 17:52:33 +02:00
ulteq
fb76cd730f Proper handling of grid boundaries 2015-06-08 14:32:42 +02:00
ulteq
9fe6f269be More cleanup 2015-06-08 14:31:55 +02:00
SilentSpike
f193204195 Simplify the renderZeus code 2015-06-08 13:12:27 +01:00
SilentSpike
246d303943 menuClosed event before variable clearing 2015-06-08 13:00:03 +01:00
ulteq
264b05e3ec Removed unused privates 2015-06-08 13:42:58 +02:00
ulteq
29c55a5495 Cleanup 2015-06-08 12:57:16 +02:00
Ivan Navarro Cabello
d15bae105d Updated spanish translation 
Updated spanish translation
 2015-06-08 12:43:07 +02:00
AKALegman
96fccbedf9 updated isPlayer 2015-06-08 11:09:49 +01:00
ulteq
47d0d98680 Merge pull request #1537 from gienkov/pl-translation-2 
captives and tripod PL translation
 2015-06-08 00:34:56 +02:00
Glowbal
610f74d9d6 Merge pull request #1523 from AgentRev/onSetDead 
Added "medical_onSetDead" local event in fnc_setDead.sqf
 2015-06-07 23:58:22 +02:00
AgentRev
f7007b4175 Fixed "medical_onSetDead" event 2015-06-07 17:52:42 -04:00
PabstMirror
6b612a9890 Merge pull request #1520 from acemod/hideFakeWeapon 
Hide fake weapon
 2015-06-07 16:37:26 -05:00
jonpas
4cea9bd1bc Added Sitting README.md 2015-06-07 22:38:23 +02:00
jonpas
eb0541d726 Added icons 2015-06-07 22:36:22 +02:00
jonpas
78c9991f68 Added Polish stringtable 2015-06-07 22:25:43 +02:00
PabstMirror
ebc55ca6cd Merge pull request #1542 from TheDrill/master 
Base Finger Port
 2015-06-07 15:04:45 -05:00
jonpas
c3c2fd0074 Initial Sitting commit 2015-06-07 22:00:43 +02:00
PabstMirror
64d529ed3c Merge pull request #1538 from acemod/unHolsterWeapon 
#1208 - Holster key also unholsters
 2015-06-07 14:25:06 -05:00
SilentSpike
cb1b0c6262 Added zeus exception for interaction conditions 2015-06-07 20:21:51 +01:00
PabstMirror
6eb7497cdf #1208 - Holster key also unholsters 2015-06-07 12:59:53 -05:00
PabstMirror
3bf9592a5d Macroize huntIR 2015-06-07 12:39:24 -05:00
PabstMirror
fb9c1e14a3 Merge branch 'master' into allStringtableMacros 
Conflicts:
	addons/kestrel4500/CfgWeapons.hpp
 2015-06-07 12:24:40 -05:00
ulteq
b2221b683f Introduced ACE_Rain 2015-06-07 18:57:16 +02:00
gienkov
ecf7873f33 captives and tripod PL translation 2015-06-07 18:55:49 +02:00
ulteq
be68284911 Fixed a typo 2015-06-07 18:20:14 +02:00
ulteq
39ba85b213 New low-poly Kestrel model 2015-06-07 18:17:09 +02:00
ulteq
eae8c8cae2 Initial draft of the ACE2 DAGR port 2015-06-07 17:53:37 +02:00
ulteq
5b3fd31b1b Merge pull request #1525 from acemod/HuntIR 
ACE2 HuntIR port
 2015-06-07 17:47:27 +02:00
ulteq
b1b8fe3645 Removed debug output 2015-06-07 14:48:46 +02:00
ulteq
cb2b120023 Reduced the max. transmission range 2015-06-07 14:47:56 +02:00
ulteq
618d557227 Layer IDs are now stored in #defines 2015-06-07 13:55:35 +02:00
ulteq
9ce655dcd2 Fixes stuck camera on remote controlled units. 2015-06-07 13:50:38 +02:00
ulteq
9561957fd6 Merge pull request #1245 from acemod/ChatColours 
Chat visibility enhancement
 2015-06-07 13:35:02 +02:00
AKALegman
d3eae58237 Fixed Zeus Unconscious 2015-06-07 12:17:52 +01:00
ulteq
fb1ddb4dd6 Removed HuntIR explosion sound 2015-06-07 12:48:01 +02:00
ulteq
665fa55adf Further reduced the container shell timeToLive value. 2015-06-07 12:12:06 +02:00
ulteq
5e30c88d11 Made use of the += operator 2015-06-07 11:58:56 +02:00
ulteq
9818f65545 Improved HuntIR descriptions 2015-06-07 11:58:34 +02:00
ulteq
0f186154c0 Tabs -> Spaces 2015-06-07 11:44:28 +02:00
ulteq
4339344aee Merge branch 'HuntIR' of https://github.com/KoffeinFlummi/ACE3 into HuntIR 2015-06-07 11:43:42 +02:00
ulteq
48f8730415 Removed dead code 2015-06-07 11:43:32 +02:00
ulteq
66193a8c67 Removed duplicate code 2015-06-07 11:36:58 +02:00
Drill
ac40e7cc59 Change default keybinding from Ctrl-Tilda to Shift-Tilda for 
finger-pointing module
 2015-06-07 12:15:23 +03:00
Drill
96e073e66d Initial commit for finger-pointing module 2015-06-07 12:10:50 +03:00
ulteq
6a792a7a82 Merge pull request #1528 from acemod/rangecardGuiFix 
Barrel length is now displayed in half inch accuracy.
 2015-06-07 10:17:02 +02:00
ulteq
a9b6af38e1 Barrel length is now displayed in half inch accuracy. 2015-06-07 10:16:30 +02:00
PabstMirror
abf2887826 Manual MainActions position for some statics weapons 2015-06-07 00:25:52 -05:00
PabstMirror
0f03bef5f1 Merge pull request #1524 from acemod/handleFiredCleanup 
Removed some dead code
 2015-06-06 23:31:07 -05:00
PabstMirror
24cdf77de0 Move to right side, directly under BIS news 2015-06-06 23:28:52 -05:00
Glowbal
c75ae71adf Merge pull request #1497 from acemod/Fix-PlayFiremodeChangedSound 
Fixed find file extension in playChangefiremode
 2015-06-06 21:39:34 +02:00
KoffeinFlummi
c47e0ce796 Merge https://github.com/ODK-Bn/ACE3 into russian-merge 2015-06-06 21:13:03 +00:00
AKALegman
0e375075ea improved explosives v2.1 2015-06-06 19:04:58 +01:00
AKALegman
46ed9416ed improved explosives v2 2015-06-06 18:58:42 +01:00
SilentSpike
85a281d586 Fixed random missing english string 2015-06-06 17:41:24 +01:00
SilentSpike
822dd11ec6 Moved base ACE_ZeusActions to ace_interaction 2015-06-06 17:33:13 +01:00
SilentSpike
5cc6abd49a Open menu over zeus inerface 2015-06-06 16:20:22 +01:00
ulteq
833335ddb9 Call setRain each frame 2015-06-06 14:16:05 +02:00
ulteq
a870d5d760 ACE2 HuntIR port 2015-06-06 14:13:34 +02:00
AKALegman
f9a7ab5ae0 improved explosives 2015-06-06 10:11:00 +01:00
ulteq
cfc23fe3e7 Removed some dead code 2015-06-06 10:01:30 +02:00
PabstMirror
732dbd315a Tripod - use addToInventory 2015-06-05 21:13:33 -05:00
AgentRev
4a416a12a2 Added "medical_onSetDead" local event in fnc_setDead.sqf 2015-06-05 22:03:27 -04:00
PabstMirror
32ce0aa6fd Macroize all stringtables 2015-06-05 21:02:24 -05:00
PabstMirror
560609fbed Cleanup 2015-06-05 19:46:19 -05:00
PabstMirror
470492759c Merge branch 'master' into multipleDevices 
Conflicts:
	addons/atragmx/initKeybinds.sqf
	addons/common/XEH_postInit.sqf
	addons/kestrel4500/CfgVehicles.hpp
	addons/kestrel4500/initKeybinds.sqf
	addons/microdagr/CfgVehicles.hpp
	addons/microdagr/XEH_clientInit.sqf
 2015-06-05 17:50:04 -05:00
PabstMirror
a0f4ea4e93 Resize, User Option, Localization 2015-06-05 17:23:51 -05:00
PabstMirror
3c3affa69f Merge branch 'master' into mainMenuVersionHTML 2015-06-05 16:48:59 -05:00
PabstMirror
237b5b4e35 Merge pull request #1239 from acemod/laserPointerAsdgConflict 
ASDG- Fail gracefully if attachments not compatible
 2015-06-05 16:40:49 -05:00
PabstMirror
827c51c088 Merge pull request #1488 from acemod/captiveModuleSettings 
Captive module settings
 2015-06-05 16:40:36 -05:00
PabstMirror
b6951b7a13 #1022 - reset hearing deafness on respawn 2015-06-05 16:37:27 -05:00
PabstMirror
84428e5e6c Medical - unconsciousness: fix exitWith scope 2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding 
Should fix #1500
 2015-06-05 15:38:45 -05:00
SilentSpike
8a4b4a7e0c Added a bunch of basic actions 2015-06-05 18:37:29 +01:00
ulteq
595e4e7529 Merge pull request #1371 from gienkov/pl-translation-1 
Polish translations
 2015-06-05 17:58:14 +02:00
ulteq
c22a66bad4 Merge pull request #1515 from acemod/spotting_scope 
Ported the ACE2 Spotting Scope
 2015-06-05 17:03:14 +02:00
ulteq
04ae03695b Reverted dragging init. 2015-06-05 17:03:09 +02:00
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
SilentSpike
25f613b712 Initial implementation of static zeus menu 2015-06-04 23:24:57 +01: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
AKALegman
3b01da6962 IED Class Inheritance Fixes 2015-05-30 16:57:50 +01: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
PabstMirror
b0bfb7dd43 Fix Ladders - Add User Setting 2015-05-29 13:00:04 -05: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
08aeda11df Merge branch 'master' into userActionPrototype 2015-05-27 12:33:20 -05: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