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
4,748 Commits 73 Branches 88 Tags 752 MiB
f8003fd865
Commit Graph

3961 Commits

Author SHA1 Message Date
commy2
de660cf45f messing with animations 2015-04-21 05:21:04 +02:00
commy2
5e440686bb put weapon on back without having to stand up 2015-04-21 04:43:24 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
Glowbal
166c8147cf Using ace_frag_fnc_addManualTrack instead of fired function 2015-04-20 23:55:23 +02:00
Glowbal
4543bab7fb added nil check for function ace_frag_fnc_fired 2015-04-20 23:41:22 +02:00
Glowbal
fb93e9e9bc wrapped track in debug define 2015-04-20 23:38:50 +02:00
esteldunedain
1fa9ba1cbf Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 18:24:50 -03:00
esteldunedain
90288b495e Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead. 2015-04-20 18:24:12 -03:00
Glowbal
24c32d8e3f added configuration 2015-04-20 23:18:53 +02:00
PabstMirror
fdbd0c1905 #777 - mDagr - Update map pos each frame. 2015-04-20 16:12:01 -05:00
Glowbal
7b790ffb1a staged work 2015-04-20 22:48:11 +02:00
Nicolás Badano
2a945df150 Merge pull request #782 from acemod/nobag 
hide open bag option when it's not selected via scroll wheel
 2015-04-20 17:25:11 -03:00
Glowbal
1df42b17c2 close all dialogs 2015-04-20 22:22:09 +02:00
Glowbal
89a1306605 Merge branch 'master' into KeyPressesWhileUnconscious 2015-04-20 22:19:40 +02:00
Glowbal
362051e2db Merge pull request #717 from acemod/medicalFixes 
Medical fixes
 2015-04-20 22:16:57 +02:00
Glowbal
f7719f0e0a tab 2015-04-20 22:08:31 +02:00
commy2
afc8abce85 hide open bag option when it's not selected via scroll wheel 2015-04-20 22:00:13 +02:00
Glowbal
842bfe0b98 enabled advanced wounds setting 2015-04-20 22:00:11 +02:00
Glowbal
90cf882e02 Using setvar instead of event sync again 2015-04-20 21:58:27 +02:00
Glowbal
8be7ccaab7 setting for moving unit from group on unconscious 2015-04-20 21:37:30 +02:00
commy2
ae3c8e3d88 weapon select keys are optional 2015-04-20 21:10:56 +02:00
commy2
43707342a8 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into wselect 2015-04-20 20:07:48 +02:00
commy2
438b6a1adb Merge pull request #618 from acemod/recoil 
Recoil overhaul
 2015-04-20 19:47:02 +02:00
commy2
ed72697141 Merge pull request #728 from acemod/error 
Show error message and quit mission if a dll isn't present
 2015-04-20 19:41:38 +02:00
esteldunedain
66af69def8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 13:55:42 -03:00
esteldunedain
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03:00
commy2
ea368511b7 ace extensions class for modularity 2015-04-20 18:48:58 +02:00
commy2
14214090dc manual merge 2015-04-20 18:22:17 +02:00
commy2
16c6a3ee78 tweaking recoil 2015-04-20 17:38:45 +02:00
Grzegorz Sikora
222aceaf56 PL fix 2015-04-20 17:11:22 +02:00
ulteq
ac74e6c611 More WIP 2015-04-20 16:33:36 +02:00
commy2
6c00aef6e8 coeficients for recoil configs 2015-04-20 16:02:36 +02:00
ulteq
8aa69663d6 More WIP 2015-04-20 16:01:13 +02:00
KoffeinFlummi
06a4f3d10e Remove tabler comments. 2015-04-20 15:48:50 +02:00
KoffeinFlummi
e8cd918b90 Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-20 15:46:36 +02:00
esteldunedain
7953919b89 Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis 2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis 2015-04-20 10:24:24 -03:00
commy2
d8fbb49bbd Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into recoil 2015-04-20 15:14:57 +02:00
ulteq
9155056a50 Proof of concept wind code (custom debug output enabled) 2015-04-20 15:11:14 +02:00
ruPaladin
08caf0c695 Updated russian translation (medical) 
Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.
 2015-04-20 15:18:17 +03:00
ulteq
be378adfee Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-20 13:54:28 +02:00
ulteq
89e33dc177 Refactored the weather module: 
* No changes in functionality
 2015-04-20 13:54:22 +02:00
bux578
89f6b6bfd0 Merge pull request #766 from ruPaladin/patch-3 
Rus translation (nametags)
 2015-04-20 13:23:04 +02:00
bux578
13b11d7225 Merge pull request #768 from Tachii/patch-17 
Update stringtable.xml
 2015-04-20 13:02:38 +02:00
ulteq
6c2982548f Fixed incorrect function header 2015-04-20 12:35:08 +02:00
ulteq
0e08fd4457 Incremented the ATragMX profile namespace version 2015-04-20 11:09:12 +02:00
ulteq
de0414803e Fixed some more airFriction values in the ATragMX gun list 2015-04-20 11:08:28 +02:00
ulteq
c049ee5c08 Fixed incorrect .408 Chey Tac airFriction value 2015-04-20 11:02:28 +02:00
ulteq
2bf47ca0c4 Added two more asterix (*) meter indicator GUI elements 2015-04-20 10:36:20 +02:00
ulteq
8ff72e7fc8 Fixed another bug in the unit conversion code 2015-04-20 10:35:29 +02:00
PabstMirror
822bd22c97 gj git 2015-04-20 02:18:46 -05:00
PabstMirror
e747234443 Cleanup Spelling 2015-04-20 02:17:47 -05:00
PabstMirror
8c449a454b merge conflict 2015-04-19 23:57:15 -05:00
esteldunedain
f928f37e26 Eliminate interact_menu fps drops due to high nearby object counts. 
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
 2015-04-20 01:16:51 -03:00
Tachii
20293bd11b Update stringtable.xml 2015-04-20 00:26:20 +03:00
Grzegorz Sikora
8530684fa6 PL fix #2 2015-04-19 23:09:11 +02:00
Tachii
6c8b587890 Update stringtable.xml 2015-04-20 00:02:01 +03:00
ulteq
f7d35d5593 The ATragMX now also accounts for vertical coriolis drift (Eötvös effect) 2015-04-19 22:30:13 +02:00
Tachii
5038674aef Update stringtable.xml 2015-04-19 23:01:38 +03:00
Tachii
60cab963bf Update stringtable.xml 2015-04-19 23:00:51 +03:00
Glowbal
17899db086 added some missing privates 2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926 Merge branch 'master' into medicalFixes 2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Tachii
a7d913b80e Update stringtable.xml 2015-04-19 18:54:47 +03:00
Tachii
596fadcba0 ru translations fixes 
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
 2015-04-19 18:51:35 +03:00
Tachii
a83925dd2d Update stringtable.xml 2015-04-19 18:43:05 +03:00
ulteq
20740679cc Fixed inconsistent 'workingMemory' initialization 2015-04-19 17:40:49 +02:00
Glowbal
f6bbeb6bd6 switched back to old init method 2015-04-19 17:28:47 +02:00
Glowbal
d1fabf9733 Merge branch 'master' into medicalFixes 2015-04-19 17:26:10 +02:00
Grzegorz Sikora
4283e07942 PL fix 2015-04-19 13:50:08 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +02:00
ulteq
a73c0bc429 Sord is now able to transmit the direction of fire 2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e Removed unused RscControlsGroup 2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b Overworked the scope click feature: 
*TODO: Add the "Setting Up a Solution for Your Scope" screen
 2015-04-19 12:07:27 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
ulteq
874858ebb4 Added a sanity check to the cycle gun list function 
*Top/Down buttons only cycle the gun list in the main/gun list menu
 2015-04-19 11:43:20 +02:00
ulteq
5195271894 Fixes: https://github.com/acemod/ACE3/commit/4235163 
*The asterix needs to be shown on distances shown in meters not yards
 2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee Increased the minimum barometric pressure value that is accepted 2015-04-19 11:18:37 +02:00
ulteq
4235163801 Added asterix (*) prefix to distances in yards on the main page 2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0 Moved a private declaration out of the hot path 2015-04-19 11:02:25 +02:00
ulteq
8f20303a08 Fixed a bug in the atmosphere unit conversion 2015-04-19 11:02:06 +02:00
ulteq
336a192302 The range card setup data is now also restored on mission start 2015-04-19 10:57:55 +02:00
ulteq
51590d39ad Cleaned up the ATragMX postInit routine 2015-04-19 10:47:43 +02:00
ruPaladin
d8b96066e6 Rus translation (nametags) 2015-04-19 11:01:41 +03:00
ruPaladin
45fd90c6e0 Rus translation (medical) 2015-04-19 10:49:06 +03:00
commy2
c9a2505031 Merge pull request #755 from acemod/fixoptics2 
Fix for PIP scopes, fix #547
 2015-04-19 07:46:41 +02:00
bux578
2dfbd0a5cd Merge pull request #761 from Tachii/patch-16 
Update stringtable.xml
 2015-04-19 07:11:39 +02:00
bux578
daf2fbb906 Merge pull request #760 from Tachii/patch-15 
Update stringtable.xml
 2015-04-19 07:11:27 +02:00
bux578
25ac90ef8b Merge pull request #759 from Tachii/patch-14 
Update stringtable.xml
 2015-04-19 07:11:06 +02:00
bux578
5ed0dfe463 Merge pull request #758 from Tachii/patch-13 
Update stringtable.xml
 2015-04-19 07:10:55 +02:00
bux578
fa8e954d27 Merge pull request #757 from Tachii/patch-12 
Update stringtable.xml
 2015-04-19 07:10:45 +02:00
commy2
275da6f40a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-19 07:09:21 +02:00
commy2
9cb27c8fb2 fix: error when getting killed with FF-messages module, fix #745 2015-04-19 07:08:57 +02:00
bux578
0d86374bee Merge pull request #754 from gienkov/master 
PL translation
 2015-04-19 07:08:54 +02:00
PabstMirror
54c5070569 isNull 2015-04-18 22:23:19 -05:00
jaynus
dccc869a6a Merge pull request #753 from acemod/fixSettingsLocalization 
Fix settings localization is done by the server instead of client
 2015-04-18 20:09:56 -07:00
KoffeinFlummi
65fd6b0937 Merge https://github.com/EpMAK/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/nametags/stringtable.xml
	addons/respawn/stringtable.xml
 2015-04-19 01:04:32 +02:00
KoffeinFlummi
46bd51ffdf Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:51:33 +02:00
KoffeinFlummi
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-19 00:51:09 +02:00
jaynus
14faabb677 Merge branch 'master' of github.com:acemod/ACE3 2015-04-18 15:44:25 -07:00
jaynus
2fe7122b3e Disable handoff until completed. 2015-04-18 15:44:07 -07:00
commy2
5558a6491d remove weapon select in favor of the new controls from bi 2015-04-19 00:40:29 +02:00
KoffeinFlummi
8015aca0c3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:40:18 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
Tachii
e62a476a90 Update stringtable.xml 2015-04-19 01:37:08 +03:00
Tachii
dc2c3e246e Update stringtable.xml 2015-04-19 01:25:30 +03:00
Tachii
8f9796f488 Update stringtable.xml 2015-04-19 01:23:37 +03:00
Tachii
a9d38f5970 Update stringtable.xml 2015-04-19 01:19:32 +03:00
Tachii
560646e1e1 Update stringtable.xml 2015-04-19 01:18:53 +03:00
commy2
ae80da7492 fix cameras breaking pip scope camera r2t texture, reenable PIP scopes in arsenal 2015-04-19 00:05:54 +02:00
esteldunedain
8b389949bc Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-18 18:42:11 -03:00
esteldunedain
bce0d84989 Fix interact menu object ordering 2015-04-18 18:41:36 -03:00
jaynus
9618fefa67 Merge pull request #384 from acemod/fixmass 
fix falling over static weapons
 2015-04-18 14:36:20 -07:00
ulteq
21c772aa8d Fixed scope adjustment conflicting with vehicle weapon zeroing 2015-04-18 23:14:40 +02:00
ulteq
454c6dfbfe Added more GUI elements to structure the ATragMX main page 2015-04-18 22:58:23 +02:00
ulteq
ae3dad4f36 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 22:12:45 +02:00
ulteq
283388eb7c Fixed a small calculation error in the wind speed output 2015-04-18 22:12:37 +02:00
commy2
7ac7bc3f29 eventhandler for creating and deleting cameras 2015-04-18 22:06:42 +02:00
Grzegorz
8dac6d3f3d Update stringtable.xml 2015-04-18 22:03:36 +02:00
Grzegorz Sikora
0629b59184 Merge branch 'master' of https://github.com/gienkov/ACE3 
Conflicts:
	addons/optionsmenu/stringtable.xml
 2015-04-18 22:02:44 +02:00
Grzegorz Sikora
c08125e0f3 PL translation 2015-04-18 22:00:37 +02:00
Glowbal
9825d030e3 Merge pull request #714 from acemod/localMedicalGarbage 
ACE JIP data and event synchronization (Tested with Litter change)
 2015-04-18 21:25:53 +02:00
ulteq
c950324c75 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 21:18:18 +02:00
ulteq
d8b461db91 Enabled wind deflection for grenades and vehicle gunners: 
*Added a new module option to disable WD for vehicle gunners
*Fixed enabled setting not being initialized
 2015-04-18 21:17:37 +02:00
bux578
0f2e4c22b7 Merge pull request #749 from FreeZbe/master 
French: updates / fixes stringtable
 2015-04-18 21:16:07 +02:00
bux578
1cbd854412 Merge pull request #748 from gienkov/patch-6 
PL translation fix
 2015-04-18 21:15:30 +02:00
jaynus
f5705a91e6 oops. 2015-04-18 12:04:48 -07:00
jaynus
ca74ce721d Use cleanup settings, and force server TTL on the events. 2015-04-18 11:48:44 -07:00
jaynus
e54c68f7f9 handle cleanup 2015-04-18 11:37:06 -07:00
jaynus
852b4df61d Settings changes. createVehicleLocal derp. 2015-04-18 11:16:18 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
Glowbal
54a70f26b1 Moved to own function. 2015-04-18 20:06:01 +02:00
Glowbal
85e5293c37 Fix settings localization is done by the server instead of client #744 2015-04-18 19:59:41 +02:00
jaynus
dea95f7947 ace_laser_selfdesignate 2015-04-18 10:57:35 -07:00
jaynus
8361ec3812 ace_lasers 2015-04-18 10:57:11 -07:00
jaynus
953faf3d4b ace_missileguidance privates. 2015-04-18 10:53:21 -07:00
jaynus
87337bcb7a ace_javelin privates 2015-04-18 10:50:22 -07:00
Glowbal
22456a4301 use pain instead 2015-04-18 19:49:29 +02:00
jaynus
11336cdade Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-18 10:37:16 -07:00
jaynus
26e2917f79 Merge remote-tracking branch 'origin/master' into laserCodes 
Conflicts:
	addons/javelin/CfgWeapons.hpp
 2015-04-18 10:36:07 -07:00
jaynus
1d908c2f70 Merge pull request #677 from acemod/titanCompat 
Titan static & variant compatability with missile guidance
 2015-04-18 10:32:57 -07:00
ulteq
c1ee623808 Added a few static gui elements 2015-04-18 19:22:24 +02:00
jaynus
9c076364ec Titan AA asset functionality is now vanilla, locking doesn't override AA/AP stuff. 2015-04-18 10:18:33 -07:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
Grzegorz
34cf11e022 PL translation fix 
Did not saw that one
 2015-04-18 18:48:56 +02:00
jaynus
d1e03d8e7a Slight tweaks. 2015-04-18 09:40:46 -07:00
jaynus
e14ee45249 debug checking. 2015-04-18 09:29:58 -07:00
ulteq
1b578b8835 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 17:45:39 +02:00
ulteq
fc39b81c95 *Fixed a minor bug in the dual inclination calculation 
*Added a profile namespace format version
*The profileNamespace data is now automatically reset on version mismatch
 2015-04-18 17:45:32 +02:00
commy2
370e6bd9a7 maybe fix for #741, Speedlimiter locking vehicle controls 2015-04-18 17:42:13 +02:00
jaynus
d1993836ae Cleanup. missing string. 2015-04-18 08:40:28 -07:00
jaynus
c5f5b11d31 strings. 2015-04-18 08:37:21 -07:00
jaynus
f31e3c1fd4 litter simulation createVehicleLocal /w temporal network sync. 2015-04-18 08:31:03 -07:00
Nicolás Badano
4a76b0e5c9 Merge pull request #686 from acemod/modifiableActions 
Allow to dynamically modify actions at runtime.
 2015-04-18 11:24:01 -03:00
Grzegorz Sikora
170a8d0641 PL translation 2015-04-18 16:01:07 +02:00
ulteq
5e45734cf4 Implemented the dual inclination angle input method 2015-04-18 15:52:06 +02:00
ulteq
422e175f09 Implemented the dual wind speed feature 2015-04-18 15:08:54 +02:00
ulteq
4449c99eba Removed debug output 2015-04-18 12:13:27 +02:00
ulteq
2a6dcbfbcb Added automatic unit conversion for the target data 2015-04-18 12:12:19 +02:00
ulteq
9057edb1e2 Added a new module option for wind deflection: 
*enabled - true/false
 2015-04-18 11:10:05 +02:00
commy2
4264f78128 player has to put weapon on back before climbing, check if still can climb 2015-04-18 10:16:10 +02:00
commy2
fd821de353 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 09:27:07 +02:00
commy2
9633547d6b tweak ability to climb 2015-04-18 09:26:47 +02:00
PabstMirror
060dc22ad5 Merge pull request #721 from acemod/privatesPass1 
Privates Var Fixing
 2015-04-17 23:51:23 -05:00
PabstMirror
d7da259c11 Merge pull request #688 from acemod/optionMenuStuff 
Option menu stuff
 2015-04-17 23:49:37 -05:00
bux578
e2185d2d4a Merge pull request #725 from Tachii/patch-9 
Update stringtable.xml
 2015-04-18 06:44:37 +02:00
bux578
a610872863 Merge pull request #724 from Tachii/patch-8 
Update stringtable.xml
 2015-04-18 06:44:20 +02:00
bux578
55cd6536a8 Merge pull request #727 from Tachii/patch-11 
Update stringtable.xml
 2015-04-18 06:44:05 +02:00
bux578
386802cc16 Merge pull request #726 from Tachii/patch-10 
Update stringtable.xml
 2015-04-18 06:42:48 +02:00
bux578
ed242fdea4 Merge pull request #723 from Tachii/patch-7 
Update stringtable.xml
 2015-04-18 06:42:39 +02:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
PabstMirror
71e62711c6 #731 - stop error if target offscreen 2015-04-17 22:02:23 -05:00
jaynus
c952a97de8 Revert "synced events implemented into litter." 
This reverts commit 32df4a2adc.
 2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc synced events implemented into litter. 2015-04-17 19:33:07 -07:00
jaynus
93d03b404f JIP Sync events complete. 2015-04-17 19:26:27 -07:00
jaynus
da09b74fe4 Don't JIP check server side, but still have it fire for HC. 2015-04-17 18:27:35 -07:00
jaynus
8fa0c91632 Added PlayerJIP event, handled full requests on JIP. 2015-04-17 18:23:26 -07:00
Tachii
ad61557557 Update stringtable.xml 2015-04-18 03:10:28 +03:00
Tachii
711be038fc Update stringtable.xml 2015-04-18 03:09:51 +03:00
Tachii
b7c7d2ff15 Update stringtable.xml 2015-04-18 03:04:14 +03:00
commy2
708a2aa374 check if ddls are present on mission start 2015-04-18 01:44:53 +02:00
Tachii
04858bb673 Update stringtable.xml 2015-04-18 02:19:09 +03:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
Tachii
7f942a06f8 Update stringtable.xml 2015-04-18 02:11:16 +03:00
Tachii
0bb3238db1 Update stringtable.xml 2015-04-18 02:09:59 +03:00
esteldunedain
faa7513a79 Merge branch 'streamlinedBasicDiagnosis' of github.com:KoffeinFlummi/ACE3 into simpleDiagnosis 2015-04-17 20:09:04 -03:00
esteldunedain
15720dce31 Yellow and Red medical crosses 2015-04-17 20:08:30 -03:00
Tachii
bd3ef35c88 Update stringtable.xml 2015-04-18 02:07:49 +03:00
commy2
ad287d3d23 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into error 2015-04-18 01:05:42 +02:00
commy2
3ec5acbdb0 stuff 2015-04-18 01:05:30 +02:00
esteldunedain
cba00e7b5d Merge remote-tracking branch 'origin/master' into simpleDiagnosis 2015-04-17 20:03:04 -03:00
esteldunedain
c423e9d743 Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/ACE_Medical_SelfActions.hpp
 2015-04-17 20:02:51 -03:00
Tachii
1e446fb060 Update stringtable.xml 2015-04-18 02:01:09 +03:00
esteldunedain
a5c3e86cd3 Fixes 2015-04-17 20:00:43 -03:00
esteldunedain
cce9e1f04c Simple diagnose 2015-04-17 19:38:03 -03:00
esteldunedain
1d208b4efc Modify Function for medical actions 2015-04-17 19:36:03 -03:00
ulteq
b32a2b7495 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-18 00:12:04 +02:00
ulteq
314b0d23d6 ATragMX Feature Expansion: 
*Added Gun and Ammo Data Screen
*Added Atomospheric and Environmental Data Screen
*Added Target Data Screen
*Added support for coriolis- and spin drift
*Added a second option (AT) to enter atmospheric data
*Target data is now saved/restored in/from the profileNamespace
*Atmosphere data is now saved/restored in/from the profileNamespace
*Selected gun profile is now saved/restored in/from the profileNamespace
*Fixed several bugs in the dual-/imperial unit systems
*Minor bug fixes in the target range assist screen
*Minor bug fix in the target speed assist screen
 2015-04-18 00:11:53 +02:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
commy2
25d8c6c93e function to show error message box 2015-04-17 23:24:43 +02:00
Glowbal
d1a09ae7fc fixed vehicle crashes for adv 2015-04-17 23:15:41 +02:00
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
Glowbal
bc4d102d08 changed variable initialization - everything is now done local 2015-04-17 22:43:31 +02:00
Glowbal
cbc3584f9d removed duplicate condition attribute 2015-04-17 22:24:42 +02:00
Glowbal
9670267d20 Fixed wrong classnames for IV treatments 2015-04-17 22:21:54 +02:00
Glowbal
f5effca216 fixed handleDamage basic 2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1 Cache condition for target instead of caller 2015-04-17 22:02:43 +02:00
Glowbal
0e858be1b1 Changed conditions for body parts are now always true. 
This way the medical information is always available, and should help a bit with performance as well.
 2015-04-17 22:00:07 +02:00
Grzegorz Sikora
7489e514ce PL translation 2015-04-17 21:48:04 +02:00
Glowbal
fa7bb5f9c6 Added unconscious state check 2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76 fixes #699 2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169 fixes #653 2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3 fixed AI standing up before being killed 
Doesn't matter if we enable AI again on dead units
 2015-04-17 21:06:30 +02:00
Glowbal
9b4435827e Added setting for unconscious animations on treatment 2015-04-17 20:51:57 +02:00
Glowbal
80139521bc fixes #691 2015-04-17 20:49:24 +02:00
Glowbal
b333e6e662 Keep units longer unconscious, instead of quickly fading in/out 2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229 Moved unconscious event, so it won't conflict in case the unit is still being carried 2015-04-17 20:38:02 +02:00
Glowbal
0234eedd54 Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit 2015-04-17 20:33:13 +02:00
commy2
0e90199e23 remove debug message 2015-04-17 20:29:01 +02:00
Glowbal
8b7e46c45f fixes #656 2015-04-17 20:26:28 +02:00
Glowbal
c86be12668 fixes #599 2015-04-17 20:24:05 +02:00
simon84
9f2dd61613 Revert "minor FCS changes (privatized variables, unnecessary counters)" 
This reverts commit ff0fb12ca3.
 2015-04-17 20:22:49 +02:00
Glowbal
111a350a84 Merge branch 'master' into advMedicalEventSync 2015-04-17 20:11:53 +02:00
Aleksey Yermakov
8a669c390a Update stringtable.xml 2015-04-17 20:35:34 +03:00
Aleksey Yermakov
2f1ee94d91 Update stringtable.xml 2015-04-17 20:24:32 +03:00
jaynus
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
Aleksey Yermakov
bf7a7b5bc9 Update stringtable.xml 2015-04-17 20:18:41 +03:00
PabstMirror
6e077de829 Medical - Use default value instead of 0 for getVar 
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
 2015-04-17 12:13:23 -05:00
EpMAK
c88bda487b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	addons/weaponselect/stringtable.xml
 2015-04-17 19:48:01 +03:00
EpMAK
31a2f1b279 Russian translations 
Again, filling strings, fixing errors
 2015-04-17 19:36:07 +03:00
PabstMirror
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
ruPaladin
2698490569 medical (patient status semantic fixes) 2015-04-17 17:49:03 +03:00
jaynus
e83ab4049f Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
jaynus
3a94753645 tab 2015-04-17 07:28:59 -07:00
jaynus
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
jaynus
469dafd0c0 tab 2015-04-17 07:25:49 -07:00
KoffeinFlummi
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
commy2
f8f2748d28 Merge pull request #646 from acemod/wireCuttersSoundEffect 
Wire cutters sound effect
 2015-04-17 15:40:42 +02:00
commy2
7e275a43f4 Merge pull request #693 from acemod/parafix 
hide height / velocity while parachuting, freefallig in expert mode, fix #692
 2015-04-17 15:40:34 +02:00
commy2
77b057e188 Merge pull request #698 from acemod/dispofix 
disposable cleanup, fix #696
 2015-04-17 15:40:28 +02:00
ruPaladin
874cc75271 medical (semantic correction) 2015-04-17 16:22:02 +03:00
ruPaladin
52dc5d66a4 nametags (fix text overlapping, semantic correct) 2015-04-17 16:09:17 +03:00
ruPaladin
a4980a91e1 inventory (semantic correction) 2015-04-17 16:04:26 +03:00
ruPaladin
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
ruPaladin
766321224b hearing 2015-04-17 15:59:29 +03:00
ruPaladin
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
Lex Rivera
163ac7bd4a [realisticnames] Adjust MK-I. Enable actual names 2015-04-17 15:28:30 +03:00
ruPaladin
af876e3370 attach 2015-04-17 15:27:53 +03:00
EpMAK
c2214efeb1 Russian stringtables finished 
Filled all the missing lines, little errors fixed.
 2015-04-17 14:54:28 +03:00
Lex Rivera
2ca20f740e [realisticnames] adjust M14 2015-04-17 14:53:55 +03:00
Lex Rivera
8fc2e96367 [realisticnames] Adjust SPMG name, fix some russian 2015-04-17 14:49:43 +03:00
commy2
26944ea84e make altimeter actually usable with parachutes 2015-04-17 13:01:38 +02:00
commy2
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
commy2
558a4fb363 Merge pull request #461 from Tenga/altimeter-fix 
Altimeter fix, division by zero when no time has passed (game paused, etc.)
 2015-04-17 12:49:06 +02:00
commy2
45d639b395 disposable cleanup, fix #696 2015-04-17 12:28:06 +02:00
nomisum
d865e9c038 fixed typo 2015-04-17 11:42:47 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
ulteq
e04a0c438a Fixed deprecated delete_gun function 2015-04-17 11:05:24 +02:00
commy2
20565e8b02 hide height / velocity while parachuting, freefallig in expert mode, fix 692 2015-04-17 11:02:01 +02:00
ruPaladin
e38a6fc62b one more russian fix 2015-04-17 12:01:01 +03:00
esteldunedain
54daa02aa4 Weather: headers + privates 2015-04-17 01:44:38 -03:00
esteldunedain
80f37b9ad9 Reword team actions on AI 2015-04-17 01:13:05 -03:00
esteldunedain
c8ebed234f Reword the group actions 2015-04-17 01:01:31 -03:00
PabstMirror
7d5a70246b Remove unnecessary cfgSounds 2015-04-16 22:10:33 -05:00
esteldunedain
9de834e156 Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate). 2015-04-17 00:04:27 -03:00
esteldunedain
bdd3422150 Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc 2015-04-16 23:53:54 -03:00
PabstMirror
1729c781bd Cleanup / private vars 2015-04-16 19:46:42 -05:00
PabstMirror
53af014eab Fix Localization in value[] array 2015-04-16 19:29:39 -05:00
PabstMirror
4e5c2ef187 option menu ui scaling 2015-04-16 19:11:42 -05:00
simon84
ff0fb12ca3 minor FCS changes (privatized variables, unnecessary counters) 
- added some variables to the private statement
- removed an iteration counter, which was only used for debugging
 2015-04-16 23:05:48 +02:00
simon84
e7f9bc09df German translations 
Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-16 22:52:49 +02:00
simon84
cc75928cc0 Merge remote-tracking branch 'acemod/master' 
Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-16 22:47:51 +02:00
PabstMirror
e12831bee4 #678 - Missing Text Height in settingMenu 2015-04-16 15:17:56 -05:00
simon84
c18284d964 German translation 2015-04-16 22:04:24 +02:00
bux578
5764310833 german translation 
double checked by bw medic
 2015-04-16 21:58:39 +02:00
jaynus
ce4a9c3676 Apply javelin guidance to static titans. 2015-04-16 11:32:47 -07:00
ulteq
4ef80ab3a3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 20:14:33 +02:00
PabstMirror
fa6cb3e75c #672 - Don't show speaking icon for unconc players 2015-04-16 12:58:54 -05:00
ulteq
a7507fefef Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 19:55:48 +02:00
ulteq
1794606304 Got rid of the __DSP macro 2015-04-16 19:52:20 +02:00
PabstMirror
638433614c Some missing private defines. 2015-04-16 12:36:16 -05:00
Nicolás Badano
95cab9d0e7 Merge pull request #671 from Legolasindar/master 
added spanish translation
 2015-04-16 14:18:41 -03:00
jaynus
3d7ae5e3a1 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 10:10:31 -07:00
jaynus
6a942ac820 Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670 2015-04-16 10:10:24 -07:00
jaynus
8837355d29 Merge remote-tracking branch 'origin/master' into guidanceHandoff 2015-04-16 10:04:57 -07:00
Ivan Navarro Cabello
61d1e6854e added spanish translation 
added spanish translation to ballistics and respawn
 2015-04-16 19:03:15 +02:00
ulteq
668888de81 Fixed constant name not following the coding-guideline 2015-04-16 19:00:37 +02:00
ulteq
aeffc55859 Added missing privates 2015-04-16 18:52:48 +02:00
jaynus
bce4f14cc8 Merge remote-tracking branch 'origin/laserCodes' into guidanceHandoff 2015-04-16 09:40:47 -07:00
jaynus
6d93fe45a6 Guidance handoff to guiding unit/laser shooter. This needs LOBL vs. LOAL capability. 2015-04-16 09:35:21 -07:00
KoffeinFlummi
bf0aa6f344 Merge branch 'spanish-merge' 2015-04-16 18:32:37 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-16 18:31:31 +02:00
ulteq
4e4dee18df Added missing privates / Removed unused privates 2015-04-16 18:21:19 +02:00
ulteq
fa39e8f001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 18:14:42 +02:00
ulteq
e35d3dab49 Overworked the ATragMX target slot logic: 
*Added missing privates
*Solutions are now automatically calculated on target/gun selection
 2015-04-16 18:14:32 +02:00
ulteq
5117595ecc Minor performance improvement 2015-04-16 17:52:21 +02:00
ulteq
defe46b769 Added new PFH abort condition (velocity < 100 m/s) 2015-04-16 17:30:50 +02:00
Tachii
2466d83cac Update stringtable.xml 2015-04-16 18:19:11 +03:00
Tachii
def2f9c28e Update stringtable.xml 2015-04-16 18:13:53 +03:00
Tachii
dca11e523b Update stringtable.xml 2015-04-16 18:08:58 +03:00
Nicolás Badano
8cb167d1be Merge pull request #663 from ruPaladin/patch-1 
addons/realisticnames translation to Russian
 2015-04-16 10:06:12 -03:00
Coren4
4ff68eabd4 Update stringtable.xml 2015-04-16 14:59:19 +02:00
ulteq
55d9f7a3da The previous GUI state is now restored when you open the ATragMX 2015-04-16 13:46:32 +02:00
ulteq
d6cadb593a Enabled the ATragMX to use the advanced ballistics extension 2015-04-16 13:44:54 +02:00
ulteq
ca3293aa1a Added ACE_Box_Ammo (WIP): 
*TODO: Define a model
 2015-04-16 13:43:41 +02:00
ulteq
15240ac87c Minor code change in the extension detection logic 2015-04-16 13:42:28 +02:00
ruPaladin
e00dd1c2f2 addons/realisticnames translation to Russian 2015-04-16 14:10:48 +03:00
ulteq
aa724129d1 Tuned down the default timeToLive value. 2015-04-16 10:51:33 +02:00
Marco
00c0839ce5 Update stringtable.xml 
IT
 2015-04-16 10:33:15 +02:00
Marco
ba510facbd Update stringtable.xml 
IT
 2015-04-16 10:29:17 +02:00
Marco
23cb1058fc Update stringtable.xml 
IT
 2015-04-16 10:26:55 +02:00
Marco
500098d061 Update stringtable.xml 
IT
 2015-04-16 10:25:39 +02:00
Marco
66ba74e79d Update stringtable.xml 
IT
 2015-04-16 10:24:17 +02:00
Marco
13de953aab Update stringtable.xml 
IT
 2015-04-16 10:23:34 +02:00
Marco
0655c3f3b6 Update stringtable.xml 
IT
 2015-04-16 10:22:32 +02:00
Marco
fda1febc30 Update stringtable.xml 
IT
 2015-04-16 10:21:49 +02:00
Marco
59643152bd Update stringtable.xml 
IT
 2015-04-16 10:19:43 +02:00
Marco
5e7fb0fb64 Update stringtable.xml 
IT
 2015-04-16 10:18:49 +02:00
Marco
c1655aa9a9 Update stringtable.xml 
IT
 2015-04-16 10:16:17 +02:00
Marco
b3d4e2f48f Update stringtable.xml 
IT
 2015-04-16 10:14:18 +02:00
Marco
a129f18a2a Update stringtable.xml 
Italian
 2015-04-16 10:13:50 +02:00
PabstMirror
9c9136ae91 Stringtable cleanup 2015-04-16 02:54:50 -05:00
PabstMirror
58dfc6aa97 Add item to ace misc box 2015-04-15 22:34:24 -05:00
PabstMirror
80516f4f61 Increase Sound Volume 2015-04-15 22:27:12 -05:00
PabstMirror
b2625c43e7 #644 - Extra Space in macro 2015-04-15 20:30:09 -05:00
commy2
8d8ae3dadb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-16 02:00:55 +02:00
commy2
4169351b1a fix addActionEH didn't work after respawn 2015-04-16 02:00:37 +02:00
PabstMirror
23f47f97ae Wirecutter - better sound effects, cleanup 2015-04-15 18:32:47 -05:00
Glowbal
59ae4623ff Derp 2015-04-16 00:17:17 +02:00
Glowbal
f3ca1a85b9 Merge branch 'master' of github.com:acemod/ACE3 2015-04-16 00:15:57 +02:00
Glowbal
0f4b7d0977 fixes #347 
Please??
 2015-04-16 00:14:05 +02:00
PabstMirror
0076be6a86 Fix stringtables 2015-04-15 17:08:35 -05:00
PabstMirror
c0c5af2957 ballistics - fix ubc 2015-04-15 17:07:06 -05:00
PabstMirror
361efe4147 Missing NoVoice words 
Protocol bin\config.bin/ACE_RadioProtocolNoRadio/: Missing word RallyUp
/ UnderFireE
 2015-04-15 17:04:03 -05:00
Tachii
dd09cc4d06 Update fnc_createAction.sqf 
typo
 2015-04-16 00:57:15 +03:00
ulteq
0b7ceea64e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 22:50:19 +02:00
ulteq
25e1fd2df3 Completely overworked the ATragMX gun list 2015-04-15 22:50:04 +02:00
ulteq
60c54733cc Polished the ammo classes some more 2015-04-15 22:49:47 +02:00
KoffeinFlummi
8aeeff616e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-15 22:21:21 +02:00
KoffeinFlummi
1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
 2015-04-15 22:20:47 +02:00
commy2
fb3ba51fe5 port alternative wirecutter sound 2015-04-15 22:19:43 +02:00
commy2
6f6d080dbd port inject sound 2015-04-15 22:16:54 +02:00
KoffeinFlummi
f020ff7c53 Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disarming/stringtable.xml
 2015-04-15 22:08:15 +02:00
KoffeinFlummi
9e6ae52ca5 Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/captives/stringtable.xml
 2015-04-15 22:07:42 +02:00
KoffeinFlummi
5c3b06b1bf Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-15 22:06:18 +02:00
KoffeinFlummi
234e8e5c40 Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-04-15 21:55:52 +02:00
jaynus
ea3475d388 Merge pull request #631 from FreeZbe/patch-9 
French : update / fix stringtable
 2015-04-15 12:31:03 -07:00
jaynus
9c4e217822 Merge pull request #633 from FreeZbe/patch-10 
French : update stringtable
 2015-04-15 12:29:56 -07:00
jaynus
185f9379fd Merge pull request #639 from FreeZbe/patch-16 
French : update stringtable
 2015-04-15 12:29:37 -07:00
jaynus
ddaf05262e Merge pull request #638 from FreeZbe/patch-15 
French : update stringtable
 2015-04-15 12:29:02 -07:00
jaynus
0a3a650437 Merge pull request #634 from FreeZbe/patch-11 
French : update stringtable
 2015-04-15 12:28:26 -07:00
FreeZbe
5a7ad82170 French : update stringtable 2015-04-15 21:26:12 +02:00
jaynus
2d189e6199 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 12:26:03 -07:00
jaynus
10cf02e856 Slower climb phase.Refs #630 2015-04-15 12:25:57 -07:00
FreeZbe
18c65108c3 French : update stringtable 2015-04-15 21:24:24 +02:00
Nicolás Badano
3e205a70d8 Merge pull request #636 from FreeZbe/patch-13 
French : update stringtable
 2015-04-15 16:18:58 -03:00
Nicolás Badano
e6cc26cc96 Merge pull request #635 from FreeZbe/patch-12 
French : update stringtable
 2015-04-15 16:18:39 -03:00
Nicolás Badano
1678a6d695 Merge pull request #628 from ruPaladin/master 
Russian translation fixes
 2015-04-15 16:17:59 -03:00
FreeZbe
56f6c60e1a French : update stringtable 2015-04-15 21:17:35 +02:00
FreeZbe
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
FreeZbe
c0dbf10971 French : update stringtable 2015-04-15 21:14:00 +02:00
jaynus
5bcb0ec493 Forgot to set terminal on short-range attacks. Fixes #630 2015-04-15 12:09:47 -07:00
commy2
f40373bb78 Merge pull request #550 from acemod/rallypointfix 
fix rallypoints being broken, fix #522
 2015-04-15 21:03:13 +02:00
FreeZbe
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
ulteq
3ca37baf44 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 20:33:19 +02:00
ulteq
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
FreeZbe
bc5b9bdfe9 French : update / fix strintable 2015-04-15 20:11:08 +02:00
PabstMirror
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
PabstMirror
134f48ba55 Merge pull request #602 from acemod/nametagsIsSpeakingPerf 
Nametags - isSpeaking reduce network traffic
 2015-04-15 12:55:15 -05:00
ulteq
d9b3255e21 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:51:40 +02:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
Glowbal
c88479d54d staged work 2015-04-15 19:45:42 +02:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
jaynus
743a6d82a5 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 10:11:18 -07:00
jaynus
25b7f779f1 Difficulty magic. 2015-04-15 10:11:13 -07:00
ruPaladin
26d53d255f Update stringtable.xml 2015-04-15 20:08:39 +03:00
ulteq
396bd3954e Fixed a typo 2015-04-15 19:04:41 +02:00
ruPaladin
fe72eef3da Update stringtable.xml 2015-04-15 20:02:41 +03:00
ulteq
b5a82e313e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:00:24 +02:00
ulteq
0c4734637b Fixed the GM6 barrel length and updated the magazines array 2015-04-15 19:00:14 +02:00
ruPaladin
92031cc354 Update stringtable.xml 2015-04-15 19:59:45 +03:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
ulteq
e0c34f22bf Added ACE_338_Ball_API526 and updated some airFriction values 2015-04-15 18:59:11 +02:00
ruPaladin
3773238e25 Update stringtable.xml 2015-04-15 19:56:34 +03:00
jaynus
2e3545f3d0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 09:55:48 -07:00
jaynus
ea2281616e Enable all variants of Titan. Can now vanilla-lock in cadet mode. 2015-04-15 09:55:40 -07:00
ulteq
64d6bbaf26 Fixed an incorrect BC in an ATragMX gun profile 2015-04-15 18:55:20 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
ruPaladin
d8eb564c65 Update stringtable.xml 2015-04-15 19:52:29 +03:00
ruPaladin
252fb67119 Update stringtable.xml 2015-04-15 19:50:32 +03:00
PabstMirror
e84689a771 #544 - Change ERROR warning to debug trace 2015-04-15 11:46:06 -05:00
PabstMirror
6ea38a9946 Only check A3 VON if no radio mods running 2015-04-15 11:34:27 -05:00
Nicolás Badano
fecb2f37c0 Merge pull request #621 from ruPaladin/patch-5 
Kestrel 4500NV translation to Russian
 2015-04-15 13:28:44 -03:00
Nicolás Badano
0a6604a94f Merge pull request #622 from ruPaladin/patch-6 
addons/interact_menu translation to Russian
 2015-04-15 13:28:33 -03:00
jaynus
a5700540bb Merge pull request #623 from ruPaladin/patch-7 
addons/weather/ translation to Russian
 2015-04-15 09:28:04 -07:00
Nicolás Badano
7589b8b13d Merge pull request #626 from ruPaladin/patch-11 
addons/medical translation to Russian
 2015-04-15 13:27:22 -03:00
jaynus
5923f246fd Fixed: only exit on shooter. 2015-04-15 09:25:19 -07:00
jaynus
c793df4848 Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch. 2015-04-15 09:10:00 -07:00
ruPaladin
a3965424b9 addons/medical translation to Russian 2015-04-15 19:09:10 +03:00
Marco
ad67fca8f4 Update stringtable.xml 2015-04-15 17:45:48 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable 
added spanish translate
 2015-04-15 17:41:10 +02:00
ruPaladin
9caba1e3a3 addons/weather/ translation to Russian 2015-04-15 18:29:38 +03:00
ruPaladin
64504a9515 addons/interact_menu translation to Russian 2015-04-15 18:27:28 +03:00
ruPaladin
6fca601759 Kestrel 4500NV translation to Russian 2015-04-15 18:24:57 +03:00
jaynus
0d28a890e1 Fixes: Cycle fire mode on Titan was not working. Closes #603 2015-04-15 08:19:21 -07:00
Legolasindar
bbc24b6d02 Update stringtable.xml 
added spanish translate
 2015-04-15 16:49:43 +02:00
commy2
9c1b40f5a3 preparing for improved positions of action points 2015-04-15 16:40:20 +02:00
ulteq
98d0c06ce3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 16:22:50 +02:00
ulteq
95b04d0840 Added custom airFriction values for the new marksmen ammo types. 2015-04-15 16:22:42 +02:00
commy2
6710040633 toLower in, always follow your own advice 2015-04-15 16:13:53 +02:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
commy2
bf8f9b4818 all I need is a $ 2015-04-15 15:34:01 +02:00
KoffeinFlummi
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
ulteq
1e326c17ad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 15:06:35 +02:00
commy2
eecf405fda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 15:06:29 +02:00
ulteq
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
commy2
5eededd3e1 Recoil overhaul initial commmit 2015-04-15 15:01:07 +02:00
Nicolás Badano
69489df910 Merge pull request #610 from ramius86/patch-3 
Update stringtable.xml
 2015-04-15 09:57:27 -03:00
Nicolás Badano
527385e6e1 Merge pull request #609 from ramius86/patch-2 
Update stringtable.xml
 2015-04-15 09:57:15 -03:00
KoffeinFlummi
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +02:00
commy2
e3d1946924 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 14:37:49 +02:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers: 
*Wind info
*Protractor
 2015-04-15 12:53:02 +02:00
ulteq
42dbd8f5d2 Continued work on the magazine classes: 
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
 2015-04-15 12:30:48 +02:00
ulteq
bd5ed13621 Added ACE_65x39_Caseless_green_Tracer_Dim 2015-04-15 12:27:20 +02:00
Marco
bc62891122 Update stringtable.xml 
Italian
 2015-04-15 11:24:20 +02:00
Marco
76ff1da57a Update stringtable.xml 
Italian
 2015-04-15 11:19:54 +02:00
Marco
47f8161855 Update stringtable.xml 
Italian
 2015-04-15 11:18:22 +02:00
Marco
924cd80e60 Update stringtable.xml 
ITalian
 2015-04-15 11:13:47 +02:00
Marco
cb2e1c5116 Update stringtable.xml 
Italian
 2015-04-15 11:13:19 +02:00
Marco
5238647021 Update stringtable.xml 
Italian
 2015-04-15 11:12:15 +02:00
Marco
f931c1a42c Update stringtable.xml 
Italian
 2015-04-15 11:10:05 +02:00
Marco
96be1baddc Update stringtable.xml 
Italian
 2015-04-15 11:08:43 +02:00
Marco
8c0f52e615 Update stringtable.xml 
Italian
 2015-04-15 11:08:04 +02:00
Marco
d1936d8e1b Update stringtable.xml 
Italian
 2015-04-15 11:06:42 +02:00
Marco
5c7b8247c5 Update stringtable.xml 
Italian
 2015-04-15 11:05:57 +02:00
Marco
6e7c1ce9d2 Update stringtable.xml 
Ita
 2015-04-15 11:04:18 +02:00
Marco
544894a05e Update stringtable.xml 
Italian
 2015-04-15 10:59:44 +02:00
Marco
9a8dd905f2 Update stringtable.xml 2015-04-15 10:56:39 +02:00
Marco
eceb759523 Update stringtable.xml 
Italian
 2015-04-15 10:53:35 +02:00
Marco
b28ef3d22d Update stringtable.xml 
Italian
 2015-04-15 10:52:40 +02:00
Marco
45fec0409d Update stringtable.xml 
Italian
 2015-04-15 10:51:26 +02:00
Marco
c9e452a000 Update stringtable.xml 
Italian
 2015-04-15 10:48:52 +02:00
Marco
aaee9c72c1 Update stringtable.xml 
Italian translation
 2015-04-15 10:44:13 +02:00
Marco
f328d302e1 Update stringtable.xml 
Italian translation
 2015-04-15 10:42:25 +02:00
Marco
2daa0e2d29 Update stringtable.xml 
Italian translation
 2015-04-15 10:32:01 +02:00
Marco
532ee16411 Update stringtable.xml 
Italian translation
 2015-04-15 10:30:56 +02:00
Marco
af3fdf9b91 Update stringtable.xml 
Italian translation
 2015-04-15 10:28:09 +02:00
commy2
09289fbf48 only on server though 2015-04-15 08:34:30 +02:00
commy2
6c4e50a98d localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot 2015-04-15 08:31:40 +02:00
commy2
44fad81fe1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 06:51:59 +02:00
esteldunedain
69aef53f5b Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-15 01:34:10 -03:00
esteldunedain
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03:00
Nicolás Badano
d7a0503dbc Merge pull request #600 from acemod/lmbmenu 
disable firing if menu is opened, fix #368, close #483
 2015-04-15 01:29:39 -03:00
esteldunedain
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -03:00
PabstMirror
a36739c697 Merge pull request #418 from acemod/flashbangTweaks 
Flashbang tweaks
 2015-04-14 23:23:15 -05:00
esteldunedain
a9f44530c9 Move the function that prevents firing while the interact_menu is open to the interact_menu pbo 2015-04-15 01:20:20 -03:00
PabstMirror
1f51a3fc8a Never use this func anywhere 2015-04-14 23:10:05 -05:00
PabstMirror
428688422e Missing stringtable for listMenu 2015-04-14 22:47:57 -05:00
Niko Lehtovirta
df8a958c42 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-15 06:45:42 +03:00
commy2
d6a293c573 disable firing if menu is opened 2015-04-15 05:19:03 +02:00
esteldunedain
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
esteldunedain
c6c7ef7c79 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 23:22:35 -03:00
esteldunedain
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
jaynus
57acee0f89 Changed: Cleaned up Missile guidance setting for AI, SCALAR. 2015-04-14 19:19:14 -07:00
esteldunedain
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
PabstMirror
00b9e2d72c draw3d 2015-04-14 20:49:44 -05:00
PabstMirror
91c8c89e87 Only sync A3 VON status over network 2015-04-14 20:47:07 -05:00
jaynus
b307b4bc4b Fixed: Flummi missed 2 isClientSettable renames. 2015-04-14 18:38:52 -07:00
jaynus
ad95105508 Added and enabled AMG for AI. 2015-04-14 18:25:02 -07:00
jaynus
ef6d090238 Fixed: JAV_DIR was erroring. 2015-04-14 18:18:38 -07:00
jaynus
37de67395f Fixed: issue where Javelin wouldn't hit > 1500 2015-04-14 18:18:27 -07:00
commy2
2940d1f83c base rallypoints create a respawn marker if none is present in the mission 2015-04-15 03:10:17 +02:00
PabstMirror
1488ba2aac #595 - Hide ace optino button if no world loaded 
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
 2015-04-14 19:52:35 -05:00
commy2
e1926c6af1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:12:16 +02:00
jaynus
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
commy2
29633d763a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:05:55 +02:00
jaynus
fb6553a7a7 Only show distance if laser is on. 2015-04-14 16:57:01 -07:00
commy2
4cdf61ab9e fix misc issues with rallypoints 2015-04-15 01:50:58 +02:00
Grzegorz
d538cd257c PL translation fix 
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
 2015-04-15 01:44:33 +02:00
Nicolás Badano
10b1587453 Merge pull request #592 from gienkov/master 
PL translation
 2015-04-14 20:36:25 -03:00
jaynus
934f2ce097 Display current laser code. Standardize GVARs 2015-04-14 16:29:49 -07:00
esteldunedain
88b78ad3ca Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 20:21:39 -03:00
esteldunedain
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03:00
jaynus
2ec74a6a3e align correctly, create event, remove FCS from laserDesignator. 2015-04-14 16:20:03 -07:00
jaynus
971566fc3e Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER 2015-04-14 16:05:01 -07:00
Grzegorz Sikora
3543b9c806 PL Translation 
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
 2015-04-15 00:43:42 +02:00
jaynus
81e61e2f04 Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591 2015-04-14 15:30:04 -07:00
esteldunedain
2ff6eef792 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:18:08 -03:00
esteldunedain
ad750977e0 Fix ACRE volume on medical unconsciousness 2015-04-14 19:17:05 -03:00
jaynus
10bb77e738 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 15:11:55 -07:00
jaynus
c136b78fc8 rename 20mm 2015-04-14 15:11:49 -07:00
esteldunedain
495c822061 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
 2015-04-14 19:09:57 -03:00
commy2
7c5a6538a9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 00:06:12 +02:00
jaynus
36ebb96531 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:58:29 -07:00
jaynus
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
Felix Wiegand
5d8dd701d2 Merge pull request #518 from acemod/basic-medical-tweaks 
Basic medical tweaks
 2015-04-14 23:49:00 +02:00
jaynus
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
commy2
4c6cc8dddf merging stringtables 2015-04-14 23:22:25 +02:00
KoffeinFlummi
9b80245479 Fix speed limiter not working 2015-04-14 23:13:02 +02:00
KoffeinFlummi
8b1bce3b3d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 23:00:59 +02:00
KoffeinFlummi
9e64538bc7 Fix minor adjustment strings 2015-04-14 23:00:17 +02:00
KoffeinFlummi
f07949cf19 Remove some old todos 2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732 Remove hitpart from action names for non-self 2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a Buff colour flashing effect 2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6 Tweak crate names 2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215 Missing stringtable entries 2015-04-14 22:34:08 +02:00
ulteq
8aad369ed3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 22:23:56 +02:00
ulteq
035ed573b8 Reworked the magazine configs 2015-04-14 22:23:36 +02:00
ulteq
1d64b8c36e Added the new magazines into various ammo boxes 2015-04-14 22:22:36 +02:00
ulteq
e214511e36 Added new magazine classes: 
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
 2015-04-14 22:19:51 +02:00
ulteq
f0a716fee8 Added new ammo classes: 
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
 2015-04-14 22:17:27 +02:00
KoffeinFlummi
7af6ea36a6 Fix missing pain effect option name 2015-04-14 22:07:43 +02:00
KoffeinFlummi
348bf611f8 Merge branch 'master' into basic-medical-tweaks 2015-04-14 21:55:45 +02:00
KoffeinFlummi
684c36f8a5 Add pain effect option 2015-04-14 21:49:56 +02:00
Nicolás Badano
462947a04c Merge pull request #585 from acemod/fix-clientSetable 
Fix spelling of "isClientSetable"
 2015-04-14 16:48:50 -03:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
KoffeinFlummi
e7807c009f Use playerInventoryChanged instead of Take 
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
 2015-04-14 21:28:18 +02:00
Glowbal
af255604ac Switched to event based sync system for open wounds 2015-04-14 21:17:36 +02:00
jaynus
2f2eab87e2 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 11:42:38 -07:00
jaynus
739807303b Fix script error for canceling designation and dying while designating. 2015-04-14 11:42:26 -07:00
KoffeinFlummi
71b19b4621 Remove duplicate bleeding code 2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4 Merge branch 'master' into basic-medical-tweaks 2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65 Always show wounds, even for very low damage 2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2 Add seperate crates for basic and advanced 2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e Style fixes 2015-04-14 20:27:42 +02:00
jaynus
0ae27d16c5 Merge pull request #580 from acemod/seeker_fov 
Seeker FOV check optimizations
 2015-04-14 11:19:00 -07:00
jaynus
24830f815f random lock interval was causing phasing. 2015-04-14 11:18:16 -07:00
ulteq
cf7caf4549 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 20:18:03 +02:00
ulteq
837f155ad7 Fixed incorrect key handler return value 2015-04-14 20:17:54 +02:00
jaynus
1dd41a00ba integration. 2015-04-14 10:51:53 -07:00
jaynus
226312c504 Merge remote-tracking branch 'origin/master' into seeker_fov 
Conflicts:
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
 2015-04-14 10:47:40 -07:00
jaynus
511ca860e0 Merge pull request #579 from acemod/moreJavelinLockingFixes 
More javelin locking + UI fixes
 2015-04-14 10:40:51 -07:00
jaynus
fb5b524023 Loosen DAGR curve 2015-04-14 10:39:00 -07:00
jaynus
f0940707be Disable locking on unloaded. Closes #539 2015-04-14 10:27:37 -07:00
jaynus
6f3ce27894 Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite 2015-04-14 10:25:08 -07:00
jaynus
c436541f1c Reworked, fun fun. 2015-04-14 09:36:39 -07:00
jaynus
376f924999 Finish guidance rewrite. 2015-04-14 08:24:13 -07:00
Nicolás Badano
a93cb310d4 Merge pull request #513 from acemod/mainCleanup 
ACE_Main major cleanup
 2015-04-14 10:25:14 -03:00
esteldunedain
c827c72412 AB and Kestrel: Move macros from defines.h to script_component 2015-04-14 10:22:26 -03:00
KoffeinFlummi
57c526c04d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 15:12:46 +02:00
KoffeinFlummi
c1fccecb21 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 15:12:24 +02:00
Nicolás Badano
85d253cdc1 Merge pull request #574 from gienkov/master 
Advanced Ballistics PL translation
 2015-04-14 10:10:59 -03:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
commy2
ea7659a36e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-14 13:36:02 +02:00
commy2
f89e02a5ca fix no laser in ffv slots 2015-04-14 13:24:17 +02:00
commy2
83ce3fa2bd remove drawline3d 2015-04-14 13:14:37 +02:00
ulteq
994071960c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 12:52:30 +02:00
ulteq
1a39005e72 Removed debug output. 2015-04-14 12:52:21 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
Coren4
83c8abb3ba Update stringtable.xml 2015-04-14 12:41:35 +02:00
ulteq
44232987b0 Commented out deprecated icon paths 2015-04-14 12:34:27 +02:00
ulteq
3d558f376f Fixed some icon path names 2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
864a3c3cda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-04-14 11:14:27 +02:00
ulteq
5a7078ad2c Removed a deprecated workaround 2015-04-14 11:12:58 +02:00
ulteq
9f0388fa12 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-14 11:09:38 +02:00
ulteq
983a36e52d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-14 11:06:32 +02:00
ulteq
d931745f5c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-14 11:02:37 +02:00
ulteq
2f39067cb3 Removed TABs 2015-04-14 10:47:09 +02:00
jaynus
22d90fee9a Begin modelToWorld work. 2015-04-13 16:47:09 -07:00
jaynus
761fef39c8 working save. 2015-04-13 15:34:51 -07:00
commy2
3da3543381 toggle laser vs ir laser 2015-04-14 00:32:09 +02:00
Harakhti
e7e46b3b59 Translation: S to W 
That's all I've found so far.
 2015-04-14 00:05:39 +02:00
Harakhti
8bfd915ec4 Translation: N to R 
This was a lot more fun than the previous two were. 12 folders left...
 2015-04-13 23:45:44 +02:00
commy2
c95bd42a19 Merge pull request #548 from acemod/opticsfix 
fix misc issues with optics, fix #537
 2015-04-13 23:22:12 +02:00
ulteq
acc021c11c Replaced TABs and newline braces 2015-04-13 23:10:55 +02:00
Harakhti
1b60a335a5 Translation: J to M 
I feel burned out. This was very specifically long and tedious.
 2015-04-13 23:03:09 +02:00
commy2
b72366f0f6 hide laser beam during day 2015-04-13 22:34:43 +02:00
commy2
ada62fca7d reloading launchers didn't work on remote clients 2015-04-13 21:38:01 +02:00
ulteq
c2ac7fc547 Removed magazines module 2015-04-13 21:37:19 +02:00
ulteq
33a06c5706 Updated stringtable 2015-04-13 21:36:47 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
 2015-04-13 21:35:53 +02:00
ulteq
1073f4e484 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 
Conflicts:
	AUTHORS.txt
 2015-04-13 21:33:12 +02:00
ulteq
032d745334 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-13 21:32:09 +02:00
ulteq
fa88ab484e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/stringtable.xml
 2015-04-13 21:31:04 +02:00
Nicolás Badano
db6361a086 Merge pull request #565 from Kllrt/master 
Added another new CZ strings
 2015-04-13 16:25:32 -03:00
ulteq
ea78a6325f Changed the module setting defaults 2015-04-13 21:20:07 +02:00
ulteq
1b2691ff1c Fixed incorrect calculation of the scope adjustment limits 2015-04-13 21:17:30 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes: 
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
 2015-04-13 21:08:31 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Harakhti
3c3f6ba4c3 Translation: A to I 
Some parts filled out, other parts corrected or stylized.
 2015-04-13 19:28:58 +02:00
commy2
bd168981e2 how do I merge 2015-04-13 19:23:42 +02:00
bux578
0e6eb46bb4 Merge pull request #560 from gienkov/master 
Further PL translation fixes
 2015-04-13 19:18:54 +02:00
commy2
fa64225e55 Merge pull request #505 from acemod/muteunit 
Muteunit framework, fix #473
 2015-04-13 19:18:45 +02:00
commy2
f48b6dc77a Merge pull request #519 from acemod/marksmenai 
increase engagement ranges / burst mode on new mmg / full auto dmr
 2015-04-13 19:18:40 +02:00
Grzegorz
2cd456432e Update stringtable.xml 2015-04-13 19:17:42 +02:00
Grzegorz
5269f32d62 weird but fixed 
Something went wrong there, but fixed
 2015-04-13 19:11:39 +02:00
jaynus
ff858c1194 Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways. 2015-04-13 09:56:15 -07:00
jaynus
e5d8fe2634 Guidance timing per FPS fixes. 2015-04-13 09:24:28 -07:00
jaynus
3e7c8ca634 remove optic debug. 2015-04-13 09:03:19 -07:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
jaynus
6aa9f5bcbc NFOV/WFOV 2015-04-13 09:01:18 -07:00
jaynus
c66f99faac Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539 2015-04-13 08:59:36 -07:00
jaynus
2d6b2f9a1a I had accidently commented out seeker FOV on the Titan rockets. 2015-04-13 08:33:03 -07:00
Grzegorz
ec381699ca fix missing class 
Am I doin it right?
Works for me.
 2015-04-13 16:48:14 +02:00
bux578
cba66366bd fix invalid xml 2015-04-13 15:25:51 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
ulteq
c12cc24a78 TABS: 
* "kill them with fire"
* "then kill them again, with a rusty spoon"
 2015-04-13 14:48:31 +02:00
ulteq
d8c23c2a64 Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp 2015-04-13 14:46:21 +02:00
Niko Lehtovirta
21c9272293 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-13 15:37:38 +03:00
KoffeinFlummi
363a6b3738 Fix erroneus tag in nametags stringtable 
Re: f6c7d444
 2015-04-13 14:32:55 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
commy2
f94b4befef initial commit 2015-04-13 13:04:23 +02:00
KoffeinFlummi
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
ulteq
5354d6578b Simplified the AB PFH massively 2015-04-13 12:56:53 +02:00
ulteq
63760acc4f Added an error message when the ab extension is missing 2015-04-13 12:56:18 +02:00
ulteq
c8aa3032fe Added some sanity checks to the module setting initialization 2015-04-13 12:54:06 +02:00
commy2
fce7c4d0be manual merge 2015-04-13 12:52:47 +02:00
commy2
0214d891e1 fix misc issues with optics, fix #537 2015-04-13 12:04:43 +02:00
ulteq
4355df118c Refactored the Kestrel4500 Code. 2015-04-13 11:53:19 +02:00
Kllrt
915ac46e04 Very small typo in CZ translation 
-.-
 2015-04-13 11:00:47 +02:00
ruPaladin
ccc2124abe Russian translation for addons/interaction 
Fix for addons/interaction translation.
 2015-04-13 11:53:15 +03:00
PabstMirror
bf3e3d3b64 #542 - ACE_fakeWeapon not found 2015-04-13 03:46:42 -05:00
ulteq
c98422b2c6 Shrinked some of the .paa files 2015-04-13 10:45:37 +02:00
ulteq
deadbd9414 Reduced the amount of LOD levels of the Kestrel 2015-04-13 10:39:31 +02:00
ulteq
939365a376 New texture for the Kestrel model 2015-04-13 10:39:14 +02:00
PabstMirror
7111cdd8ff #540 - remove debug spam 2015-04-13 03:16:33 -05:00
PabstMirror
2a015482a1 Old Interaction Events (1713999 is long dead) 2015-04-13 01:03:08 -05:00
PabstMirror
878bdadbb3 Switch clientInit to postInit 2015-04-13 00:46:45 -05:00
PabstMirror
70dbae5a25 #527 - Unconscious switching groups 2015-04-13 00:32:07 -05:00
PabstMirror
669dbe10c9 BecomeLeader - Don't create new group 2015-04-13 00:23:00 -05:00
Nou
b58598c6aa Woops, missing ) 2015-04-12 21:47:27 -07:00
PabstMirror
b50a7a0147 Try to fix degree symbol (encoding issue) 2015-04-12 22:56:46 -05:00
PabstMirror
7719da2f66 Javelin Localiztion 2015-04-12 22:45:55 -05:00
PabstMirror
36b92b3d44 Don't do client stuff on dedicated. 2015-04-12 22:44:19 -05:00
Nou
4c74ff8717 FOV check made faster. 2015-04-12 19:49:14 -07:00
Nou
dc5028275a Seeker FOV implemented, fast FOV check. 2015-04-12 19:16:58 -07:00
Anthariel
3e8c8384cf Update stringtable.xml 
Missing translation
 2015-04-13 02:24:13 +02:00
Anthariel
8339d15087 Update stringtable.xml 
Added: French translations (note, I've already removed a % at the line 30
 2015-04-13 02:21:57 +02:00
Anthariel
7a8cd684a3 Update stringtable.xml 2015-04-13 02:19:58 +02:00
Anthariel
2939862e8c Update stringtable.xml 2015-04-13 02:12:56 +02:00
Anthariel
d9f9dffbc0 Update stringtable.xml 2015-04-13 02:11:12 +02:00
Anthariel
e176df4636 Update stringtable.xml 2015-04-13 02:10:23 +02:00
Anthariel
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
Anthariel
161866a8e5 Update stringtable.xml 2015-04-13 02:05:36 +02:00
Anthariel
67be340360 Update stringtable.xml 2015-04-13 02:05:15 +02:00
Nou
8df26b3246 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 17:03:16 -07:00
Nou
98acdc4089 M22 binocular mil reticle ported from ACE2. 2015-04-12 17:03:11 -07:00
Anthariel
77058857e6 Update stringtable.xml 
Wrong translation
 2015-04-13 02:02:19 +02:00
jaynus
7c6b84b1f1 Begin laserdesignator UI changes. 2015-04-12 16:52:10 -07:00
jaynus
0c3caffe89 Merge pull request #501 from acemod/network_lasers 
Break all the lasers. Continuing expansion work is in #535
 2015-04-12 16:47:24 -07:00
jaynus
fd4cb50d3d Remove thermal, prep for coding. 2015-04-12 16:44:39 -07:00
jaynus
db5d54dffd Only allow for laser designator for vanilla compensation. 2015-04-12 16:38:43 -07:00
Anthariel
0e925bc006 Update stringtable.xml 2015-04-13 01:31:49 +02:00
Anthariel
bd28f08559 Update stringtable.xml 2015-04-13 01:30:50 +02:00
Anthariel
c2253cf199 Update stringtable.xml 2015-04-13 01:30:16 +02:00
PabstMirror
74967910a3 opps 2015-04-12 18:27:55 -05:00
PabstMirror
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -05:00
jaynus
9a25fb4f2f Remove debug. 2015-04-12 16:19:18 -07:00
jaynus
4bd489cd96 Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531 2015-04-12 16:18:39 -07:00
Anthariel
9bb865a73f Update stringtable.xml 2015-04-13 01:18:24 +02:00
Anthariel
2ec9b94083 Update stringtable.xml 
Fixed: Wrong translation (thx Dirtyhank)
 2015-04-13 01:18:04 +02:00
Anthariel
638868b3da Update stringtable.xml 
Added: French translation (100%).
 2015-04-13 00:41:50 +02:00
ulteq
95e7f66a46 Added a model for the Kestrel 4500 
*We might want to use a smaller one in the future ...
 2015-04-13 00:17:59 +02:00
PabstMirror
807ebd8bfe Resave reticle_titan in objectBuilder 2015-04-12 17:14:30 -05:00
ulteq
2040f4dcc3 Improved the wind speed calculation if AB is not enabled 2015-04-12 23:25:58 +02:00
ulteq
3c25fd4008 Fixed a typo 2015-04-12 23:20:54 +02:00
ulteq
e3aa9b3d22 Added a RSC preload class 2015-04-12 23:20:27 +02:00
jaynus
509b5e1a05 Integration of lasers for vanilla laser designation as well. Remove debug. 2015-04-12 14:12:21 -07:00
jaynus
c9e2eb0869 Changed: no-crosshair reticle for Titan by BlackPixxel 2015-04-12 14:05:12 -07:00
ulteq
7797cd9a38 Added missing abs() 2015-04-12 23:03:20 +02:00
jaynus
2317a3c988 Visually hide laser targets. 2015-04-12 14:03:15 -07:00
ulteq
705017f222 Implemented the Kestrel4500 spinning wheel animation 2015-04-12 22:54:36 +02:00
licht-im-Norden87
075b52c1ff Update stringtable.xml 2015-04-12 22:53:02 +02:00
jaynus
2e83e56a73 Seeker integration. 2015-04-12 13:02:09 -07:00
PabstMirror
38c3f43dd6 Fix UBC 
Updating base class Turrets->, by
z\ace\addons\missileguidance\config.bin/CfgVehicles/B_Heli_Attack_01_F/Turrets/
 2015-04-12 14:39:49 -05:00
jaynus
5251de8447 break out seeker angle check. more laser code cleanup. 2015-04-12 12:16:26 -07:00
simon84
51bc7208bc German translation 
Some german translations and corrections
 2015-04-12 20:52:15 +02:00
jaynus
9287d6fe44 Remove dead code. 2015-04-12 11:46:28 -07:00
jaynus
7f0e54b9c3 More defaults. 2015-04-12 11:43:37 -07:00
jaynus
197b13e6d9 Use current codes for FCS updates. 2015-04-12 11:41:50 -07:00
jaynus
9273a32d23 code cleanup, default laser parameters, getVariable self designation specifics. 2015-04-12 11:38:07 -07:00
jaynus
6be8cc8d84 Removed: Laser visuals 
Updated: comments and function defs
Changed: pass function name, not full code.
 2015-04-12 11:29:33 -07:00
jaynus
887e1d1d99 Remove optional laser visual. 2015-04-12 11:14:12 -07:00
jaynus
16cd05edc8 Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers 2015-04-12 11:01:27 -07:00
jaynus
01797fd3b9 Integarate laser code into SALH guidance + self_designate. Note todo items. 2015-04-12 11:01:22 -07:00
Nou
4a23b8be00 Allow string function names. 2015-04-12 10:52:50 -07:00
nomisum
ca27e6eb5a fixed typo 
`Erweitertes Raketenlenksystem` shoud be a nominalization
 2015-04-12 19:52:37 +02:00
ulteq
40e013ed6d Added SORD interface (Connection to the Vectronix Vector LRF) 2015-04-12 19:51:13 +02:00
nomisum
b1c29f82c2 improved/added german translation 
Imho `Raketenlenksystem` is the best fitting german translation for missile guidance. `Raketenlenkung` sounds a bit too colloquial.
 2015-04-12 19:41:44 +02:00
commy2
10c32f264e increase engagement ranges / burst mode on new mmg / full auto dmr 2015-04-12 18:21:28 +02:00
Anthariel
45f3300967 Update stringtable.xml 
Added: Missing french translation.
 2015-04-12 18:20:32 +02:00
Anthariel
8d79fd242a Update stringtable.xml 
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
 2015-04-12 18:18:52 +02:00
Anthariel
3db8f4ad44 Update stringtable.xml 
Added: Some missing french translation.
 2015-04-12 18:10:41 +02:00
Anthariel
3ee421a233 Update stringtable.xml 
Wrong french translation for the line 173.
 2015-04-12 18:08:06 +02:00
KoffeinFlummi
664cc7077d Reduce blood loss rate 2015-04-12 18:06:57 +02:00
KoffeinFlummi
6062128436 Remove tourniquet option, add check pulse/response 2015-04-12 18:01:29 +02:00
KoffeinFlummi
f794eaac43 Merge branch 'master' into basic-medical-tweaks 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/functions/fnc_handleDamage_basic.sqf
	addons/medical/stringtable.xml
 2015-04-12 18:00:22 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml 
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
 2015-04-12 17:55:53 +02:00
ulteq
6b44a3f3f9 Updated the module settings init script 2015-04-12 16:31:12 +02:00
ulteq
e003db2454 Fixed a typo 2015-04-12 16:27:24 +02:00
ulteq
e99fb398ae Added simulation interval setting to the ab module 2015-04-12 16:25:01 +02:00
ulteq
8f2261acdd Removed debug output 2015-04-12 16:19:39 +02:00
ulteq
ebb34a4f21 New default simulation interval of 0.05s 2015-04-12 16:19:32 +02:00
ulteq
aff9d7c554 Fixed a syntax error / Removed debug output 2015-04-12 16:17:49 +02:00
esteldunedain
d6ec8d771e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b Only display "Surrender" action if the player is not holding a weapon. 2015-04-12 11:13:54 -03:00
ulteq
9f0a2c8b80 The terrain init script now aborts if no extension is found 2015-04-12 16:10:45 +02:00
esteldunedain
3ee18f9a3a Readd CfgModuleCategories.hpp 2015-04-12 11:06:25 -03:00
esteldunedain
e7f9245d7e ACE_Main major cleanup 2015-04-12 10:54:18 -03:00
licht-im-Norden87
fef0d690f8 Update stringtable.xml 2015-04-12 15:25:18 +02:00
licht-im-Norden87
36ba507ab5 Update stringtable.xml 2015-04-12 14:52:37 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Glowbal
019163c9ce Merge pull request #489 from acemod/medicalPerformanceImprovements 
Medical performance improvements
 2015-04-12 14:44:18 +02:00
licht-im-Norden87
94eb4f3dd5 Update stringtable.xml 2015-04-12 14:42:15 +02:00
Ivan Navarro Cabello
e7a8dde782 update stringtable for spanish 
added new spanish terms
 2015-04-12 14:41:50 +02:00
licht-im-Norden87
38955692ff Update stringtable.xml 2015-04-12 14:40:04 +02:00
licht-im-Norden87
dbc7026d94 ..... 2015-04-12 14:38:04 +02:00
licht-im-Norden87
b144a42e63 Update stringtable.xml 2015-04-12 14:30:40 +02:00
Legolasindar
2c0e93271c Update stringtable.xml 
added spanish translate
 2015-04-12 14:29:47 +02:00
KoffeinFlummi
8f2a1735ae Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 14:28:28 +02:00
KoffeinFlummi
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge 
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-12 14:27:59 +02:00
Legolasindar
4bb9f0cf77 Update stringtable.xml 
added spanish translate
 2015-04-12 14:27:42 +02:00
licht-im-Norden87
a04abcf972 Update stringtable.xml 2015-04-12 14:25:41 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations 
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
 2015-04-12 14:15:45 +02:00
licht-im-Norden87
400b8f4270 Update stringtable.xml 2015-04-12 14:14:48 +02:00
licht-im-Norden87
8f88158a2e Update stringtable.xml 2015-04-12 14:13:38 +02:00
licht-im-Norden87
88a71042e3 Update stringtable.xml 2015-04-12 14:12:05 +02:00
licht-im-Norden87
a3f97efbc3 Update stringtable.xml 
What does WDG and MGRS mean?
 2015-04-12 14:07:49 +02:00
licht-im-Norden87
e4ec9d14d4 Update stringtable.xml 2015-04-12 14:00:56 +02:00
licht-im-Norden87
15e9b2cccc Update stringtable.xml 2015-04-12 13:59:09 +02:00
Legolasindar
b665781399 Update stringtable.xml 
updated spanish translation and added some english missed translation
 2015-04-12 13:58:06 +02:00
licht-im-Norden87
6b39edbddf Update stringtable.xml 2015-04-12 13:58:02 +02:00
commy2
56de4f05f3 scripts for vector illum, renaming some files 2015-04-12 13:56:01 +02:00
licht-im-Norden87
a01c4a0e0b Update stringtable.xml 2015-04-12 13:55:55 +02:00
licht-im-Norden87
2222192aee Update stringtable.xml 2015-04-12 13:51:47 +02:00
licht-im-Norden87
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
nic547
0f1115c33b Added new Ammotypes into the AGM crate 2015-04-12 13:08:50 +02:00
commy2
83e634be8a illuminate vector number textures at night 2015-04-12 12:54:36 +02:00
ulteq
9fd19563a3 Fixed several syntax errors 2015-04-12 12:52:13 +02:00
ulteq
fd737f3f95 Minor code optimization 2015-04-12 12:36:05 +02:00
ulteq
cf88adb794 Replaced wind with ACE_wind 2015-04-12 12:34:42 +02:00
ulteq
85a7bea42b Added wind deflection module settings: 
*simulationInterval
*simulationRadius
 2015-04-12 12:33:09 +02:00
ulteq
a993f2d5f1 Minor code optimization 2015-04-12 12:15:39 +02:00
ulteq
cb0df8783a Fixed a calculation error 2015-04-12 12:09:55 +02:00
commy2
7b0e7a1efb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 12:04:07 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
ulteq
1c8da72716 Removed debug output 2015-04-12 11:59:45 +02:00
ulteq
879c6b42b9 Finished the advanced ballistics module settings 2015-04-12 11:59:02 +02:00
ulteq
c532742a5b Overworked the module settings (WIP) 2015-04-12 11:48:21 +02:00
commy2
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
Kllrt
be8ff39767 Fixed broken missileguidaince stringtable.xml 
sry
 2015-04-12 10:58:00 +02:00
commy2
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
Glowbal
6bfd3e5c74 Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying 
Fixed breaking of unconscious animation on drop object.
 2015-04-12 09:48:27 +02:00
commy2
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
esteldunedain
dfea99debf Switch "Team" for "Group" 2015-04-12 01:32:03 -03:00
esteldunedain
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment 
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
 2015-04-12 01:26:55 -03:00
esteldunedain
654ab4daf5 Remove >> from attach actions 2015-04-12 01:24:42 -03:00
esteldunedain
0420a94938 Streamline Team management actions 2015-04-12 01:19:38 -03:00
esteldunedain
630a2a0f7a Make the list menu optional via a client setting 2015-04-12 01:15:38 -03:00
esteldunedain
01bc6b233a Merge branch 'breakLineExtension' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
 2015-04-12 00:21:05 -03:00
esteldunedain
7b797d906f Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/overheating/stringtable.xml
 2015-04-12 00:19:33 -03:00
Nou
40c5de8cfb Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:14:03 -07:00
Nou
db3f816843 Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:13:52 -07:00
PabstMirror
18cd0e7f39 Use DisableAI from common 2015-04-11 21:48:12 -05:00
PabstMirror
c3c815db8d Better LOS check 2015-04-11 21:42:57 -05:00
esteldunedain
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
KoffeinFlummi
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
PabstMirror
8fc3b53507 Use new medical func 2015-04-11 21:22:34 -05:00
PabstMirror
3be70556ab Medical: adjustPainLevels from outside functions 2015-04-11 21:21:33 -05:00
KoffeinFlummi
5101a21beb Remove "Original" stringtable entries 2015-04-12 04:21:06 +02:00
Nou
e4c459132b Merge branch 'master' into network_lasers 2015-04-11 18:36:57 -07:00
Nou
8386c0e22a Seeker system and network enabled laser simulation. 2015-04-11 18:36:10 -07:00
licht-im-Norden87
a30eabfb1d Update stringtable.xml 2015-04-12 03:30:11 +02:00
licht-im-Norden87
bd673d3374 Update stringtable.xml 2015-04-12 03:28:12 +02:00
licht-im-Norden87
bd07e18b43 Update stringtable.xml 2015-04-12 03:26:45 +02:00
esteldunedain
d06e1b4a2a Break line extension 2015-04-11 22:22:19 -03:00
PabstMirror
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
Felix Wiegand
0531f2cc12 Merge pull request #493 from FreeZbe/patch-7 
Update stringtable.xml
 2015-04-12 01:14:40 +02:00
esteldunedain
a01864319a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 19:34:53 -03:00
esteldunedain
488000bdf3 Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494 2015-04-11 19:34:29 -03:00
PabstMirror
baf4b0146e Missing semmicolon 2015-04-11 16:50:35 -05:00
PabstMirror
0805d5b640 Update UAV battery icon from AGM 2015-04-11 16:48:49 -05:00
ulteq
ef0884c49d Added comments to all ATragMX functions 2015-04-11 23:40:46 +02:00
FreeZbe
3ff6abde71 Update stringtable.xml 2015-04-11 23:18:51 +02:00
jaynus
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
jaynus
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-11 14:01:47 -07:00
jaynus
6e28b3b9b7 Disable gates (reload) 2015-04-11 13:59:17 -07:00
jaynus
d744074b2f localization. 2015-04-11 13:48:46 -07:00
Glowbal
e00f0ea4c3 No longer creates a new waitAndExec for every handleDamage call 2015-04-11 22:47:10 +02:00
jaynus
2418d99f97 Finalizes port. Closes #75 2015-04-11 13:41:00 -07:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
jaynus
2999ff55e1 Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d. 2015-04-11 13:37:55 -07:00
ulteq
05f14d6242 Added AdvancedBallistics module options 2015-04-11 22:34:19 +02:00
Glowbal
97fa40b4c1 Make use of new global variables for selections and hitpoints 2015-04-11 22:31:38 +02:00
Glowbal
6cc115a628 We already determine the new damage in caching, so we will use that value instead of recalculating it here 2015-04-11 22:31:17 +02:00
Glowbal
e8d2a00994 Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables 
No longer have to recreate the selection and hitpoint arrays every time
 2015-04-11 22:30:52 +02:00
Glowbal
c69f71ba71 formatting 2015-04-11 22:29:32 +02:00
Glowbal
51906e341d Removed unused variables 2015-04-11 22:29:11 +02:00
jaynus
505005891d Remove debug, targeting constraints working. 2015-04-11 12:42:30 -07:00
Glowbal
082ab5155e Minor performance improvements 
Before avg: 0.0858495ms
After avg: 0.0701045ms
 2015-04-11 21:27:49 +02:00
PabstMirror
f5cce94b91 Merge pull request #136 from acemod/disarmingTest 
Unit Disarming/DropGear Merge
 2015-04-11 14:14:22 -05:00
ulteq
e108598b36 Added a model for the ATragMX 2015-04-11 21:01:38 +02:00
nic547
63e5247d3b more ammotypes for the mags 2015-04-11 21:00:41 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
Glowbal
66bd7e7e5f fixed #457 2015-04-11 20:32:07 +02:00
commy2
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
jaynus
458958ef09 Target gating implemented. 2015-04-11 11:17:34 -07:00
Glowbal
24765741ab Enabled setAccTime fix from commy 2015-04-11 20:05:22 +02:00
jaynus
aa53a1815c scaling. 2015-04-11 10:58:27 -07:00
jaynus
fb6c99d69b re-path. Wtf safezones. 2015-04-11 10:56:58 -07:00
Glowbal
dd7e746368 formatting 2015-04-11 19:52:30 +02:00
ulteq
5c5f41cf5b AB is now disable by default 2015-04-11 19:51:58 +02:00
ulteq
9893d940df Disabled advanced scope zeroing if AB is not enabled 2015-04-11 19:47:14 +02:00
ulteq
1ff7218903 Change the Kestrel 4500 behavior 'back to normal' when AB is disabled 2015-04-11 19:44:38 +02:00
jaynus
efaee770bb rename wep_javelin to javelin 2015-04-11 10:44:13 -07:00
Kllrt
12f87013b2 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 19:38:28 +02:00
Niko Lehtovirta
4b50d760e9 fixed to use proper 4-space tabbing 2015-04-11 20:36:38 +03:00
Niko Lehtovirta
0e0935ac01 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 20:28:04 +03:00
ulteq
2b0a0145c5 Removed the last spawn/sleep commands from AB 2015-04-11 18:39:15 +02:00
Felix Wiegand
0bf32bfb3a Merge pull request #476 from acemod/dropbackpack 
function to drop backpack
 2015-04-11 18:23:27 +02:00
commy2
e1bf475355 Merge pull request #419 from acemod/cfgtriggers 
rename cfgAce_Triggers to ACE_Triggers
 2015-04-11 18:19:36 +02:00
ulteq
44198b18d7 Rewrite of the terrain initialization: 
*Replaced spawn/sleep with a PFH
 2015-04-11 18:18:38 +02:00
commy2
4dc38ca7ee Merge pull request #395 from acemod/flashsup 
flashsupressors for new weapons, #264
 2015-04-11 18:18:05 +02:00
Kllrt
56681e632d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 16:36:31 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 11:12:56 -03:00
esteldunedain
b8e0388581 Fix nearestObjects with getPos choking over seawater. Fix #465 2015-04-11 11:12:40 -03:00
commy2
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
ulteq
23733263ea Updated the extension file name 2015-04-11 15:06:30 +02:00
nic547
a37cd51fe7 more stuff 
- added more ammotypes
- stringtable now follows guideline
 2015-04-11 15:02:56 +02:00
ulteq
d7a40bfba2 Replaced all execVM calls with FUNC() 2015-04-11 14:51:40 +02:00
ulteq
a36bd588d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-11 14:31:23 +02:00
ulteq
fee65cd56f Overhauled the scope adjustment module: 
*Added configs for the new marksmen scopes
*Introduced minor and major steps
*Introcuded a new increment config (ACE_ScopeAdjust_Increment)
*Changed the default zero range to 100m
*Added a zero reference setting
*Added an interaction menu entry to update the zero reference setting
 2015-04-11 14:02:44 +02:00
Niko Lehtovirta
4a7358e05a Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 14:30:40 +03:00
commy2
5a5a1fd66a ACE_optic_SOS_PIP - iron sight was missing, fix #470 2015-04-11 13:18:45 +02:00
VyMajoris
9d326ce9a5 Added - Portuguese translation to magazineRepack 2015-04-11 03:10:39 -03:00
VyMajoris
31a9897952 Added - Portuguese translation to wirecutter 2015-04-11 03:07:15 -03:00
PabstMirror
b5e5359795 CursorCentered - Localizations 2015-04-11 00:35:18 -05:00
PabstMirror
ae064359f6 Remove Debug 2015-04-10 23:51:07 -05:00
PabstMirror
0edcf03e12 Handle Vehicle Attunation 2015-04-10 23:21:54 -05:00
PabstMirror
dac3047fca Use AllVehicles Instead of CAManBase 2015-04-10 22:16:33 -05:00
PabstMirror
787df67248 Merge branch 'master' into disarmingTest 2015-04-10 19:20:34 -05:00
Tenga
e7b5218d52 Altimeter fix, division by zero when no time has passed (game paused, etc.) 2015-04-11 00:14:06 +02:00
jaynus
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
jaynus
721898d9fb Constraint dialogs working. 2015-04-10 13:57:44 -07:00
commy2
11ad74735c Merge pull request #458 from Tenga/master 
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
 2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func) 
Still some small head movements, but I don't know how to fix that.
 2015-04-10 15:02:40 -05:00
Tenga
b710c2543e Return the newline to fnc_externalCamera.sqf 2015-04-10 21:59:28 +02:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master 
Count the commander camera as a 3rd person camera
 2015-04-10 21:54:52 +02:00
Tenga
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c - Added isFeatureCameraActive to ace_common 
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
 2015-04-10 21:48:24 +02:00
jaynus
83b453a294 Merge pull request #379 from acemod/allTheMissiles 
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
 2015-04-10 12:48:10 -07:00
jaynus
8429b262f2 more debug removal, backup vanilla usage. 2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562 #441 - Crash with no model on ace_fakeweapon 2015-04-10 14:35:08 -05:00
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +02:00
esteldunedain
ee8af7f153 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-10 16:21:27 -03:00
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 16:20:18 -03:00
FreeZbe
e09a3b29d7 Update stringtable.xml 2015-04-10 21:20:09 +02:00
jaynus
5577a541ca Add example. 2015-04-10 12:19:02 -07:00
jaynus
0225cb510c Add missile strings. 2015-04-10 12:16:18 -07:00
Riccardo Petricca
d9e78e511e Added italian translation to the last terms. 
Added italian translation to the last added terms.
 2015-04-10 21:13:03 +02:00
jaynus
391b1556cb Disable all debug. 2015-04-10 12:12:25 -07:00
FreeZbe
4dbba270f9 Translations fixes 2015-04-10 21:07:38 +02:00
nic547
a4b9090e34 Added new ammotypes for both types of .388 ammo 2015-04-10 21:01:49 +02:00
jaynus
bcb7d18e7e remove debug. 2015-04-10 11:57:50 -07:00
jaynus
c28ac5b4a9 Compensate for target velocity. 2015-04-10 11:40:18 -07:00
jaynus
5083a5a0d2 Javelin locking fire modes were reversed. 2015-04-10 11:37:03 -07:00
ruPaladin
8ea96b3086 Update stringtable.xml 2015-04-10 21:21:40 +03:00
ulteq
127d100628 Overworked the scope adjustment keybinds: 
*Fixed duplicate actionIDs
*Introduced minor/major steps
*Reset the stringtable.xml
 2015-04-10 20:17:26 +02:00
PabstMirror
db5861da52 #428 - GJ Git 2015-04-10 13:05:39 -05:00
PabstMirror
33570c94e4 #428 - Only work on locked vehicles. 2015-04-10 13:05:39 -05:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
PabstMirror
97e277d710 #448 - Adjust Nightvision in vehicles 2015-04-10 12:55:42 -05:00
jaynus
c428bf051f placeholder model for hellfire, optics refreshing on titan 2015-04-10 10:42:02 -07:00
esteldunedain
b44f22c262 Add 1 mil scope adjustment keybinds 2015-04-10 14:41:34 -03:00
ruPaladin
d198cb25e9 Update stringtable.xml 2015-04-10 20:37:21 +03:00
commy2
ec29cdd731 remove forgotten debug item, .MD for optics, fix #439 2015-04-10 19:34:44 +02:00
ruPaladin
9c8c38aaae Update stringtable.xml 2015-04-10 20:28:05 +03:00
ruPaladin
a3a40a711c Update stringtable.xml 2015-04-10 20:24:23 +03:00
ruPaladin
100954da06 Update stringtable.xml 2015-04-10 20:19:19 +03:00
jaynus
2fe55b3117 Attack profile buildout. 2015-04-10 10:14:30 -07:00
commy2
5d097c4dd9 add comment explaining why isNumber is used 2015-04-10 19:11:51 +02:00
ulteq
2c4c6763c3 Removed deprecated CSE code (EnableForAI module option) 2015-04-10 19:02:32 +02:00