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
commy2
44fad81fe1
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 06:51:59 +02:00
esteldunedain
69aef53f5b
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-15 01:34:10 -03:00
esteldunedain
25e8e93fd0
Add back stringtables for the list menu
2015-04-15 01:32:42 -03:00
Nicolás Badano
d7a0503dbc
Merge pull request #600 from acemod/lmbmenu
...
disable firing if menu is opened, fix #368 , close #483
2015-04-15 01:29:39 -03:00
esteldunedain
5faf4b7dfa
Remove comment
2015-04-15 01:27:29 -03:00
PabstMirror
a36739c697
Merge pull request #418 from acemod/flashbangTweaks
...
Flashbang tweaks
2015-04-14 23:23:15 -05:00
esteldunedain
a9f44530c9
Move the function that prevents firing while the interact_menu is open to the interact_menu pbo
2015-04-15 01:20:20 -03:00
PabstMirror
1f51a3fc8a
Never use this func anywhere
2015-04-14 23:10:05 -05:00
PabstMirror
428688422e
Missing stringtable for listMenu
2015-04-14 22:47:57 -05:00
Niko Lehtovirta
df8a958c42
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-15 06:45:42 +03:00
commy2
d6a293c573
disable firing if menu is opened
2015-04-15 05:19:03 +02:00
esteldunedain
7ad9238bbf
Fixes
2015-04-14 23:32:03 -03:00
esteldunedain
c6c7ef7c79
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 23:22:35 -03:00
esteldunedain
c397246534
Fix the fov test. Issue not fixed
2015-04-14 23:22:08 -03:00
jaynus
57acee0f89
Changed: Cleaned up Missile guidance setting for AI, SCALAR.
2015-04-14 19:19:14 -07:00
esteldunedain
53ce7d0be4
Increase the tolerance to 2m
2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960
Add early visibility check to interact menu
2015-04-14 22:53:10 -03:00
PabstMirror
00b9e2d72c
draw3d
2015-04-14 20:49:44 -05:00
PabstMirror
91c8c89e87
Only sync A3 VON status over network
2015-04-14 20:47:07 -05:00
jaynus
b307b4bc4b
Fixed: Flummi missed 2 isClientSettable renames.
2015-04-14 18:38:52 -07:00
jaynus
ad95105508
Added and enabled AMG for AI.
2015-04-14 18:25:02 -07:00
jaynus
ef6d090238
Fixed: JAV_DIR was erroring.
2015-04-14 18:18:38 -07:00
jaynus
37de67395f
Fixed: issue where Javelin wouldn't hit > 1500
2015-04-14 18:18:27 -07:00
commy2
2940d1f83c
base rallypoints create a respawn marker if none is present in the mission
2015-04-15 03:10:17 +02:00
PabstMirror
1488ba2aac
#595 - Hide ace optino button if no world loaded
...
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
2015-04-14 19:52:35 -05:00
commy2
e1926c6af1
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:12:16 +02:00
jaynus
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07:00
commy2
29633d763a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 02:05:55 +02:00
jaynus
fb6553a7a7
Only show distance if laser is on.
2015-04-14 16:57:01 -07:00
commy2
4cdf61ab9e
fix misc issues with rallypoints
2015-04-15 01:50:58 +02:00
Grzegorz
d538cd257c
PL translation fix
...
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
2015-04-15 01:44:33 +02:00
Nicolás Badano
10b1587453
Merge pull request #592 from gienkov/master
...
PL translation
2015-04-14 20:36:25 -03:00
jaynus
934f2ce097
Display current laser code. Standardize GVARs
2015-04-14 16:29:49 -07:00
esteldunedain
88b78ad3ca
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 20:21:39 -03:00
esteldunedain
ee04ea2f41
Allow actions on coordinates instead of selections
2015-04-14 20:21:11 -03:00
jaynus
2ec74a6a3e
align correctly, create event, remove FCS from laserDesignator.
2015-04-14 16:20:03 -07:00
jaynus
971566fc3e
Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER
2015-04-14 16:05:01 -07:00
Grzegorz Sikora
3543b9c806
PL Translation
...
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
jaynus
81e61e2f04
Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591
2015-04-14 15:30:04 -07:00
esteldunedain
2ff6eef792
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:18:08 -03:00
esteldunedain
ad750977e0
Fix ACRE volume on medical unconsciousness
2015-04-14 19:17:05 -03:00
jaynus
10bb77e738
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 15:11:55 -07:00
jaynus
c136b78fc8
rename 20mm
2015-04-14 15:11:49 -07:00
esteldunedain
495c822061
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489
Merge branch 'master' into linearMenuExperiment
...
Conflicts:
addons/attach/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/overheating/stringtable.xml
extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
commy2
7c5a6538a9
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix
2015-04-15 00:06:12 +02:00
jaynus
36ebb96531
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:58:29 -07:00
jaynus
85c10328ae
missed one.
2015-04-14 14:58:19 -07:00
Felix Wiegand
5d8dd701d2
Merge pull request #518 from acemod/basic-medical-tweaks
...
Basic medical tweaks
2015-04-14 23:49:00 +02:00
jaynus
df3c8155a0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf
fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588
2015-04-14 14:45:21 -07:00
commy2
4c6cc8dddf
merging stringtables
2015-04-14 23:22:25 +02:00
KoffeinFlummi
9b80245479
Fix speed limiter not working
2015-04-14 23:13:02 +02:00
