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
8,079 Commits 73 Branches 88 Tags 752 MiB
a906c180ce
Commit Graph

8079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gienkov
a906c180ce remove alpha entries 2015-11-28 13:34:54 +01:00
gienkov
adae379445 fixes 2015-11-27 21:55:05 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
gienkov
7eecff4296 Merge remote-tracking branch 'origin' into pl-translation 
Conflicts:
	addons/captives/stringtable.xml
	addons/map_gestures/stringtable.xml
	addons/zeus/stringtable.xml
 2015-11-27 21:19:25 +01:00
ViperMaul
8d4364350c Fix for "double semicolon detected" error 2015-11-27 10:43:30 -08:00
jokoho48
52a6eddb44 fix missing PBOPREFIX 2015-11-26 20:53:14 +01:00
jokoho48
ace7894dbf fix missing Simicolon in RHS AFRF Comp 2015-11-26 20:35:45 +01:00
PabstMirror
4aeeefdfe8 Fix UBC and increase Heli_04 Pod interaction distance 2015-11-26 11:47:25 -06:00
Thomas Kooi
581f71f8a1 Merge pull request #2141 from GitHawk/refuel 
Adding vehicle refueling
 2015-11-26 16:16:13 +01:00
Thomas Kooi
bba0e999ff Merge pull request #2164 from GitHawk/rearm 
Adding vehicle rearming
 2015-11-26 16:15:09 +01:00
Thomas Kooi
60684c584a Merge pull request #2382 from TheMagnetar/master 
Removed pedantic errors and redefinition of M_PI variable
 2015-11-26 16:14:09 +01:00
Thomas Kooi
81ab280cb4 Merge pull request #2670 from acemod/simplifyFragConfig 
Simplify frag config
 2015-11-26 16:13:21 +01:00
Thomas Kooi
15267c0433 Merge pull request #2219 from acemod/handSignals 
Hand signals enhancement
 2015-11-26 16:04:41 +01:00
PabstMirror
ca0cfc9bbf Merge pull request #2861 from acemod/repairRebass 
Repair Overhaul
 2015-11-25 17:00:32 -06:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter 
Showhud setter
 2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3 Add array info to header 2015-11-25 11:07:56 -06:00
PabstMirror
185cae2fe5 Remove Old Gestures from interaction 2015-11-25 11:00:45 -06:00
PabstMirror
095252ef76 Cleanup 
revert `format ["'%1'", QGVAR()];` as it crashes the game
 2015-11-25 10:16:37 -06:00
SilentSpike
c731d83642 Merge pull request #2848 from acemod/fixForEachDeleteAt 
fix Issue with forEach Loops and deleteAt Index
 2015-11-25 14:00:37 +00:00
Thomas Kooi
08c5374a99 Merge pull request #2390 from BaerMitUmlaut/pass-magazine 
Added interaction to quickly pass a magazine
 2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching 
Remove manual team synching
 2015-11-24 21:37:50 -06:00
PabstMirror
20bf90f3e9 Medical - Fix Hitpoints Macro when building 2015-11-24 16:30:09 -06:00
PabstMirror
575fabb69d #2872-Map time support for subclasses of ItemWatch 2015-11-24 16:17:06 -06:00
jokoho48
fd1c38c612 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 22:44:32 +01:00
jokoho48
352db4cb66 remove some crap code 
replace some variables with macros
 2015-11-24 22:43:42 +01:00
PabstMirror
cfefb1c40e Cleanup spotting scope configs 2015-11-24 15:24:14 -06:00
PabstMirror
2c6cfcf294 Merge pull request #2832 from p1nga/Spotting-Scope-Update 
Updated spotting scope model.
 2015-11-24 15:23:12 -06:00
PabstMirror
9ecffcd133 Merge pull request #2746 from acemod/fixFlashlightPrivates 
fix privates in Map module
 2015-11-24 15:18:38 -06:00
IngoKauffmann
f9266764fb Moved module to ACE_Logistics 2015-11-24 21:33:38 +01:00
IngoKauffmann
1a6730340c Move module to ACE_Logistics category, removed single interact point 2015-11-24 21:30:08 +01:00
PabstMirror
2c76bc3b10 Merge pull request #2605 from TheNiner/master 
Fixed Laser Update Position Bug
 2015-11-24 13:43:53 -06:00
BaerMitUmlaut
818466d296 Added ACE setting to hide interaction 2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24 Fix tap shoulder msg display 
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
 2015-11-24 11:25:56 -06:00
IngoKauffmann
8fc52a4dfb Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-24 17:57:21 +01:00
PabstMirror
86f7ee2ad2 Merge pull request #2834 from acemod/addEarPlugsLoudness 
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
 2015-11-24 10:52:11 -06:00
IngoKauffmann
d4c708e731 Missing ; 2015-11-24 17:33:33 +01:00
PabstMirror
ddc8b16db2 Merge pull request #2857 from acemod/invResize154 
Inventory Resize UI - changes for 154 GL-Mags
 2015-11-24 10:24:06 -06:00
PabstMirror
4ae209ab44 Merge pull request #2865 from acemod/154UBC 
Fix UBC for 1.54
 2015-11-24 10:23:48 -06:00
jokoho48
773b30df33 Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals 2015-11-24 15:14:30 +01:00
PabstMirror
7981faad64 private -> local 2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d Merge branch 'master' into fixFlashlightPrivates 2015-11-23 17:45:41 -06:00
IngoKauffmann
fd2fd3241e Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-11-23 19:37:10 +01:00
IngoKauffmann
cbe8d98f86 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-23 19:29:05 +01:00
IngoKauffmann
931c6830fc Added reset 
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
 2015-11-23 19:28:51 +01:00
IngoKauffmann
763df43fbc Added possibility to disallow rearm 
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
 2015-11-23 17:08:06 +01:00
commy2
3be60a2f6e Merge pull request #2842 from acemod/fcsUpdateDisplay 
Update FCS display after distance adjust
 2015-11-23 16:34:09 +01:00
IngoKauffmann
113ac0f370 Minor improvements 
fnc_reset is still WIP
 2015-11-21 23:24:24 +01:00
SilentSpike
f07f06c843 Merge pull request #2760 from acemod/spectatorUpdates 
Spectator updates
 2015-11-21 15:00:44 +00:00
PabstMirror
c2564de5ef Fix UBC for 1.54 
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
 2015-11-20 23:27:29 -06:00