SzwedzikPL
|
8bcf24a9c9
|
Merge pull request #1 from BaerMitUmlaut/dogtags
Added custom dogtag model and images
|
2016-06-08 00:24:32 +02:00 |
|
BaerMitUmlaut
|
5dbe99b740
|
Adjusted single and double dogtag renders
|
2016-06-07 20:40:26 +02:00 |
|
BaerMitUmlaut
|
9d4bd0f8dd
|
Added custom dogtag model and images
|
2016-06-02 00:59:15 +02:00 |
|
SzwedzikPL
|
174e69c3a5
|
move dogtag macros to CfgWeapons
|
2016-03-23 17:33:08 +01:00 |
|
SzwedzikPL
|
1cdecf75da
|
double dogtag support, fix addDogtagItem event in mp, unconscious units support, little cleanup
|
2016-03-19 18:12:18 +01:00 |
|
SzwedzikPL
|
ca3171a33a
|
Initial commit dogtags
|
2016-03-19 16:17:26 +01:00 |
|
PabstMirror
|
e96c1a7dc6
|
Merge branch 'release'
|
2016-03-12 13:47:57 -06:00 |
|
PabstMirror
|
1ffd23c193
|
Merge pull request #3581 from acemod/FixTrue
Fix versioning true when compiled
|
2016-03-12 13:47:59 -06:00 |
|
PabstMirror
|
2ab169eb73
|
Merge branch 'release' into FixTrue
|
2016-03-12 13:46:44 -06:00 |
|
PabstMirror
|
1985e7e20a
|
Fix versioning true when compiled
|
2016-03-12 13:42:52 -06:00 |
|
Thomas Kooi
|
61f1959109
|
Fix morphine increasing viscosity
Morphine should decrease viscosity instead of increase. Closes #3579
|
2016-03-12 18:55:42 +01:00 |
|
commy2
|
7067292a0e
|
Merge pull request #3578 from acemod/fixinteractmenusavegamecherry
reset interaction menu time variables on save game load
|
2016-03-12 17:16:03 +01:00 |
|
commy2
|
fca8b51bb2
|
reset interaction menu time variables on save game load
|
2016-03-12 17:08:08 +01:00 |
|
commy2
|
bf902da3ec
|
Merge pull request #3575 from acemod/cantInteractIfDead
Add alive _unit to the conditions required for interaction
|
2016-03-12 16:19:34 +01:00 |
|
esteldunedain
|
aad79eda85
|
The dead shouldn't interact (it's not TWD)
|
2016-03-12 10:06:45 -03:00 |
|
commy2
|
7c2977ed47
|
Merge pull request #3150 from acemod/fixinteractmenusavegame
reset interaction menu time variables on save game load
|
2016-03-10 23:46:37 +01:00 |
|
esteldunedain
|
3122542814
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-03-08 15:25:04 -03:00 |
|
esteldunedain
|
b13d662275
|
Merge branch 'BaerMitUmlaut-fr-fix-quotes'
|
2016-03-08 15:24:44 -03:00 |
|
esteldunedain
|
69bd858167
|
Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
Conflicts:
addons/fastroping/CfgMoves.hpp
addons/fastroping/CfgVehicles.hpp
|
2016-03-08 15:24:23 -03:00 |
|
Thomas Kooi
|
bfe738ba80
|
Merge pull request #3513 from acemod/cbaVersioning
Add CBA 2.3.1 to versioning check
|
2016-03-08 19:21:36 +01:00 |
|
Thomas Kooi
|
ddd8187b19
|
Merge pull request #3534 from GitHawk/refuel_isEngineOn
Disallow refueling with running engine
|
2016-03-08 19:20:28 +01:00 |
|
esteldunedain
|
350b3351d1
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-03-08 15:14:56 -03:00 |
|
esteldunedain
|
558d7da27d
|
Merge branch 'BaerMitUmlaut-fr-ai-deploy'
|
2016-03-08 15:14:21 -03:00 |
|
esteldunedain
|
2b33dd7686
|
Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy
Conflicts:
addons/fastroping/XEH_preInit.sqf
|
2016-03-08 15:13:50 -03:00 |
|
Nicolás Badano
|
9ff319ea38
|
Merge pull request #3495 from BaerMitUmlaut/rhs-fastroping-comp
RHS Fastroping compatibility
|
2016-03-08 15:10:06 -03:00 |
|
esteldunedain
|
88f4c49c08
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-03-08 15:08:53 -03:00 |
|
esteldunedain
|
035f411f43
|
Merge branch 'BaerMitUmlaut-fr-fixes'
|
2016-03-08 15:08:15 -03:00 |
|
esteldunedain
|
afe835816f
|
Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
Conflicts:
addons/fastroping/CfgVehicles.hpp
|
2016-03-08 15:07:45 -03:00 |
|
commy2
|
4ceb1b34b8
|
Merge pull request #3566 from acemod/removeDragCarryFromCannons
Disable drag and carry for StaticCannon
|
2016-03-08 19:05:04 +01:00 |
|
PabstMirror
|
1a77b0fcd4
|
Disable drag and carry for StaticCannon
#3528
|
2016-03-08 11:43:35 -06:00 |
|
Thomas Kooi
|
60af0d3162
|
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
|
2016-03-08 18:19:50 +01:00 |
|
PabstMirror
|
3232654e13
|
Close #3565 -Fix spelling of local var _woundEffectiveness
|
2016-03-08 11:02:54 -06:00 |
|
commy2
|
5b877809ed
|
Merge pull request #3560 from acemod/unscheduledactions
execute addActionEvents in unscheduled env
|
2016-03-08 16:13:43 +01:00 |
|
commy2
|
e605ede04a
|
execute addActionEvents in unscheduled env
|
2016-03-08 01:19:32 +01:00 |
|
BaerMitUmlaut
|
35857f4523
|
Cleanup canPrepareFRIES
|
2016-03-07 20:42:13 +01:00 |
|
BaerMitUmlaut
|
8c867e5e55
|
Standardised script_component inclusion
|
2016-03-07 20:15:55 +01:00 |
|
Thomas Kooi
|
d86f58f418
|
Merge pull request #3525 from acemod/sandbag3den
Set sandbag side to civ to show in 3den
|
2016-03-07 19:30:24 +01:00 |
|
BaerMitUmlaut
|
45383a0c1d
|
Fixed missing bracket
|
2016-03-07 18:55:51 +01:00 |
|
SzwedzikPL
|
46367c003c
|
Fixed EH parameters, prevent wrong fastroping option due to inherition
|
2016-03-07 18:55:50 +01:00 |
|
BaerMitUmlaut
|
7344474658
|
Added RHS Fastroping compatibility
|
2016-03-07 18:55:49 +01:00 |
|
Thomas Kooi
|
8946779c1a
|
Merge pull request #3527 from acemod/fixHrCallbackVar
Fix empty callback for hr adjustment
|
2016-03-07 12:51:23 +01:00 |
|
BaerMitUmlaut
|
c65656a016
|
Improved rope glitchyness
|
2016-03-06 20:33:23 +01:00 |
|
BaerMitUmlaut
|
84af4b7676
|
Force open ramps on helicopters
|
2016-03-06 19:53:37 +01:00 |
|
commy2
|
a85c5b14cf
|
Merge pull request #3547 from acemod/fixsavegamecrashmaybe
Store Interact Menus on CBA Namespaces
|
2016-03-06 19:28:26 +01:00 |
|
commy2
|
a9578ab473
|
Merge pull request #3524 from acemod/fixCancelAction
Fix Cancel (RMB) Action
|
2016-03-06 19:16:40 +01:00 |
|
commy2
|
81c29d8120
|
Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint
Disable only action menu on mouse hint and modifier where unnecessary
|
2016-03-06 19:13:10 +01:00 |
|
commy2
|
391aaeba89
|
Merge pull request #3548 from acemod/namespaceforcargofilters
use namespace for cargo filters, fixes problem with save games
|
2016-03-06 19:10:53 +01:00 |
|
commy2
|
c90775091e
|
Merge pull request #3549 from acemod/fixmagincompat
remove obsolete fix, fix #3545
|
2016-03-06 19:10:45 +01:00 |
|
jonpas
|
858c68f8d7
|
Don't use modifier for rotation where not needed
|
2016-03-06 16:54:27 +01:00 |
|
jonpas
|
c378cd9f12
|
Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands
|
2016-03-06 16:47:46 +01:00 |
|