commy2
aa6c3ddf2c
fix: check files script, order in activatedAddons is not guaranteed
2015-05-09 19:34:35 +02:00
ulteq
b80602fbae
Fixed a typo
2015-05-09 18:55:00 +02:00
SAM
737b1cc216
Renamed variable limit to limitViewDistance
...
For future limiting of terraingrid
2015-05-09 18:42:02 +02:00
ulteq
30ff90453b
wind deflection has wrong version number macro setup
2015-05-09 18:32:19 +02:00
Glowbal
d3e2bd45d7
Merge pull request #1065 from acemod/fixMedicalSettingMistake
...
Fixed medical setting spelling mistake
2015-05-09 18:09:27 +02:00
commy2
4dc0b41c4b
Merge pull request #1076 from acemod/checkfiles
...
check for outdated pbo files
2015-05-09 17:50:29 +02:00
Nicolás Badano
b32729978f
Merge pull request #1026 from acemod/wavesFix
...
Fixes bugged waves
2015-05-09 12:42:28 -03:00
commy2
7fb56d4fd5
simple check to compare client and server version of ace
2015-05-09 17:03:51 +02:00
commy2
3976c4d64f
the spaces
2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e
ignore ace in checkPBO module, also fix #1020
2015-05-09 16:01:53 +02:00
commy2
52a904478b
laser selfdesignate has wrong version number macro setup
2015-05-09 15:32:34 +02:00
SAM
cad86280c1
Fixed module value not overriding.
2015-05-09 14:51:23 +02:00
bux578
f1798aa739
fix switchunits
2015-05-09 14:05:58 +02:00
bux578
8c937a707d
starting to fix switchunits
2015-05-09 13:49:26 +02:00
commy2
57131496f2
check for outdated pbo files
2015-05-09 13:25:19 +02:00
SAM
f4d7c6818b
Attempted fix #2
2015-05-09 13:05:36 +02:00
SAM
a9d6fbd841
Attempting to fix module value not being read
2015-05-09 12:36:11 +02:00
SAM
f64f76e92f
Fixed wrong file name
2015-05-09 12:07:05 +02:00
SAM
2dfaaa047a
Reworked limiting system
...
Module limit still not being set properly.
2015-05-09 11:56:27 +02:00
SAM
bba216ebd2
Rewrote switch statement
...
Per @Glowbal's comment
2015-05-09 10:53:09 +02:00
SAM
7201a23d41
Adjusted post init, removed redundant settings
2015-05-09 10:44:01 +02:00
SAM
9e40e16c4a
Adjusted XEH_preinit accordingly
2015-05-09 10:43:20 +02:00
SAM
ae1628ef03
Renamed init file for neatness
2015-05-09 10:41:55 +02:00
bux578
fb284faa66
adjust ambiance sound module description and docs
2015-05-09 08:18:44 +02:00
bux578
ddf32052c4
fix removeWhiteSpace function name
...
used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace`
due to 612fa69c1c
2015-05-09 08:02:13 +02:00
Nicolás Badano
19e8d7bbe7
Merge pull request #1066 from acemod/scopes-usefiredBisEH
...
Switch scopes to use firedBIS
2015-05-09 01:21:10 -03:00
commy2
b57f731dd0
disable laserpointer inheritance for rhs
2015-05-09 04:59:10 +02:00
jonpas
e9abd8c27a
Fixed lowercasing, improved examples
2015-05-09 04:55:41 +02:00
jonpas
2ff372e2a1
Function headers per Coding Guidelines for Interaction
2015-05-09 04:47:15 +02:00
jonpas
50d5e845ee
Lowercased beginning of functions pt2
2015-05-09 03:12:28 +02:00
jonpas
2a9f4d779d
Lowercased beginning of function names
2015-05-09 03:09:26 +02:00
PabstMirror
a4c710bd28
Switch scopes to use firedBIS
2015-05-08 13:36:24 -05:00
commy2
2ffabec250
Merge pull request #1040 from acemod/disableCfgAISkill
...
Disables the CfgAISkill class to prevent it from affecting players.
2015-05-08 20:27:31 +02:00
jaynus
b7b6cb6086
Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled.
2015-05-08 11:27:17 -07:00
commy2
7294056da0
keep ai tweaks except of relaod
2015-05-08 20:13:20 +02:00
Glowbal
e674229dde
enabledFor > enableFor
2015-05-08 20:10:40 +02:00
ulteq
0a9dbfba87
Privates cleanup
2015-05-08 18:47:17 +02:00
ulteq
03fd740f8e
Config caching is now done in the uiNamespace
2015-05-08 18:43:26 +02:00
SAM
0b4137763d
Cleaned up code
2015-05-08 18:41:32 +02:00
SAM
45992e5e7f
All working except module returning any.
...
ace_viewdistance_moduleViewDistanceLimit always returning as any. No
error in the RPT relating to readSettingfromModule failing
2015-05-08 18:30:28 +02:00
ulteq
9a0fcd4fec
AB config read caching
2015-05-08 17:20:56 +02:00
SAM
6cda97e3a0
Adding required files for module integration
2015-05-08 16:07:57 +02:00
ulteq
1f15e68c30
Global variable cleanup
2015-05-08 16:00:41 +02:00
SAM
5732015370
Added moduleViewDistance file
2015-05-08 15:36:47 +02:00
SAM
bb625aac58
Used ACE common function instead of hint
2015-05-08 15:27:13 +02:00
ulteq
fd0ca58fe6
Fixes broken bullet trace effect (caliber is now in mm, not inches)
2015-05-08 15:25:32 +02:00
SAM
a5d68f122d
Added working limiter (config based)
2015-05-08 14:49:52 +02:00
SAM
6b604c101c
First working version
2015-05-08 14:14:15 +02:00
ulteq
f9b6916456
Merge pull request #1053 from acemod/fixATragMX
...
Fixes broken ATragMX (calculateStabilityFactor now requires metric in…
2015-05-08 13:57:59 +02:00
ulteq
3495196f40
Fixes broken ATragMX (calculateStabilityFactor now requires metric input)
2015-05-08 13:56:38 +02:00
ulteq
0e74fa56f7
Corrected several armour piercing round configs
2015-05-08 13:45:00 +02:00
Felix Wiegand
6589cdfb0e
Merge pull request #1041 from acemod/metric-units
...
Metric units
2015-05-08 13:09:31 +02:00
KoffeinFlummi
5e33176b52
Convert ACE_barrelLength(s) to millimeters
2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287
Convert ACE_barrelTwist to millimeters
2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14
Convert ACE_bulletLength to millimeters
2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01
Convert ACE_caliber to millimeters
2015-05-08 12:44:06 +02:00
ulteq
fa07110311
The stability factor calculation is all metric now
2015-05-08 10:46:59 +02:00
SAM
2c8dddfc47
Adding required files
2015-05-08 09:28:48 +02:00
SAM
c2bb6386af
Added required files for new module
2015-05-07 22:41:44 +02:00
Glowbal
518dfb4373
Added missing privates
2015-05-07 21:51:03 +02:00
KoffeinFlummi
a8c4068b56
Remove unnecessary comment
2015-05-07 18:51:18 +02:00
KoffeinFlummi
db07de31af
Whoops; back to the roots.
2015-05-07 18:49:40 +02:00
KoffeinFlummi
4b3a111681
Convert ACE_barrelLength to meters
2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec
Convert ACE_barrelTwist to meters
2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753
Convert ACE_barrelLengths to meters
2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987
Convert ACE_bulletMass to grams
2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b
Convert ACE_bulletLength to meters
2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1
Convert ACE_caliber to meters
2015-05-07 18:21:15 +02:00
ulteq
cea6d0063d
Disables the CfgAISkill class to prevent it from affecting players.
2015-05-07 17:49:59 +02:00
ViperMaul
996c342087
Merge pull request #994 from acemod/imenumisclick
...
don't close menu when no action is selected
2015-05-06 13:31:07 -07:00
PabstMirror
5f43cffecd
Sort for mag repack
2015-05-05 20:35:08 -05:00
ulteq
05f34e5d6a
Attempt to fix https://github.com/acemod/ACE3/issues/1025
2015-05-05 22:21:29 +02:00
Glowbal
f6dae4f6ba
Merge pull request #1016 from acemod/fixRespawnModule
...
Fix undefined variable in respawn module
2015-05-05 20:30:46 +02:00
Glowbal
50cc5db92f
fixes #1017
2015-05-05 20:05:31 +02:00
Glowbal
a49feee76b
should have been defaultValue
2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2
lets use proper module config for this
2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1
Make certain that GVAR(BodyRemoveTimer) exists
2015-05-05 19:44:44 +02:00
Glowbal
d88d71e2b3
Merge pull request #1015 from alganthe/master
...
New anim update
2015-05-05 19:35:31 +02:00
jaynus
8f19c13d85
Merge pull request #1009 from acemod/fixMissleGuidanceInhertiacnes
...
MissleGuidance - fix Inheritance check
2015-05-05 10:31:40 -07:00
Josuan Albin
dd2ea99d15
pak
...
pak anim
2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60
medical advanced added
...
animations added for advanced
2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212
New anim update
...
new healing animation added to animationCaller, animationCallerSelf
stays the same
2015-05-05 18:53:17 +02:00
PabstMirror
76f540409f
Fix 1.44 Updating Base Class
...
Updating base class VestItem->ItemInfo, by
z\addons\ace\protection\config.cpp/CfgWeapons/V_PlateCarrierIAGL_dgtl/ItemInfo/
2015-05-05 10:46:56 -05:00
Nicolás Badano
83304a0622
Merge pull request #1011 from acemod/moveContourLegend
...
#940 - Map Tweak (contor legend) for brefing
2015-05-05 08:14:34 -03:00
ulteq
19864d5be6
Fixed a bug in the humidity calculation
2015-05-05 10:37:51 +02:00
ulteq
4f44bcdf46
Added wind data for Chernarus (Prag)
2015-05-05 10:36:12 +02:00
bux578
bd69405cf4
fix czech typo in medical, fix #1010
2015-05-05 08:37:41 +02:00
PabstMirror
dafff4e63e
#940 - Map Tweak (contor legend) for brefing
2015-05-04 23:50:03 -05:00
PabstMirror
21552caee7
Opps- Not the same as javelin
2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d
MissleGuidance - fix Inheritance check
2015-05-04 22:46:58 -05:00
ulteq
f81e53bb33
Added wind data for Takistan (Kabul)
2015-05-04 22:17:26 +02:00
ulteq
be7391bf47
Added wind data for F.A.T.A
2015-05-04 21:28:12 +02:00
PabstMirror
6c45292e89
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/functions/fnc_renderBaseMenu.sqf
2015-05-04 14:23:21 -05:00
PabstMirror
e6889f1634
Merge branch 'master' into userActionPrototype
2015-05-04 14:21:49 -05:00
PabstMirror
6c5d72640c
Caching, Optimzations
2015-05-04 14:06:33 -05:00
ulteq
76eaa5ded1
Added wind data for Bornholm
2015-05-04 20:35:39 +02:00
ViperMaul
032424b23e
Merge pull request #1006 from acemod/skipLOSCheckBodyparts
...
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
2015-05-04 10:14:59 -07:00
esteldunedain
d07b69aca4
Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions.
2015-05-04 13:37:14 -03:00
ulteq
d78be0fa23
Merge pull request #998 from Bla1337/master
...
Translation fixes/improvements (RU)
2015-05-04 10:28:35 +02:00
Bla1337
6c6cb9128a
Reverted the abbreviation changes
...
Abbreviation only used when necessary for the text clipping prevention.
2015-05-04 09:54:54 +03:00
Glowbal
f6e815fbaf
Merge pull request #1003 from acemod/fixMedicalLitterError
...
Fix treatment script error
2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552
Make treatment execute before createLitter
2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1
Ensure that litterCondition is always code #1000
2015-05-04 00:16:12 +02:00
ulteq
061b77e375
Fixed completely fucked up temperature day/night cycle
2015-05-03 23:32:53 +02:00
ulteq
30c27bf689
Added weather data for kunduz map
2015-05-03 23:21:56 +02:00
PabstMirror
bdc967d3a9
Extension to parse text for image path
2015-05-03 13:44:02 -05:00
ulteq
3fda9e7e7b
Merge pull request #997 from ProfessorCZ/master
...
Czech translation - Update
2015-05-03 17:03:47 +02:00
Bla1337
bf592ce0a9
nightvision edits
2015-05-03 17:35:58 +03:00
Bla1337
73d0be88fb
nametags edits
2015-05-03 14:57:59 +03:00
Bla1337
a7d66b59cf
transaltions
2015-05-03 14:01:35 +03:00
Lukas
3434964f4f
Update stringtable.xml
2015-05-03 11:54:18 +02:00
Lukas
da309e6682
Update stringtable.xml
2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6
Czech translation - Update
2015-05-03 11:48:56 +02:00
ulteq
4d4604da28
Fixed two typos in the ATragMX gun profile list
2015-05-03 10:47:49 +02:00
ulteq
d653aa262a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix
...
Conflicts:
addons/ballistics/stringtable.xml
2015-05-03 10:21:57 +02:00
PabstMirror
5c556647ab
Some Cleanup
2015-05-03 02:06:49 -05:00
PabstMirror
5147f9f584
Ladder Actions
2015-05-03 00:33:20 -05:00
PabstMirror
d4225e03d2
Split into functions (for future caching)
2015-05-02 23:13:35 -05:00
KoffeinFlummi
f678fb8fbf
Merge branch 'spanish-merge'
2015-05-03 02:40:56 +02:00
KoffeinFlummi
7633f406ae
Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/laser/stringtable.xml
2015-05-03 02:40:44 +02:00
PabstMirror
d0975b4c0f
Laserpointer Stringtable - fix swapped eng/czk
2015-05-02 18:55:23 -05:00
KoffeinFlummi
697656da92
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-03 01:08:39 +02:00
KoffeinFlummi
a1d2bd62a4
Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge
...
Conflicts:
addons/interaction/stringtable.xml
2015-05-03 01:08:22 +02:00
jaynus
27c66ba631
Merge pull request #993 from acemod/clipboardExtension
...
ACE clipboard extension to bypass clipboard limit of arma. Close #991
2015-05-02 15:29:18 -07:00
jaynus
717d7c874f
Data chunking. Feature complete.
2015-05-02 15:28:40 -07:00
KoffeinFlummi
e918e1d661
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3
Merge https://github.com/adam3adam/ACE3 into czech-merge
...
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-05-02 23:29:45 +02:00
esteldunedain
8d92d9cc7d
Add ace_clipboard to ACE_Extensions
2015-05-02 18:25:35 -03:00
KoffeinFlummi
298e1d88bd
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
commy2
f44aaee7c7
also in cursor mode
2015-05-02 23:02:40 +02:00
commy2
0fd783082d
don't close menu when no action is selected
2015-05-02 22:53:23 +02:00
esteldunedain
233ca37219
Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log
2015-05-02 17:52:37 -03:00
ulteq
e6187adfc7
Removed a trailing space
2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992
Fixed some inconsistencies in the stringtable
2015-05-02 22:07:25 +02:00
Felix Wiegand
7678919e8d
Merge pull request #982 from ToasterBR/master
...
Translation to Portuguese
2015-05-02 21:40:14 +02:00
esteldunedain
aad108a6a3
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion
2015-05-02 14:55:35 -03:00
esteldunedain
e6c333bff4
Fix oclusion when self-interacting
2015-05-02 14:54:57 -03:00
esteldunedain
1735047e3c
Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738
2015-05-02 14:37:58 -03:00
Harakhti
6c2717be7f
More more translations
...
Stope.
2015-05-02 18:06:01 +02:00
jaynus
980be9f55b
Merge pull request #972 from acemod/javFixInheritanceCheck
...
Javelin - Fix configProperties
2015-05-02 08:50:18 -07:00
adam3adam
05a6389acd
Czech translation v2
...
mk6mortar and some medical translation
2015-05-02 12:46:28 +02:00
ruPaladin
219735611f
interaction2
2015-05-02 12:47:06 +03:00
ruPaladin
3aad0904cd
medical2
2015-05-02 12:45:27 +03:00
ruPaladin
3b6e491f5c
interaction
2015-05-02 12:42:44 +03:00
ruPaladin
ca03637a54
medical
2015-05-02 12:42:02 +03:00
FreeZbe
66f39fc1dc
French : update / fix stringtable
2015-05-02 10:12:28 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
PabstMirror
d2fdeb5e96
Allow Skipping LOS Check (Because of doors)
2015-05-02 00:13:09 -05:00
esteldunedain
fae10aa731
Replace dialog by display.
2015-05-02 01:33:28 -03:00
PabstMirror
334647fa60
Merge branch 'master' into userActionPrototype
2015-05-01 22:55:35 -05:00
PabstMirror
436e50411a
Medical - Fix Uncon PFEH argument changes
2015-05-01 22:42:43 -05:00
Felix Wiegand
4dce2b8841
Merge pull request #978 from licht-im-Norden87/patch-7
...
Added german strings to interaction
2015-05-02 04:08:37 +02:00
licht-im-Norden87
f93ac12807
Added german strings to laser
2015-05-02 03:28:54 +02:00
licht-im-Norden87
106f2ab89b
Added german strings to interaction
2015-05-02 03:25:28 +02:00
Dimas
b350d234e2
Addes spanish translation
...
Added spanish translation for three strings. Did it manually here.
2015-05-02 02:44:39 +02:00
esteldunedain
b8d8aeae5c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-05-01 20:32:51 -03:00
esteldunedain
be07fd2c82
Avoid ACE_Comanche_Test from showing on Zeus. #943
2015-05-01 20:32:20 -03:00
Grzegorz
c9cf1d2455
Update CfgVehicles.hpp
...
another typo few lines below
2015-05-02 01:26:54 +02:00
Grzegorz
5b9e6de6f1
Update CfgVehicles.hpp
...
missing "s"
2015-05-02 01:21:49 +02:00
PabstMirror
675b76f569
Privates - Interaction
2015-05-01 18:12:24 -05:00
PabstMirror
ce1255bb2f
Fix configProperties
2015-05-01 17:56:04 -05:00
KoffeinFlummi
97a9bffe98
Set version number to 3.0.0.2
2015-05-02 00:49:43 +02:00
ulteq
4239772ce9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-05-02 00:36:34 +02:00
ulteq
884da7742e
Disabled AB terrain init, if AB is not enabled
2015-05-02 00:36:23 +02:00
Felix Wiegand
07ec7b96c4
Merge pull request #954 from acemod/medicalFixVehAnimation
...
Medical fix veh animation
2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
KoffeinFlummi
e05f1b557a
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-02 00:19:39 +02:00
KoffeinFlummi
debfe990e8
Fix duplicates
2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f
Merge https://github.com/adam3adam/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/interact_menu/stringtable.xml
2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312
Czceh translation
2015-05-02 00:04:50 +02:00
Felix Wiegand
f16e02b003
Merge pull request #959 from licht-im-Norden87/patch-6
...
Update Stringtable: missileguidance
2015-05-02 00:03:13 +02:00
Grzegorz
c1d87f2a75
PL translation
...
interaction
2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf
Merge pull request #689 from acemod/group
...
Reword the group action names
2015-05-01 23:30:10 +02:00
Tachii
60c02f4051
added 2 missing ru strings
2015-05-02 00:21:00 +03:00
FreeZbe
6f5e64b4a5
French : update / fix stringtable
2015-05-01 23:10:06 +02:00
FreeZbe
7e12c97317
French : update / fix stringtable
2015-05-01 23:09:09 +02:00
FreeZbe
d1da3a82d7
French : update / fix stringtable
2015-05-01 23:08:36 +02:00
Felix Wiegand
58a67a2f77
Merge pull request #962 from gienkov/patch-10
...
PL translation
2015-05-01 22:51:36 +02:00
KoffeinFlummi
cc627b4a92
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd
Add spanish translation for removing tournis
2015-05-01 22:49:52 +02:00
Glowbal
937b20f551
Merge branch 'master' of github.com:acemod/ACE3
2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4
This should not be 1
2015-05-01 22:49:13 +02:00
Grzegorz
3b321c7bf2
PL translation
...
laser
2015-05-01 22:46:51 +02:00
KoffeinFlummi
a002c796da
Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/respawn/stringtable.xml
2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86
Merge branch 'master' into spanish-merge
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec
Last touches to Spanish translation
2015-05-01 22:42:09 +02:00
bux578
1a946acc30
German Translation / Typo
2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76
PL translation
...
STR_ACE_Medical_RemovingTourniquet
2015-05-01 22:32:53 +02:00
Glowbal
0a300f3385
Merge pull request #960 from acemod/medicalMissingProgressText
...
Added missing progress bar display text
2015-05-01 22:31:41 +02:00
Glowbal
e8ccddfc2c
Added missing progress bar display text
2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c
Translation of some stuff into czech language
...
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23
I suck at git
...
redo reverted stuff here
2015-05-01 15:03:05 -05:00
licht-im-Norden87
5e8096f29c
Update Stringtable: missileguidance
2015-05-01 21:29:49 +02:00
PabstMirror
e67e15c3fa
Merge branch 'master' into medicalFixVehAnimation
...
Conflicts:
addons/common/functions/fnc_getDeathAnim.sqf
addons/common/functions/fnc_loadPersonLocal.sqf
2015-05-01 14:29:21 -05:00
licht-im-Norden87
d12c7ff048
Update Stringtable: Rallypoint
...
Angleichung
2015-05-01 21:25:39 +02:00
KoffeinFlummi
c9ff497c83
Merge branch 'master' into polish-merge
...
Conflicts:
addons/respawn/stringtable.xml
2015-05-01 21:13:36 +02:00
Felix Wiegand
90275b272e
Merge pull request #950 from Tachii/patch-19
...
Added few missing ru strings
2015-05-01 21:11:37 +02:00
Felix Wiegand
b0094ff8e6
Merge pull request #949 from Tachii/patch-18
...
added 1 RU string
2015-05-01 21:11:17 +02:00
Felix Wiegand
3d45a26334
Merge pull request #957 from evromalarkey/master
...
Few Czech strings
2015-05-01 21:07:27 +02:00
jaynus
2bd0acb621
Revert "GetDeathAnim"
...
This reverts commit 0f736ae684
2015-05-01 12:00:38 -07:00
jaynus
6603806c77
Revert "Save and replay valid awake animations"
...
This reverts commit 8d1ac26e24
2015-05-01 12:00:21 -07:00
jaynus
c1ba4966f9
Test confirm no bouncy.
2015-05-01 11:53:55 -07:00
Lubomír Blažek
dcb3196e58
Czech strings
2015-05-01 20:52:41 +02:00
jaynus
5bf763a08e
quote, not var.
2015-05-01 11:47:49 -07:00
Tachii
bed298d5b3
Update stringtable.xml
2015-05-01 21:38:05 +03:00
jaynus
2ed05ed469
Merge remote-tracking branch 'origin/master' into laserCodeSelection
2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e
Resolved. Conflicts:
...
addons/missileguidance/functions/fnc_onFired.sqf
2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2
Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751
2015-05-01 11:31:37 -07:00
Glowbal
e1d0ac4b9e
Added author
2015-05-01 20:16:34 +02:00
PabstMirror
d8a6dd1bbd
Stuff
2015-05-01 12:58:56 -05:00
Tachii
66eda924ac
Update stringtable.xml
2015-05-01 20:48:37 +03:00
Glowbal
722c459c1e
added APL pbo
2015-05-01 19:37:17 +02:00
Grzegorz
7e87c3a250
Update stringtable.xml
2015-05-01 19:32:59 +02:00
Grzegorz
e36fbe9da7
Update stringtable.xml
2015-05-01 19:32:43 +02:00
Grzegorz Sikora
4668869959
PL translation
2015-05-01 19:30:30 +02:00
Tachii
b1a23fd3c7
Update stringtable.xml
2015-05-01 20:29:57 +03:00
Tachii
43dea56ae6
Update stringtable.xml
2015-05-01 20:29:00 +03:00
Tachii
66818e0a74
Update stringtable.xml
2015-05-01 20:26:05 +03:00
Tachii
889275091e
Update stringtable.xml
2015-05-01 20:24:13 +03:00
Tachii
1771b61578
added 2 missing ru strings
2015-05-01 20:23:05 +03:00
Tachii
43655d0cec
Update stringtable.xml
2015-05-01 20:18:51 +03:00
Tachii
caf301ac99
Update stringtable.xml
...
Added 1 RU string
2015-05-01 20:15:35 +03:00
PabstMirror
8d1ac26e24
Save and replay valid awake animations
2015-05-01 12:12:13 -05:00
ulteq
ff2d7fdb72
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix
...
Conflicts:
addons/fcs/functions/fnc_firedEH.sqf
2015-05-01 19:00:27 +02:00
ulteq
aa21962f8b
Allowed positive weapon initSpeed values
2015-05-01 18:55:44 +02:00
Glowbal
80162627ec
Fixed spelling of enableUnconsciousnessAI
2015-05-01 18:49:59 +02:00
Felix Wiegand
23bb96e514
Merge pull request #948 from ruPaladin/patch-7
...
Russian translation (interact_menu)
2015-05-01 18:39:34 +02:00
ruPaladin
2aa788bba2
Update stringtable.xml
2015-05-01 19:26:23 +03:00
ruPaladin
a883517a5e
Update stringtable.xml
2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e
Fix duplicate entries
2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92
Merge https://github.com/FreeZbe/ACE3 into french-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
ulteq
a42dec6760
Added more missing privates
2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33
Finds the corresponding weapon class for each magazine type.
2015-05-01 17:39:38 +02:00
KoffeinFlummi
e46eba673f
Merge branch 'master' into german-translation
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
ulteq
6dc28f026f
Added missing private
2015-05-01 17:15:49 +02:00
Felix Wiegand
526b0a2d59
Merge pull request #931 from gienkov/master
...
PL translation
2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3
Removed duplicate code
2015-05-01 16:24:16 +02:00
Nicolás Badano
65dcbce25e
Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection
...
Revert "Takes negative initSpeed values into account"
2015-05-01 11:07:57 -03:00
ulteq
3ad668605a
Fix for last fcs change
2015-05-01 16:02:34 +02:00
jaynus
e4567fb59f
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
...
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
2015-05-01 06:59:28 -07:00
jaynus
9997b6d464
action is select 1
2015-05-01 06:57:49 -07:00
Nicolás Badano
cde80b2901
Revert "Takes negative initSpeed values into account"
2015-05-01 10:38:41 -03:00
commy2
b255d1040b
scope 1 for ACE_Comanche_Test, #943
2015-05-01 15:30:11 +02:00
FreeZbe
68d62b0005
Update stringtable.xml
2015-05-01 14:20:21 +02:00
FreeZbe
518614ec0b
Update stringtable.xml
2015-05-01 14:20:03 +02:00
FreeZbe
79ac41bd95
Update stringtable.xml
2015-05-01 14:19:43 +02:00
bux578
bfb68fe368
fix spelling errors
2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021
Update stringtable.xml
2015-05-01 14:19:15 +02:00
FreeZbe
acf74dd2ae
Update stringtable.xml
2015-05-01 14:13:32 +02:00
FreeZbe
7a397459ae
Update stringtable.xml
2015-05-01 14:13:08 +02:00
FreeZbe
371aa381ec
Update stringtable.xml
2015-05-01 14:12:45 +02:00
FreeZbe
820c841b35
Update stringtable.xml
2015-05-01 14:12:10 +02:00
FreeZbe
53be70f661
French : update stringtable
2015-05-01 14:07:08 +02:00
ulteq
a6f4c68ef4
Removed obsolete comment
2015-05-01 13:50:01 +02:00
ulteq
6d0e2cc464
Merge pull request #936 from acemod/explosivesSleepReplacement
...
Replaced sleep with waitAndExecute
2015-05-01 12:55:14 +02:00
Glowbal
f0efba09e5
Merge pull request #814 from acemod/basic-med-options
...
Basic medical module options
2015-05-01 12:27:22 +02:00
ulteq
a9cde188ea
Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection
...
Takes negative initSpeed values into account
2015-05-01 12:24:22 +02:00
bux578
2acc10ba70
meh
2015-05-01 12:19:42 +02:00
Glowbal
e9a86da8e0
Should be in same order as the module
2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4
missing german translation
2015-05-01 12:17:28 +02:00
ulteq
4c0bed609e
Fixed a typo
2015-05-01 11:53:53 +02:00
Glowbal
5beca63ae2
Added missing private
2015-05-01 11:51:23 +02:00
ulteq
940f8e8349
Cleanup++:
...
*Removed spawn
*Added, moved and renamed some privates
2015-05-01 11:38:09 +02:00
commy2
a97c934688
fix ubc, fix #938
2015-05-01 11:01:07 +02:00
ulteq
d3b36c2b56
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-05-01 10:26:48 +02:00
ulteq
723ffc21d1
Removed unneeded TODO
2015-05-01 10:26:37 +02:00
ulteq
2219339e24
Fixed a typo
2015-05-01 10:25:59 +02:00
ulteq
965e45a53c
Takes negative initSpeed values into account
2015-05-01 10:25:33 +02:00
commy2
b859956604
rename category ace <blank> to ace common
2015-05-01 10:19:47 +02:00
PabstMirror
0f736ae684
GetDeathAnim
2015-05-01 03:13:26 -05:00
ulteq
e8264110bb
Replaced sleep with waitAndExecute
2015-05-01 10:12:41 +02:00
commy2
c52278c11f
Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty
2015-05-01 09:52:03 +02:00
esteldunedain
a0923aa5c3
Tweak the position for rally point actions. Fix #837
2015-05-01 01:57:37 -03:00
esteldunedain
324b9510e3
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
2015-05-01 01:56:39 -03:00
esteldunedain
fc02bb4e06
Stylistic changes
2015-05-01 00:32:16 -03:00
esteldunedain
aa4a5539d4
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
2015-05-01 00:04:22 -03:00
KoffeinFlummi
984a1fe337
Rename breakLine to break_line
2015-05-01 02:14:23 +02:00
KoffeinFlummi
e06e1a2f89
Make preventDeath work
2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464
Let setUncon handle AI unconsciousness
2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2
Rename caching variables in basic HD
2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f
Reduce animation forcing delay
2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8
Offload ejecting to unloadPerson
2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3
Proper privates and alignment
2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7
Whoops
2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea
Merge remote-tracking branch 'origin/master' into basic-med-options
...
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
Kavinsky
f301491c7a
changed variable name to use QGVAR macro
2015-04-30 23:18:45 +02:00
Grzegorz
3f932c0a93
Update stringtable.xml
2015-04-30 22:55:51 +02:00
Grzegorz
1e0eaa1971
Update stringtable.xml
2015-04-30 22:55:43 +02:00
Grzegorz Sikora
03973f3dcf
PL translation
2015-04-30 22:54:15 +02:00
Glowbal
eb48048a58
Merge pull request #930 from acemod/keybindingCategories
...
Split keybindings into different sub-categories
2015-04-30 22:51:39 +02:00
commy2
2ae5538df5
change wrong strings
2015-04-30 22:46:08 +02:00
Glowbal
131468f0d8
plurals
2015-04-30 22:39:33 +02:00
PabstMirror
090062153c
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
KoffeinFlummi
d59436c588
Only force animation when necessary
2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903
Fix missing semicolon
2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf
Reorganize AI unconsciousness
2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938
Remove max unconsciousness time again
2015-04-30 22:15:40 +02:00
Glowbal
7106093f1c
Merge pull request #929 from acemod/medical-lowercase
...
Convert Medical stringtable key names to lowercase
2015-04-30 22:10:54 +02:00
commy2
bc0d95765a
Merge pull request #849 from acemod/menuonclick
...
add option to only use action when clicking
2015-04-30 22:08:37 +02:00
KoffeinFlummi
270c3adc1e
Do it again, but properly this time
2015-04-30 22:06:10 +02:00
Glowbal
1ca0d66f30
Initial categories
2015-04-30 22:02:20 +02:00
KoffeinFlummi
85669a9e92
Convert Medical stringtable key names to lowercase
2015-04-30 22:01:09 +02:00
Glowbal
e7290feaa2
disabled radial option, so it isn't server selectable either
2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310
Disabled client setting for menu style
2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e
Merge branch 'master' into medicalMenuClientSetting
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
2015-04-30 21:08:46 +02:00
PabstMirror
ba18f8b430
Handle Scaling
2015-04-30 14:07:19 -05:00
commy2
8c8e310d66
handle cursor mode
2015-04-30 21:00:30 +02:00
Glowbal
349d723fea
Merge pull request #928 from acemod/AdjustUnloadPerson
...
Adjust unload person
2015-04-30 20:55:17 +02:00
Glowbal
67370f3340
Handles waking up
2015-04-30 20:49:38 +02:00
Glowbal
8d358f3ab5
can only carry/drag units that are not in a vehicle
2015-04-30 20:44:59 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
commy2
5ec8b6d36c
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
2015-04-30 20:01:58 +02:00
PabstMirror
a46d4e11ab
Remove linebreak from teamManagement, fix leaveteam
2015-04-30 12:38:19 -05:00
bux578
367da1f4bf
cleaned up insignias
2015-04-30 19:36:35 +02:00
PabstMirror
5ca75f9973
Action names Join->Assign
2015-04-30 12:20:01 -05:00
PabstMirror
ca57a4e168
Merge branch 'master' into group
...
Conflicts:
addons/interaction/CfgVehicles.hpp
addons/interaction/stringtable.xml
2015-04-30 11:59:53 -05:00
Kavinsky
b9c1936efc
changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser
2015-04-30 18:51:30 +02:00
KoffeinFlummi
fd152c580b
Merge branch 'master' into basic-med-options
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
9c02f915ec
Merge pull request #922 from acemod/medicalPrivates
...
Medical Private Variables
2015-04-30 11:34:33 -05:00
jaynus
21cc0db28f
Correctly look up configs.
2015-04-30 09:04:29 -07:00
jaynus
7568773ece
class localize and disable all guidance/locking.
2015-04-30 09:00:09 -07:00
bux578
0f135c5dab
fix ballistics stringtable
2015-04-30 15:23:52 +02:00
ulteq
ac33ad109f
Merge pull request #923 from Bla1337/master
...
Localization update (Russian)
2015-04-30 13:44:54 +02:00
Harakhti
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Bla1337
5d1478b733
interact and medical system localization upd
2015-04-30 14:01:22 +03:00
ulteq
50a8a89b28
Added missing privates
2015-04-30 10:50:49 +02:00
ulteq
d2aa28715d
Merge pull request #874 from acemod/fragCleanup
...
Frag cleanup
2015-04-30 10:35:25 +02:00
ulteq
e77ddcf837
Added Sh_105mm_HEAT_MP frag config
2015-04-30 10:35:06 +02:00
ulteq
59017ed79d
Added more frag configs:
...
* R_Hydra_HE
* Sh_120mm_HE
* Sh_125mm_HE
* Missile_AGM_02_F
* M_Hellfire_AT
2015-04-30 10:26:00 +02:00
Glowbal
8f3d8707cc
Should be select
...
Should fix the new script error after last fix.
2015-04-30 08:53:43 +02:00
PabstMirror
48f7455ef1
Opps2
2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359
opps
2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89
Medical Private Variables
2015-04-30 01:17:26 -05:00
PabstMirror
11aafe013b
Localization
2015-04-29 23:53:00 -05:00
PabstMirror
9aa2e3130a
Options for Shadow/Outline and Text Size
2015-04-29 23:37:52 -05:00
PabstMirror
e40a2a524d
Merge branch 'master' into interactMoreOptions
2015-04-29 22:57:35 -05:00
commy2
8e54e6ec13
fix setFWS locality issues, fix #892
2015-04-30 00:53:49 +02:00
PabstMirror
f90834eeab
Unused
2015-04-29 16:57:24 -05:00
PabstMirror
5fef446c00
EFUNC for dragging calls
2015-04-29 16:53:09 -05:00
PabstMirror
a39e869728
Fix extra {} wraped
...
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
2015-04-29 16:44:47 -05:00
Glowbal
581c64f66f
Implemented unloading from vehicles #740
2015-04-29 23:12:47 +02:00
Glowbal
943d2cbd72
Merge branch 'master' into medicalImprovements
2015-04-29 23:01:38 +02:00
Glowbal
aaa8171457
Implemented prevent instant death #839
2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12
fixes #838
2015-04-29 22:04:46 +02:00
bux578
fce91279b5
add ace3 and banana insignia
...
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
2015-04-29 22:04:31 +02:00
Glowbal
87465b8b10
fixes #829
2015-04-29 21:49:24 +02:00
ulteq
4eec4da37c
Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix
...
Explosive fix attach delete vehicle fix
2015-04-29 21:32:28 +02:00
Dimaslg
864c3ea03b
Conflicts resolve again
...
Conflicts resolve again
2015-04-29 21:23:32 +02:00
ulteq
608af39a67
Added proper dummy object cleanup code
2015-04-29 21:22:07 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
PabstMirror
41bef1e58c
Merge pull request #903 from acemod/vehLockFix
...
Veh lock fix
2015-04-29 13:34:38 -05:00
PabstMirror
2beaf8ddeb
Merge pull request #905 from acemod/fixDragAnim
...
Fix Dragging StanceChange Anim
2015-04-29 13:34:16 -05:00
ulteq
00dc0ef01e
Added frag classes array for 82mm shell
2015-04-29 17:48:19 +02:00
ulteq
989332831f
Added frag configs for 82mm and 155mm shells
2015-04-29 17:42:37 +02:00
NukeDev
d4dc5e6d85
Other Fixes 2
2015-04-29 17:22:20 +02:00
ulteq
4e171c2988
Merge pull request #916 from FreeZbe/master
...
French: update and fix stringtable
2015-04-29 16:46:49 +02:00
NukeDev
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02:00
FreeZbe
ca7aeece90
French: update stringtable
2015-04-29 16:28:59 +02:00
FreeZbe
5ec6bea71d
French: update stringtable
2015-04-29 16:19:23 +02:00
jaynus
283e34779f
Don't inherit
2015-04-29 07:05:48 -07:00
Glowbal
dfbc9b74fd
Added arsenalScope #913
2015-04-29 15:14:37 +02:00
ulteq
2068eaea75
Added G_40mm_HE config, changed 40mm gurney_k values
2015-04-29 13:53:38 +02:00
ulteq
a8f37a4c72
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup
2015-04-29 13:33:07 +02:00
commy2
d149db61e8
ace insignia, #906
2015-04-29 13:01:08 +02:00
KoffeinFlummi
b263ac6847
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/common/stringtable.xml
2015-04-29 12:57:48 +02:00
KoffeinFlummi
c854d2208f
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
addons/captives/stringtable.xml
2015-04-29 12:54:20 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/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/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
Legolasindar
1c8137a7e5
fixed spanish translate for opened pull #893
...
fixed spanish translate for opened pull #893
2015-04-29 12:46:32 +02:00
ulteq
87d1f7c281
Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112
2015-04-29 12:24:56 +02:00
ulteq
0dd23df7dc
Merge pull request #911 from Bla1337/master
...
Russian localization update.
2015-04-29 10:47:35 +02:00
Glowbal
7ca35bf823
prevent multiple detonators of same type to be displayed #835
...
As per @CorruptedHeart suggestion.
> Just needs a
> if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
2015-04-29 10:44:10 +02:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
PabstMirror
47d4446520
Don't check intersection if distance < 1m
...
Related to #869
2015-04-29 02:34:47 -05:00
ulteq
f83f8dad0e
Fixes: https://github.com/acemod/ACE3/issues/904
2015-04-29 09:27:49 +02:00
PabstMirror
d7d43ce3b1
#828 - Private Variables for Interact Menu
2015-04-29 01:26:13 -05:00
PabstMirror
e56838be36
Private Variables
2015-04-29 00:05:02 -05:00
PabstMirror
409851dd8c
Attach the real explosive
2015-04-28 23:57:11 -05:00
PabstMirror
3eb2bdfc84
Display Name Progress Text
2015-04-28 21:17:29 -05:00
ulteq
a80e11d025
Fixed some 7.62 tracer magazines:
...
*Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine
*Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)
2015-04-29 01:33:26 +02:00
PabstMirror
414a50fb9b
Fix Dragging StanceChange Anim
2015-04-28 15:40:36 -05:00
Glowbal
a854b90b00
Increased level at which a lot of blood message gets shown in basic medical
2015-04-28 22:19:30 +02:00
PabstMirror
1512e4c367
isClientSettable spelling
2015-04-28 14:09:26 -05:00
PabstMirror
9e8b13cd2b
Merge branch 'master' into altSelfInteract
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/interact_menu/functions/fnc_renderSelector.sqf
addons/interact_menu/stringtable.xml
2015-04-28 14:02:03 -05:00
Dimaslg
956b5e3558
Spanish Translation
...
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
Glowbal
f606c24854
fixes #901
2015-04-28 20:47:11 +02:00
Glowbal
dbf748ba93
Merge branch 'master' into medicalImprovements
2015-04-28 20:33:39 +02:00
Glowbal
c06caa7209
Only add JIP event for player clients
2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff
Join in progress players will now be initialized
2015-04-28 20:32:29 +02:00
Glowbal
95d83554da
Added local treatment through remoteExec for basic
2015-04-28 20:32:02 +02:00
PabstMirror
9e0932eb56
Opps
2015-04-28 13:31:47 -05:00
PabstMirror
270f9f3662
Fix init order problem
2015-04-28 13:26:52 -05:00
bux578
621e1513a0
ballistic stringtable fixes
2015-04-28 20:24:59 +02:00
bux578
4cc6db47de
fix merge conflic
2015-04-28 20:15:56 +02:00
ulteq
85ce5e3729
Unified spacing
2015-04-28 19:43:36 +02:00
NukeDev
0b4bb6e4c9
Italian's Translation fixes
...
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
simon84
b119c85c57
found some errors
2015-04-28 19:36:31 +02:00
ulteq
4cc2d072e6
Merge pull request #898 from simon84/german-translations
...
German translations fixes
2015-04-28 19:36:29 +02:00
ulteq
e759989d33
Removed debug output
2015-04-28 19:33:00 +02:00
ulteq
76393f31db
Fixes: https://github.com/acemod/ACE3/issues/896
2015-04-28 19:31:38 +02:00
Glowbal
c38fe384e3
added default values for getvar's
2015-04-28 19:30:35 +02:00
simon84
a244660930
German translation fixes
...
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
2015-04-28 19:25:45 +02:00
ulteq
2a759aba70
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-28 18:55:23 +02:00
ulteq
d0c7a37841
Minor stringtable fix
2015-04-28 18:31:14 +02:00
ulteq
908c204893
Replaced Tabs with Spaces
2015-04-28 18:24:24 +02:00
ulteq
236fc10a0f
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
2015-04-28 18:15:05 +02:00
NukeDev
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
Grzegorz
feeb897fb6
Update stringtable.xml
2015-04-28 18:05:43 +02:00
Grzegorz
b88618563d
Update stringtable.xml
2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
NukeDev
1d434949de
Some Italian Translation's Changes
2015-04-28 17:46:35 +02:00
ulteq
dc09c554c0
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello
8a55c69cd7
added spanish translation
...
added spanish translation
2015-04-28 17:03:49 +02:00
ulteq
2e8070facb
Merge pull request #886 from simon84/german-translations
...
German translations
2015-04-28 16:54:39 +02:00
PabstMirror
f8b8d7dd16
Set Lock on postInit so spawned vehicles are set
2015-04-28 00:08:28 -05:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
ulteq
79a5077941
Merge pull request #878 from Brisse89/patch-1
...
Less fictional weapon names
2015-04-28 00:02:55 +02:00
PabstMirror
7e0fa18ce7
#770 - Hopefully fix LOS check on flashbang
2015-04-27 16:07:31 -05:00
ulteq
416a914253
More vector math replacements
2015-04-27 22:14:08 +02:00
ulteq
0d6d96e76c
Cleanup++:
...
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
2015-04-27 22:04:35 +02:00
ruPaladin
59aba3fb34
Update stringtable.xml
2015-04-27 19:33:22 +03:00
ulteq
fa6a2566e3
Fixed a syntax error
2015-04-27 17:48:06 +02:00
Glowbal
450e324f7b
adjusted damage handling (adv medical)
2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c
adjusted damage parsing
2015-04-27 16:36:00 +02:00
Josuan Albin
e8dec708bc
Some french entries and a german duplicate
...
Added some french entries and removed a german duplicate
2015-04-27 16:18:28 +02:00
Glowbal
b520a1072b
Merge branch 'master' into medicalImprovements
2015-04-27 15:41:20 +02:00
Brisse89
26bd75084d
Update stringtable.xml
...
Khaybar -> Sama
2015-04-27 14:56:57 +02:00
ulteq
3c92cab7af
Reverted the addBlackList function
2015-04-27 14:02:59 +02:00
ulteq
f54f0cd1fa
Renamed init functions
2015-04-27 13:58:18 +02:00
Brisse89
4ebdd88369
Less fictional weapon names
...
ACP-C2 -> Custom Covert II
KT2002 Katiba -> KH2002 Khaybar
2015-04-27 13:55:50 +02:00
ulteq
1b5756d33c
Added weather update interval module setting
2015-04-27 12:47:26 +02:00
ulteq
79ff3146b5
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-27 12:40:28 +02:00
ulteq
04d3a31b5b
Fixed a typo
2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3
Added ace/module settings for ace_weather:
...
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
2015-04-27 12:28:56 +02:00
ulteq
135157419e
Merge pull request #876 from Brisse89/patch-2
...
Realistic weapon names: Update stringtable.xml
2015-04-27 12:20:43 +02:00
Brisse89
ecaa23ada2
Update stringtable.xml
...
Removed the space in HK121
2015-04-27 12:17:36 +02:00
Brisse89
faa17d0e56
Update stringtable.xml
...
Noreen Bad News -> Noreen "Bad News" ULR
2015-04-27 12:13:09 +02:00
Brisse89
3339759321
Update stringtable.xml
...
Is this better?
SIG 762 -> SIG 556
HK 122 -> HK 121
2015-04-27 11:58:39 +02:00
ulteq
579936c781
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup
2015-04-27 11:22:49 +02:00
ulteq
b0876ca394
Enables: d64783fca1
2015-04-27 11:06:16 +02:00
ulteq
d6f757e096
Enabled scope adjustments for the Khalia (old) optic
2015-04-27 11:04:12 +02:00
Brisse89
db553644aa
Update stringtable.xml
...
Is this okay?
MAR-10 -> Noreen Bad news
EMR-1 -> SIG 762
Navid -> HK 122
2015-04-27 10:24:42 +02:00
commy2
d64783fca1
remove the calibers from the weapon names
2015-04-27 02:40:04 +02:00
ulteq
1fc044dfa9
Cleanup++:
...
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
2015-04-26 23:14:54 +02:00
ulteq
6170ef0d50
Code cleanup
2015-04-26 23:05:58 +02:00
Grzegorz
3b9019e363
Update stringtable.xml
2015-04-26 23:01:42 +02:00
Grzegorz
3d5f7b1bf0
Update stringtable.xml
2015-04-26 23:01:31 +02:00
Grzegorz
78329110a1
Update stringtable.xml
2015-04-26 23:01:18 +02:00
Grzegorz
5add444026
Update stringtable.xml
2015-04-26 23:01:10 +02:00
Grzegorz
cfd9c6b3e9
Update stringtable.xml
2015-04-26 23:01:02 +02:00
Grzegorz Sikora
a272258500
PL translation
2015-04-26 22:59:20 +02:00
ulteq
3e5462f3d4
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-26 22:50:54 +02:00
ulteq
af2dc62705
Improved a module setting description
2015-04-26 22:44:18 +02:00
Grzegorz Sikora
0f47d8bfb2
PL translation
2015-04-26 22:33:25 +02:00
ulteq
9bd32f5797
Fixed an incorrect module setting description
2015-04-26 22:33:11 +02:00
KoffeinFlummi
365f1e025b
Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 22:04:39 +02:00
commy2
aabe532829
manual merge
2015-04-26 21:26:57 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109
Merge https://github.com/simon84/ACE3 into german-merge
2015-04-26 21:00:22 +02:00
commy2
ac51d45f11
Merge pull request #848 from acemod/recoiltweaks
...
tweaking recoil
2015-04-26 20:59:27 +02:00
commy2
f5d7331847
no team management on the dead or unconscious units, fix #803
2015-04-26 20:57:55 +02:00
commy2
9b8e130b1f
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-26 19:33:23 +02:00
commy2
5320f4c6b7
fix broken parse text cache in some cases
2015-04-26 19:33:08 +02:00
commy2
6aea424f6d
Merge pull request #872 from acemod/muteuncon
...
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6
remove obsolete config entries
2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa
those damn mine detectors, also fix advanced medical box not showing up in zeus
2015-04-26 17:25:56 +02:00
Glowbal
4612298917
Merge pull request #864 from acemod/Add-translations-for-adv.-medical
...
Add translations for adv. medical
2015-04-26 17:06:36 +02:00
commy2
d6f2ac95dd
fix ace ammo box doesn't show up in zeus
2015-04-26 17:04:49 +02:00
commy2
8976b6983d
mute unconsious units
2015-04-26 16:47:36 +02:00
bux578
28a8fbc4fe
fix vector name
...
it's the vector 21 not the vector IV
2015-04-26 15:36:47 +02:00
bux578
6cc4f48eb2
Uppercase Injuries
2015-04-26 14:19:28 +02:00
bux578
67dc600cae
Merge branch 'master' of https://github.com/acemod/ACE3 into Add-translations-for-adv.-medical
2015-04-26 14:02:47 +02:00
bux578
b3c461b9da
last few translations
2015-04-26 14:02:14 +02:00
commy2
f96deadd20
imenu: remove shadow, fix caching
2015-04-26 12:41:15 +02:00
bux578
b2dd065429
remove comment
2015-04-26 12:27:06 +02:00
Glowbal
b266734f6e
Merge branch 'master' into medicalImprovements
2015-04-26 11:20:04 +02:00
Glowbal
fc08ebb0a5
added "isNotInside" exception to unload
2015-04-26 11:19:25 +02:00
bux578
dec47dade8
ups, remove test code
2015-04-26 09:38:56 +02:00
bux578
0aa2b31dd4
gj git
2015-04-26 09:37:02 +02:00
bux578
171cea998e
add most of the translations
2015-04-26 09:36:51 +02:00
ulteq
5ed7cee6fd
Fixed a copy&paste typo
2015-04-26 09:22:04 +02:00
VyMajoris
ba89bc8faa
Added - Myself to AUTHORS.txt
2015-04-26 03:15:25 -03:00
VyMajoris
523cb49ff1
Added - Portuguese translation to lots of things.
...
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
KoffeinFlummi
9a8dd5ee41
Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 01:03:29 +02:00
KoffeinFlummi
9ac662ea7c
Lowercase curator ammo frag entries
2015-04-26 00:01:48 +02:00
KoffeinFlummi
59bdc23a95
Merge branch 'master' into curatorFragmentation
2015-04-25 23:55:29 +02:00
commy2
986d2ee168
fix c&p error
2015-04-25 23:41:20 +02:00
PabstMirror
ca980379c8
Minor captive cleanup
2015-04-25 16:03:21 -05:00
PabstMirror
898d6c74a8
#854 - No canInteractWith check for Ace_MainAction
...
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
Glowbal
11d86248a7
Reorganised module and settings #809
2015-04-25 22:20:28 +02:00
ulteq
ca6a559557
Fixed a typo
2015-04-25 21:18:09 +02:00
Felix Wiegand
057c060212
Merge pull request #822 from acemod/frag-lowercase
...
Convert frag config entry names to lowercase
2015-04-25 20:46:59 +02:00
Felix Wiegand
dc7c7fcaf5
Merge pull request #811 from gienkov/master
...
PL translation
2015-04-25 20:46:47 +02:00
PabstMirror
2d3606302f
Merge pull request #464 from acemod/fixFiredNear
...
Hearing: Fix firedNear not working in vehicles
2015-04-25 13:34:18 -05:00
Felix Wiegand
6b5fa25ba9
Merge pull request #334 from acemod/mk6tweaks
...
Vanilla Mortars - Rangetables/Tweaks
2015-04-25 20:27:20 +02:00
Dimaslg
4b7daaa840
Spanish translation
...
Minor fixes and spelling mistakes.
2015-04-25 19:18:04 +02:00
ulteq
78eba4e703
Moved weather randomization back to postInit
2015-04-25 18:56:55 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
ulteq
71df545d52
Improved the Mk248 muzzle velocity shift table
2015-04-25 18:30:58 +02:00
PabstMirror
f0477b8e95
Make PARAM/Explode_X faster
...
skips the IS_ARRAY check normaly found in EXPLODE_1_SYS
2015-04-25 10:25:08 -05:00
ulteq
4a8153b757
Replaced EXPLODE_4_PVT macro inside of ABs PFH
2015-04-25 17:19:43 +02:00
Nicolás Badano
74867230d6
Merge pull request #853 from acemod/cacheparsetext
...
cache ctrlSetStructedText parseText
2015-04-25 10:54:15 -03:00
esteldunedain
fc49814689
Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches
2015-04-25 10:52:52 -03:00
Glowbal
8d12f57d0f
Merge pull request #687 from acemod/streamlinedBasicDiagnosis
...
Streamlined basic diagnosis
2015-04-25 15:19:29 +02:00
Grzegorz
3427bc5bbb
Update stringtable.xml
2015-04-25 14:37:03 +02:00
Grzegorz
a7e1d1c1c8
Update stringtable.xml
2015-04-25 14:36:53 +02:00
Grzegorz
f3d360d3d8
Update stringtable.xml
2015-04-25 14:36:42 +02:00
commy2
b7763331d6
the index
2015-04-25 14:34:09 +02:00
ulteq
eca7657ffa
Removed a bunch of obsolete code:
...
*Obsolete, as of: 6fdaf4c400
2015-04-25 13:34:47 +02:00
commy2
73b17efa2f
cache ctrlSetStructedText parseText
2015-04-25 13:28:21 +02:00
ulteq
b053a641d9
Improved bullet trace visibility check
2015-04-25 13:15:54 +02:00
ulteq
d8eee168aa
Improved onlyActiveForLocalPlayers abort condition check:
...
*Fixed alwaysSimulateForSnipers abort condition
2015-04-25 12:59:26 +02:00
Glowbal
6799903e4b
Also display different color for advanced
2015-04-25 12:45:04 +02:00
ulteq
2d14ae61f9
Simplified muzzle velocity shift calculation:
...
*Also added some missing privates
2015-04-25 12:36:04 +02:00
Glowbal
1415adc2bd
removed local diagnose action. Added localization
2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4
Merge branch 'master' into streamlinedBasicDiagnosis
2015-04-25 12:12:24 +02:00
ulteq
d414e5a3a1
Removed unused define
2015-04-25 12:08:31 +02:00
commy2
73f387d3e3
outline interaction menu text
2015-04-25 11:55:39 +02:00
ulteq
6fdaf4c400
Completely removed the SQF version of the advanced ballistics PFH
2015-04-25 10:59:48 +02:00
ulteq
f645672281
At least set GVAR(extensionAvailable) to true
2015-04-25 10:38:28 +02:00
Nou
7c857a5a7e
Make sure load spawns the function, not calls it.
2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c
Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission.
2015-04-25 00:49:47 -07:00
Glowbal
55529d0396
Added support for switching from 3d selections to radial menu
2015-04-25 09:41:55 +02:00
commy2
664d08d4aa
add option to only use action when clicking
2015-04-25 08:23:54 +02:00
commy2
12280bbcad
revive tmr camshake
2015-04-25 07:21:11 +02:00
commy2
d7d0f00592
tweaking recoil
2015-04-25 05:51:44 +02:00
KoffeinFlummi
d7b961043b
Remove animation reset before falling unconscious
...
This caused the unit to briefly move to the default animation,
which looked shite.
2015-04-24 22:20:16 +02:00
Grzegorz
aa0b1ecba0
PL translation fix
2015-04-24 21:35:20 +02:00
PabstMirror
3b9b09a7af
UpdateFiringTable-ChangesFromWeather
2015-04-24 13:26:09 -05:00
Glowbal
7dc8a08b89
Replaced _currentshooter by _this
...
Fixes script error `Error Undefined variable in expression: _currentshooter`
2015-04-24 20:03:04 +02:00
commy2
e207a11851
fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836
2015-04-24 19:02:29 +02:00
ulteq
b405f17df2
Added missing ;
2015-04-24 17:19:18 +02:00
ulteq
6361bda3e9
Removed unused function
2015-04-24 13:01:11 +02:00
ulteq
eb88f94cf7
Removed unused privates
2015-04-24 11:53:06 +02:00
ulteq
b3bf44fa1e
Code cleanup
2015-04-24 10:58:55 +02:00
ulteq
b3f4bf306d
Moved the global weather controls into preInit
2015-04-24 10:46:33 +02:00
ulteq
66e4c742b4
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-24 10:25:47 +02:00
ulteq
062aeae6e6
Fixed several bugs in the rain simulation:
...
*Added missing rain initialization based on overcast value
*Added proper fade out when the overcast changes from >=0.7 to <0.7
*Removed duplicate code
2015-04-24 10:25:31 +02:00
ulteq
50546646fa
Added missing rain_period_count reset to 0
2015-04-24 10:05:13 +02:00
ulteq
5a90ef6207
Added global variables (syncRain, syncWind, syncMisc) which give some control over the weather module:
...
*Removed duplicate debug output
2015-04-24 10:03:48 +02:00
ulteq
709fdcdd08
Merge pull request #821 from Brisse89/master
...
Added realistic tracer burn times for several ammo types
2015-04-24 08:28:43 +02:00
Glowbal
0146439925
increasing the text box height #834
...
Temporary solution until we get something properly done.
Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.
2015-04-24 07:46:01 +02:00
esteldunedain
e3a06999c3
Reduce MainActions distance for CAManBase from 5m to 4m
2015-04-24 00:57:49 -03:00
esteldunedain
c8563ce484
Add LOS check for actions points. Close #785
2015-04-24 00:57:22 -03:00
Grzegorz
e8a48fa81c
PL translation fix
...
Apparently mini-spike AT still wants to shoot down planes and choppers :)
2015-04-24 01:54:36 +02:00
PabstMirror
aa7de84783
Merge branch 'master' into mk6tweaks
2015-04-23 13:34:25 -05:00
PabstMirror
55732d4262
Text Shadow should have been black.
2015-04-23 13:33:38 -05:00
ulteq
ddf62b6db4
Added missing privates
2015-04-23 16:08:02 +02:00
KoffeinFlummi
24efbf731d
Convert frag config entry names to lowercase
2015-04-23 15:46:50 +02:00
ulteq
b0eadf83c7
Fixed incorrect typicalSpeed
2015-04-23 14:04:01 +02:00
Brisse89
91dfd9802a
Update CfgAmmo.hpp
2015-04-23 13:58:42 +02:00
Brisse89
8d4fff6359
Update CfgAmmo.hpp
2015-04-23 13:56:46 +02:00
Brisse89
5bfa97f490
Update CfgAmmo.hpp
2015-04-23 13:55:26 +02:00
Brisse89
f0a1900ad4
Update CfgAmmo.hpp
2015-04-23 13:53:42 +02:00
Brisse89
ae8a512e8f
Update CfgAmmo.hpp
2015-04-23 13:47:25 +02:00
Brisse89
0001609791
Update CfgAmmo.hpp
...
Added realistic tracer burn times for several ammo types:
B_556x45_Ball (parent for several tracer rounds)
ACE_545x39_Ball_7T3M
B_762x51_Ball (parent for several tracer rounds)
ACE_762x54_Ball_7T2
ACE_762x39_Ball_57N231P
Also changed color on russian tracer rounds from yellow to green, which is what they are in the real world.
2015-04-23 13:44:55 +02:00
ulteq
b1521345c2
Added magazines for the new AP rounds:
...
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
ulteq
dd72fced36
Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes:
...
*Recalculated the vanilla calibers based on (6.5mm ~ 1.0)
2015-04-23 12:42:01 +02:00
ulteq
be595d9c9e
Made the wind speed change less often during good weather
2015-04-23 11:54:24 +02:00
KoffeinFlummi
d1c95ba8a1
Add maximum unconsciousness time option
2015-04-23 11:31:27 +02:00
ulteq
e9bb1eea4c
Minor muzzle velocity correction for the 6.5mm Creedmor
2015-04-23 11:27:43 +02:00
Brisse89
c975213579
Update CfgAmmo.hpp
...
Added missing data to 40mm grenades.
2015-04-23 11:11:38 +02:00
KoffeinFlummi
84e1937515
Add damage threshold to basic
2015-04-22 23:50:37 +02:00
ulteq
860b4a446a
Updated the 6.5mm Creedmor airFriction:
...
*Also added it to the ATRagMX gun list
2015-04-22 22:48:38 +02:00
KoffeinFlummi
d10f4d543d
Enable unit specific bleeding coefficient
2015-04-22 22:38:48 +02:00
KoffeinFlummi
74ca85cbd9
Change getBloodLoss to expect an array
2015-04-22 22:36:41 +02:00
KoffeinFlummi
f6eeb5e3ba
Add pain coefficient
2015-04-22 22:29:31 +02:00
ulteq
09ff217e93
Improved the init process
2015-04-22 21:16:01 +02:00
ulteq
74888b4fff
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul
2015-04-22 19:47:06 +02:00
ulteq
a9726d2b60
Simplified the wind direction change calculation
2015-04-22 19:46:27 +02:00
ulteq
caf2f12eb9
Improved the wind direction selection based on the probability array
2015-04-22 19:46:09 +02:00
jaynus
0c6786a138
use the vehicle of the player for variables, not the player. allows static optics. FIxes #808
2015-04-22 08:07:58 -07:00
jaynus
d63de3a09e
restart PFH on optic reload. Fixes #812
2015-04-22 07:49:18 -07:00
Grzegorz Sikora
1063d4bb2c
PL translation
2015-04-22 13:17:43 +02:00
ulteq
ac5d593271
Switched to an improved version of the old getWind function
2015-04-22 12:56:07 +02:00
ulteq
e7bc0c26bc
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul
2015-04-22 11:54:18 +02:00
ulteq
1d108f42a7
Added a magazine for the new 6.5 Creedmor cartridge
...
*Fixed the 65x47mm short name
2015-04-22 11:53:22 +02:00
ulteq
2ec95c2862
Brackets
2015-04-22 11:32:16 +02:00
ulteq
f8006eaac9
Expanded the ammo database:
...
*30-06 Springfield (.30 Cal M1 Ball 174 grain)
*6.5 Creedmore (Berger .264 cal 140 grain Hybrid)
*7mm Rem Mag (Berger .284 cal 180 grain Hybrid)
*.243 Win (Berger .243 cal 105 grain Hybrid)
2015-04-22 11:31:11 +02:00
ulteq
e479557f8a
Some magazine Stringtable fixes
2015-04-22 10:48:45 +02:00
ulteq
b4ec13aa8c
Merge branch 'feature/realname_extend' of https://github.com/rlex/ACE3 into rlex-feature/realname_extend
...
Conflicts:
addons/realisticnames/stringtable.xml
2015-04-22 10:10:00 +02:00
Glowbal
fedbf84d5f
Merge pull request #800 from acemod/fixDraggingAvailableWithoutMedical
...
Fixed dragging always available when medical module is removed
2015-04-22 07:43:23 +02:00
PabstMirror
8ec86a337f
Show Loaded Ammo for static weapons
2015-04-21 19:35:04 -05:00
jaynus
b2c5e5e9f1
Remove AB verison check until versioning is complete.
2015-04-21 17:04:16 -07:00
jaynus
b384d62edd
Fixes typos in medical strings causing missing strings.
2015-04-21 17:02:50 -07:00
Nicolás Badano
b6d7e12507
Merge pull request #779 from gienkov/master
...
PL translation fix
2015-04-21 19:25:53 -03:00
commy2
1facca2ba9
fix: missing authors on flares, remove inert duplicate of handgrenade from zeus
2015-04-22 00:24:54 +02:00
Grzegorz
485fd7078f
Update stringtable.xml
2015-04-22 00:22:44 +02:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
commy2
cfda0e17c6
Merge pull request #788 from acemod/animfix
...
put weapon on back without having to stand up
2015-04-21 23:40:52 +02:00
ulteq
a886afb7d0
Added a model for the ACE_Box_Ammo
2015-04-21 23:26:38 +02:00
Nicolás Badano
3105cef364
Merge pull request #787 from acemod/interactionHighVisibility
...
User changeable text/shadow colors for interaction
2015-04-21 17:31:11 -03:00
Nicolás Badano
18bb40b72b
Merge pull request #798 from acemod/fixMapAir
...
Illuminate map for gunner of helicopters. Fixes #558
2015-04-21 16:52:17 -03:00
jaynus
d8d658602f
Apply to all aircraft gunner and pilot
2015-04-21 12:50:42 -07:00
Glowbal
0ab25a2866
fixed #659
2015-04-21 21:41:00 +02:00
ulteq
2fa39615f3
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul
2015-04-21 21:06:30 +02:00
jaynus
b2f978da3c
Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556
2015-04-21 12:01:30 -07:00
jaynus
08203b26c7
Illuminate map for gunner of helicopters. Fixes #558
2015-04-21 11:58:07 -07:00
ulteq
d7f67970a4
Fixed a bug in the wind direction init code
2015-04-21 20:55:04 +02:00
ulteq
1db9f055e2
Removed debug output
2015-04-21 20:54:47 +02:00
ulteq
428baefc2c
Added random temperatureShift, badWeatherShift, humidityShift
2015-04-21 20:41:50 +02:00
ulteq
30d1b1b5e5
Fixed a typo in the updateTemperature function
2015-04-21 20:20:22 +02:00
ulteq
af4fdda477
Continued work on the new wind system:
...
* Moved the wind data into CfgWorlds.hpp
* Modified the contents of ACE_WIND_PARAMS
* new getWind function for the clients
* new wind init based on the real world weather data
2015-04-21 20:20:05 +02:00
Nicolás Badano
ce3cc71869
Merge pull request #795 from acemod/fixAuthor
...
remove author from items inheriting ACE_ItemCore
2015-04-21 15:08:53 -03:00
Nicolás Badano
421954c829
Merge pull request #794 from Legolasindar/master
...
updated stringtable for spanish
2015-04-21 15:07:12 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +02:00
PabstMirror
be031801ab
#770 - m84 - don't add pain if strength is low
2015-04-21 12:09:58 -05:00
Ivan Navarro Cabello
55887b7cfe
updated stringtable for spanish
...
added some spanish translate
2015-04-21 19:03:55 +02:00
bux578
7b4f451d8a
reduce m84 mass
...
m84 weighs ~260g compared to a m18 with ~520g. Ingame the m18 has a mass
of 4 but giving the m84 a mass of 2 seems odd to me. That's why I've
reduced it from 10 to 4.
2015-04-21 19:00:13 +02:00
ulteq
7c57ad25bd
Fixes a recently introduced bug in the relative click memory
2015-04-21 16:54:26 +02:00
ulteq
287c0d62ca
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul
2015-04-21 16:03:28 +02:00
ulteq
e22a7e1aad
Improved the range card column spacing
2015-04-21 16:01:53 +02:00
ulteq
c27f3fb131
Added target speed direction switch / Improved the solution result output
2015-04-21 15:46:53 +02:00
ulteq
4833193860
Added a new solution setup menu
2015-04-21 15:01:23 +02:00
ulteq
c24586ce02
Reworked the result output GUI on the main page
2015-04-21 11:53:28 +02:00
ulteq
0cf2374475
Atmospheric Calc Method GUI improvement
2015-04-21 11:43:16 +02:00
ulteq
f98a0cdfae
Overworked the scope click number GUI
2015-04-21 11:24:59 +02:00
ulteq
6c4b078dce
Updated the default gun profile used for adding new profiles
2015-04-21 09:46:57 +02:00
commy2
616eee6aa4
remove broken launcher anim
2015-04-21 06:22:41 +02:00
commy2
5093307756
experiment with launcher anim
2015-04-21 06:10:30 +02:00
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
PabstMirror
1f13d229a8
Stagger creating actions over time
2015-04-15 00:13:23 -05: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
Nou
15ac5ec7b8
Two explosions processed per-frame.
2015-04-14 16:33:47 -07: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
Nou
114d66af7e
Do it every frame, no need for delay.
2015-04-14 13:00:57 -07: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
PabstMirror
b2be71c9cf
Merge branch 'master' into userActionPrototype
2015-04-14 14:22:57 -05: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
Nou
14579fb90e
Explosive reflection, enabled on all frag rounds.
2015-04-14 00:41:19 -07:00
PabstMirror
85beb72a3a
ASL Stuff
2015-04-13 23:27:03 -05:00
PabstMirror
c6b4a57ee2
Pull Icon from config
2015-04-13 23:11:18 -05:00
PabstMirror
5c994765ef
Cleanup
2015-04-13 22:39:00 -05:00
PabstMirror
e84c5f4bb3
Radius Distance
2015-04-13 22:26:38 -05:00
PabstMirror
fda4f60a9e
House UserAction Prototype
2015-04-13 22:19:38 -05: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
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
commy2
c03ee8e9c6
lowercase gps
2015-04-10 18:34:26 +02:00
commy2
dc49f2c71e
rewrite assigned item fix
2015-04-10 18:31:43 +02:00
FreeZbe
31a08d22d8
Translation changes
2015-04-10 18:18:45 +02:00
ulteq
9604699f26
Replaced QUOTE(GVAR(...)) with QGVAR(...)
2015-04-10 18:11:01 +02:00
ulteq
4e50760064
Fixed a syntax error
2015-04-10 18:08:38 +02:00
commy2
5ff1d9863d
remove +2 offset for check temperature, also fix the shade of grey, #431
2015-04-10 17:48:21 +02:00
commy2
fc98e78a53
hide check temperature action when empty weapon is selected, #431
2015-04-10 17:36:58 +02:00
FreeZbe
62bb1c6907
Translation changes
2015-04-10 17:11:15 +02:00
FreeZbe
6de5cd76dc
Translation changes
2015-04-10 17:10:51 +02:00
commy2
c7ad94efbf
renamed hpp to ACE_Triggers
2015-04-10 17:09:48 +02:00
