esteldunedain
|
12895e7983
|
Remove unneeded parameter
|
2016-02-28 22:58:09 -03:00 |
|
esteldunedain
|
0e82cdfe82
|
Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.
|
2016-02-28 22:50:04 -03:00 |
|
esteldunedain
|
21d4939abb
|
Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10
|
2016-02-28 22:08:59 -03:00 |
|
esteldunedain
|
35e13d5357
|
Fixes
|
2016-02-28 20:55:05 -03:00 |
|
esteldunedain
|
bbb84ec7d1
|
Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities
|
2016-02-28 20:50:28 -03:00 |
|
esteldunedain
|
085860c770
|
Restore addToInjuredCollection as a deprecated function
|
2016-02-28 20:32:02 -03:00 |
|
esteldunedain
|
bed51ac8a4
|
Fix waitAndExecute syntax
|
2016-02-28 20:26:05 -03:00 |
|
esteldunedain
|
3bbabac2d7
|
Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.
|
2016-02-28 20:12:56 -03:00 |
|
Nicolás Badano
|
8fc4a9d901
|
Merge pull request #3461 from acemod/revert-3451-350fixFastropeAnimsBoneErrors
Revert "Convert fastroping animations to Arma 3, fix bone errors"
|
2016-02-28 19:24:28 -03:00 |
|
jonpas
|
f5ff593dea
|
Revert "Convert fastroping animations to Arma 3, fix bone errors"
|
2016-02-28 23:16:44 +01:00 |
|
jonpas
|
99cd7b427f
|
Merge pull request #3460 from acemod/350fixDupString
Remove duplicate medical string
|
2016-02-28 22:55:58 +01:00 |
|
jonpas
|
8d326a0a1b
|
Remove duplicate medical string
|
2016-02-28 22:54:24 +01:00 |
|
PabstMirror
|
e5b79d7b33
|
Don't try adding repair actions to fastrope helper
|
2016-02-28 14:17:14 -06:00 |
|
BaerMitUmlaut
|
75c2e3d032
|
Added QUOTE macros to fastroping configs
|
2016-02-28 18:56:45 +01:00 |
|
VKing
|
8bb7b072d4
|
Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
|
2016-02-28 15:18:15 +01:00 |
|
BlackWindowS
|
c61e7b5104
|
Tweaked & added translations
Translation of almost every STR to French
|
2016-02-28 14:48:04 +01:00 |
|
Thomas Kooi
|
6bfe86e91a
|
Merge pull request #3455 from acemod/fix3450
Fix #3450
|
2016-02-28 13:07:03 +01:00 |
|
Thomas Kooi
|
a09d0be0d4
|
Merge pull request #3453 from acemod/hideEmptyCategories
Hide categories that have no user settable options
|
2016-02-28 13:05:55 +01:00 |
|
commy2
|
69f810f32b
|
add missing pee
|
2016-02-28 07:25:11 +01:00 |
|
commy2
|
03b8e2b590
|
fix reloadMutex nil, fix#3450
|
2016-02-28 06:12:40 +01:00 |
|
PabstMirror
|
147cd1a5af
|
Hide categories that have no user settable options
|
2016-02-27 18:06:02 -06:00 |
|
jonpas
|
2527de1acb
|
Merge pull request #3451 from acemod/350fixFastropeAnimsBoneErrors
Convert fastroping animations to Arma 3, fix bone errors
|
2016-02-27 22:38:58 +01:00 |
|
jonpas
|
0e606224c7
|
Convert fastroping animations to Arma 3, fix bone errors
|
2016-02-27 22:28:12 +01:00 |
|
Thomas
|
4d7663da01
|
Merge pull request #3 from acemod/master
Update Fork
|
2016-02-27 22:04:45 +01:00 |
|
jonpas
|
992b4190e1
|
Merge pull request #3446 from acemod/350addMissingMedicalTexts
Make unused medical strings be used
|
2016-02-27 21:05:52 +01:00 |
|
jonpas
|
905586bddc
|
Make unused medical strings be used
|
2016-02-27 21:04:04 +01:00 |
|
Glowbal
|
428b828c27
|
Increase version 3.5.0
|
2016-02-27 20:44:38 +01:00 |
|
Thomas Kooi
|
f758a90351
|
Merge pull request #3445 from acemod/preventSelfIMFromClosing
Prevent Self Interact Menu from bugging out during animations
|
2016-02-27 20:35:18 +01:00 |
|
Thomas Kooi
|
d0b1ac56ba
|
Merge pull request #3440 from System98/Update-german-translations
Update german translations
|
2016-02-27 20:33:51 +01:00 |
|
Thomas Kooi
|
6f4c3483cb
|
Merge pull request #3444 from ElTyranos/patch-4
Fastrope French translation
|
2016-02-27 20:32:53 +01:00 |
|
esteldunedain
|
a86bbdb162
|
Prevent the interact menu from closing when moving the mouse during animations
|
2016-02-27 15:47:23 -03:00 |
|
ElTyranos
|
9d50812a65
|
Fastrope French translation
|
2016-02-27 19:46:15 +01:00 |
|
esteldunedain
|
121663226c
|
Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases.
|
2016-02-27 15:44:53 -03:00 |
|
commy2
|
a7ec4d9d2f
|
Merge pull request #3398 from acemod/fix3317
Resync mine orientations in JIP.
|
2016-02-27 16:52:53 +01:00 |
|
Thomas Kooi
|
a9fa3a99b8
|
Merge pull request #3441 from acemod/fixNametagsError
Fix error in nametags when a player disconnects
|
2016-02-27 15:17:15 +01:00 |
|
esteldunedain
|
30d62859dc
|
Fix error in nametags when a player disconnects
|
2016-02-27 10:17:26 -03:00 |
|
esteldunedain
|
188941a9b7
|
Filter the GVAR(explosivesOrientations) list before sending it
|
2016-02-27 10:07:51 -03:00 |
|
esteldunedain
|
fba1a322ac
|
Yet more fixes
|
2016-02-27 09:50:44 -03:00 |
|
esteldunedain
|
823eb116ae
|
more fixes
|
2016-02-27 09:37:57 -03:00 |
|
esteldunedain
|
8280335d07
|
Fix event name typo
|
2016-02-27 09:26:42 -03:00 |
|
esteldunedain
|
b9e1028f23
|
Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317
|
2016-02-27 09:14:16 -03:00 |
|
esteldunedain
|
834cbb4d24
|
Debug stuff
|
2016-02-27 09:14:07 -03:00 |
|
esteldunedain
|
849fa4f1ee
|
Redo markers, lost in the merge
|
2016-02-27 09:06:19 -03:00 |
|
System98
|
df3ec3a179
|
Fix length of a display name
- Fix the length of a display name so it doesn't get cut off in the
settings.
|
2016-02-27 12:51:32 +01:00 |
|
System98
|
a13b029b4a
|
Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations
|
2016-02-27 12:50:07 +01:00 |
|
esteldunedain
|
db4974eae2
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317
Conflicts:
addons/medical/CfgEden.hpp
addons/repair/CfgEden.hpp
|
2016-02-27 08:48:57 -03:00 |
|
Thomas Kooi
|
ae136af2d6
|
Merge pull request #3415 from looterz/bftplayernames
Added Show Player Names option to Blue Force Tracking Module
|
2016-02-27 12:43:15 +01:00 |
|
Thomas Kooi
|
a0ea724db4
|
Merge pull request #3436 from acemod/register-last-damage-source
Add registering last damage source
|
2016-02-27 12:42:11 +01:00 |
|
Thomas Kooi
|
adcfec6ff0
|
Merge pull request #3430 from GitHawk/refuel_ropeImprovement
Refuel improvements
|
2016-02-27 12:40:50 +01:00 |
|
Thomas Kooi
|
938c1f4c0a
|
Merge pull request #2904 from BaerMitUmlaut/fastroping
Fastroping
|
2016-02-27 12:36:43 +01:00 |
|