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
9,755 Commits 73 Branches 88 Tags 752 MiB
590d4fa70b
Commit Graph

9755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
Thomas Kooi
e8b26a7a14 Merge pull request #3593 from BaerMitUmlaut/release 
Fixed fastroping race condition
 2016-03-18 12:07:43 +01:00
bux578
0fc7525cbd Update CONTRIBUTING.md 2016-03-18 09:27:06 +01:00
PabstMirror
0b02bd1a5a Merge pull request #3592 from acemod/fixNametagsRank 
Fix nametag error when rank is empty string
 2016-03-17 20:45:05 -05:00
BaerMitUmlaut
fc06782256 Fixed broken ropeDetach 2016-03-18 00:16:31 +01:00
BaerMitUmlaut
b25ffdb54f Fixed network race condition 2016-03-18 00:15:57 +01:00
commy2
5e52e22e81 Merge branch 'release' into fixNametagsRank 2016-03-17 20:14:40 +01:00
PabstMirror
218d333738 Fix nametag error when rank is empty string 2016-03-17 11:56:20 -05:00
Glowbal
485900dce8 increment patch version 2016-03-16 22:59:28 +01:00
PabstMirror
8ffcc7378f Merge branch 'release' 2016-03-16 16:50:04 -05:00
Thomas Kooi
559d111e66 Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit 
Fix mortar ammo handling init on dedicated
 2016-03-16 22:48:49 +01:00
commy2
d9437a982a Merge pull request #3585 from acemod/revc65656a0 
Revert the "Improve rope glitchyness" commit
 2016-03-16 22:46:24 +01:00
commy2
0c42bb5345 Merge branch 'release' into revc65656a0 2016-03-16 22:44:19 +01:00
commy2
1945230af8 Merge pull request #3589 from acemod/fncFilterToSelect 
Replace usage of filter to select in tagging
 2016-03-16 22:07:51 +01:00
jonpas
72c9e9da39 Replace usage of filter to select in tagging 2016-03-16 20:17:23 +01:00
jonpas
c568c18865 Add module icon 2016-03-14 19:14:52 +01:00
jonpas
89924e927a Disable debug 2016-03-14 17:25:20 +01:00
Nicolás Badano
8ff4fb8851 Merge branch 'release' into revc65656a0 2016-03-14 12:21:11 -03:00
esteldunedain
14183470bc Revert "Improved rope glitchyness" 
This reverts commit c65656a016.
 2016-03-14 12:16:23 -03:00
SzwedzikPL
32846014a1 fix ammo handling init on dedicated 2016-03-14 14:21:02 +01:00
PabstMirror
1ffd23c193 Merge pull request #3581 from acemod/FixTrue 
Fix versioning true when compiled
 2016-03-12 13:47:59 -06:00
PabstMirror
e96c1a7dc6 Merge branch 'release' 2016-03-12 13:47:57 -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
jonpas
32c32b6cc5 Add stamina bar selective UI 2016-03-09 18:58:46 +01:00
PabstMirror
ad3a03a9c7 versioning - Add warnings for missing compat PBOs 2016-03-08 13:52:34 -06:00
PabstMirror
94adcf4ccb MicroDagr Scalar Values 2016-03-08 13:17:20 -06: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
jonpas
70100825cf Fix params in clientInit 2016-03-08 18:49:19 +01:00
PabstMirror
1a77b0fcd4 Disable drag and carry for StaticCannon 
#3528
 2016-03-08 11:43:35 -06:00
jonpas
e90ef30904 Add return value to public setElementVisibility function 2016-03-08 18:42:37 +01:00
jonpas
23e2617db8 Change params order and improve clientInit 2016-03-08 18:40:23 +01:00