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
7,511 Commits 73 Branches 88 Tags 752 MiB
e257827a69
Commit Graph

6193 Commits

Author SHA1 Message Date
PabstMirror
1f9a98f77d Cleanup / Params 2015-08-17 21:51:40 -05:00
PabstMirror
980fc7a235 Merge branch 'master' into mapOpenCloseEvents 2015-08-17 21:08:07 -05:00
jonpas
fe9e4fee07 Fixed viewdistance limit not applied when Video Settings option is selected, Removed unnecessary EHs 2015-08-17 18:12:00 +02:00
Steven Koeberich
b333fe0cd1 Changed german strings for aid kit 
Missed some.
 2015-08-17 17:42:03 +02:00
Steven Koeberich
f543cf2897 Changed german strings for aid kit 
The translation for Fielddressing and Aid kit are the same in the german translation which is missleading.

Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.
 2015-08-17 17:31:40 +02:00
jokoho48
e14c640c6f Fix Some LandContactPoints 
Fix Positions of some Model
 2015-08-17 16:11:23 +02:00
Glowbal
4d10f2a72d Merge pull request #2182 from jonpas/repairClean 
Repair Cleanup
 2015-08-17 11:31:57 +02:00
Glowbal
f59927a9a7 Merge pull request #2186 from jonpas/cargoClean 
Cargo Cleanup
 2015-08-17 09:50:49 +02:00
jokoho48
d5f9998ad0 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest 2015-08-17 01:50:48 +02:00
jonpas
dcf074ed5a Changed Optional parameter comment to default value 2015-08-16 23:05:26 +02:00
jonpas
7b89784aae Removed semi-colons from return statements, command capitalization 2015-08-16 22:48:52 +02:00
jonpas
bbc715b2ee Cleaned function headers 2015-08-16 22:41:35 +02:00
PabstMirror
359ee1d23b #2180 - Fix QGVAR(fullRepairLocation) switch statement 2015-08-16 15:31:20 -05:00
jonpas
98dd60c6ca Alphabetized PREPs, removed newlines and repair references 2015-08-16 22:21:39 +02:00
jonpas
fb73d3a436 Fixed dependencies 2015-08-16 22:17:04 +02:00
bux578
905628bc1c Merge pull request #2165 from acemod/enhanceRespawn 
after respawn select last weapon, muzzle and mode
 2015-08-16 22:05:41 +02:00
jonpas
b2824c82bb Removed redundant function 2015-08-16 21:54:04 +02:00
jonpas
fda0850ad7 Condensed duplicated function, alphabetized PREPs 2015-08-16 21:39:42 +02:00
PabstMirror
dd58eef415 Fix double weapon switch for standing treatment 2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401 #2178 - Fix treatment when weapon deployed 2015-08-16 13:58:58 -05:00
jonpas
161a75adc7 Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC() 2015-08-16 20:34:02 +02:00
jonpas
701c98e0da Cleaned up repair function headers and some code 2015-08-16 20:14:54 +02:00
jokoho48
8a5e572baf Fix Model Warning Unsupported UVSet 2015-08-16 19:52:28 +02:00
jokoho48
e41ce78dbb Code Test PFH 2015-08-16 19:49:47 +02:00
jonpas
85cc662fa4 ACE_Repair capitalization 2/2 2015-08-16 16:46:32 +02:00
jonpas
68359974f1 ACE_Repair capitalization 1/2 2015-08-16 16:46:17 +02:00
jonpas
b7282e476c Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions 2015-08-16 16:45:46 +02:00
Glowbal
9f3af45a8f Fixed repair items not registered as loadable 2015-08-16 16:16:04 +02:00
SilentSpike
1d51bd7c40 Merge pull request #2162 from acemod/assign-medic-curator-modules 
Add medical curator modules
 2015-08-16 14:13:31 +01:00
jonpas
5b0168efdb Fixed Atropine autoinjector display name 2015-08-16 14:14:49 +02:00
bux578
5ffdf4628f remove asdg message 
new cba will include asdg jr
 2015-08-16 13:15:01 +02:00
Glowbal
0c1b828946 Merge pull request #2171 from acemod/fix-error-invalid-hitpoints 
Fixed error pop-up invalid configured hitpoints
 2015-08-16 10:24:24 +02:00
PabstMirror
61bc40a650 Opps 2015-08-16 02:05:34 -05:00
bux578
ec29890780 Merge pull request #2128 from acemod/gienkov-pl-translation-5 
Gienkov pl translation 5
 2015-08-16 08:54:47 +02:00
PabstMirror
b9638f749b SetPosition Event - Fix digging down (#1991) 2015-08-16 01:51:44 -05:00
jokoho48
4478be096e Code Cleanup Magazine Repack Module. 2015-08-16 00:30:24 +02:00
Glowbal
0420f0b216 Fixed error pop-up kicking you out of game in case a third party vehicle has incorrect configured hitpoints/selections 2015-08-16 00:15:16 +02:00
jokoho48
965b024bfa Code Cleanup Logistic UAV Battery. 2015-08-16 00:07:17 +02:00
SilentSpike
05bf239d8e Specify zeus setMedic module conditions further 2015-08-15 21:44:40 +01:00
SilentSpike
c01052e5bf Update ace_zeus function headers 2015-08-15 21:11:49 +01:00
PabstMirror
fc6cd34d33 params, cleanup 2015-08-15 14:35:33 -05:00
Glowbal
7fa30009d3 Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator 2015-08-15 20:39:54 +02:00
Glowbal
1417429782 Switched to serverInit instead of init as per suggestion from @SilentSpike 2015-08-15 20:39:22 +02:00
Glowbal
c7f47c0b34 Replaced check for captive module by check for ACE_medical 2015-08-15 20:31:41 +02:00
PabstMirror
30828b83d2 Stringtable fixes 2015-08-15 12:21:49 -05:00
PabstMirror
d023139e8d Stringtable fix 2015-08-15 12:04:57 -05:00
bux578
3d9b0d527c fix indentation 
atom needed the editorconfig package
 2015-08-15 18:58:31 +02:00
bux578
675cfc2da7 after respawn select last weapon, muzzle and mode 
#2138
 2015-08-15 18:54:39 +02:00
PabstMirror
4d8a9ae890 Merge branch 'master' into virtualExplosivesPlace 2015-08-15 11:40:06 -05:00
Glowbal
ed66255b19 Add objects to all curators 2015-08-15 18:39:43 +02:00
Glowbal
0e57d3d97c Added assign medic, medicalfacility and medical vehicle curator modules 2015-08-15 18:25:48 +02:00
Glowbal
29b21b8f41 Merge pull request #275 from acemod/cargo 
load things into vehicles
 2015-08-15 17:36:44 +02:00
Glowbal
bac1a8fce4 Merge pull request #186 from acemod/repair 
add repair PBO, fix #185
 2015-08-15 17:36:31 +02:00
Glowbal
fe9751f725 Added category to settings 
Fixed client setting attribute spelling mistake
 2015-08-15 16:00:37 +02:00
Glowbal
d3aa6a7f6b Added missing assign modules 2015-08-15 15:49:41 +02:00
PabstMirror
c54081d677 Don't broadcast localization for settings 
smaller `publicVariable`
 2015-08-15 03:48:25 -05:00
Glowbal
317c73a80e Added Land_PaperBox_closed_F 
fixed initOBject
 2015-08-15 10:22:44 +02:00
PabstMirror
660d048670 Options Menu - Fix Colors when category selected 2015-08-15 03:21:03 -05:00
PabstMirror
a2897e6d32 Merge branch 'master' into cargo 2015-08-15 03:11:19 -05:00
PabstMirror
ea2dc46d59 1.50 realisticnames - ubc 2015-08-15 02:56:34 -05:00
Glowbal
03413ef6b6 Merge branch 'cargo' of github.com:acemod/ACE3 into cargo 
Conflicts:
	addons/cargo/functions/fnc_initVehicle.sqf
 2015-08-15 09:51:15 +02:00
Glowbal
d8084e20d7 Added cargo settings and settings module. 2015-08-15 09:50:00 +02:00
PabstMirror
c35fc35eb3 Captive FFV stuff 2015-08-14 21:29:01 -05:00
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
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
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
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
Glowbal
27a57d89f8 Merge branch 'master' into cargo 2015-08-10 17:59:19 +02:00
Glowbal
e5eaefafdb fixed #2097 - script error because of global variable in params 2015-08-10 09:51:14 +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
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
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
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
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