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

3508 Commits

Author SHA1 Message Date
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