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,001 Commits 73 Branches 88 Tags 752 MiB
3ec9369a9e
Commit Graph

9001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
commy2
41e39c9c3a replace more filter with select 2016-02-06 11:58:31 +01:00
commy2
2ebd2f9046 replace filter and map with select and apply 2016-02-06 11:42:35 +01:00
PabstMirror
d69af47030 Merge branch 'master' of https://github.com/acemod/ACE3 2016-02-05 16:49:39 -06:00
PabstMirror
e3e9d19ca1 Fix "key" capitalization for Interaction_GetOut 2016-02-05 16:49:36 -06:00
commy2
ec4a4ef67f correct capitalization for German translation 2016-02-05 22:21:27 +01:00
commy2
7f6b17cdbc correct name for wheeled apc 01 cannon 2016-02-05 22:19:27 +01:00
commy2
0032e7aa9a Merge pull request #3267 from acemod/removeSwagWalkFix 
Remove Swag Walk Fix
 2016-02-05 21:59:57 +01:00
commy2
43e8620039 Merge pull request #3274 from acemod/setallgearremote 
setAllGear - abort function and print warning when used on remote units,
 2016-02-05 21:58:54 +01:00
PabstMirror
9b3ca2822f Change german stringtable 2016-02-05 14:46:30 -06:00
commy2
f33beb9865 update movement config comments 2016-02-05 21:31:08 +01:00
commy2
d89c93de22 setAllGear - abort function and print warning when used on remote units, 2016-02-05 21:14:20 +01:00
PabstMirror
deac4395c1 Deadman switch - trigger explosives in inventory 
Also allow manual triggering of the deadman device
 2016-02-05 11:40:11 -06:00
Nicolás Badano
027de27e33 Merge pull request #3268 from acemod/fix3140 
Document the locality requirements of fnc_setAllGear.
 2016-02-05 10:19:57 -03:00
esteldunedain
dbe7e294a5 Document the locality requirements of fnc_setAllGear. Close #3140 2016-02-05 10:18:36 -03:00
esteldunedain
b2d050afca Close #3188, Close #3260 2016-02-05 09:46:51 -03:00
Nicolás Badano
d26fc4614f Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix 
Fix overheating stringtable
 2016-02-05 09:35:29 -03:00
Thomas Kooi
0850ab35e3 Merge pull request #3262 from acemod/nozzleFixes 
fix some issues with Fuel Nozzle
 2016-02-05 09:15:27 +01:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction 
Changes to civilian interaction
 2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
SzwedzikPL
270b557084 fix overheating stringtable 2016-02-05 04:55:05 +01:00
SzwedzikPL
5f0a2b1945 use event system, polish translation 2016-02-05 04:26:54 +01:00
Nicolás Badano
dadec15948 Merge pull request #2104 from acemod/trenches 
Trenches
 2016-02-04 23:43:06 -03:00
Nicolás Badano
9930231cda Merge pull request #3265 from acemod/fix3264 
Remove extra PREPs in the ACE_Zeus
 2016-02-04 23:41:33 -03:00
SzwedzikPL
374b015ee4 major cleanup 2016-02-05 03:41:18 +01:00
SzwedzikPL
ab297ff97e more readable macro 2016-02-05 02:03:25 +01:00
SzwedzikPL
a9d57e0d1c fnc_switchLamp cleanup 2016-02-05 02:02:46 +01:00
SzwedzikPL
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
esteldunedain
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
esteldunedain
2577992dfc Progress bar localization 2016-02-04 20:43:32 -03:00
esteldunedain
7da6e2a35f Reduce the placement distance 2016-02-04 18:47:30 -03:00
esteldunedain
8c187cbf07 Adjust big trench height 2016-02-04 18:47:17 -03:00
esteldunedain
4cd0028794 Add animation and progresive digging 2016-02-04 18:43:47 -03:00
esteldunedain
3d47156547 Rename some variables 2016-02-04 17:42:12 -03:00
Joko
a6d84eca8e add GitHawk to AUTHORS 2016-02-04 21:08:34 +01:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
jokoho48
dc3026366a remove unneeded files 
fix hard edge in model
add LOD
 2016-02-04 20:52:28 +01:00
Glowbal
8c0472bbeb Merge branch 'master' of github.com:acemod/ACE3 2016-02-04 20:35:15 +01:00
Thomas Kooi
8741c3665d Merge pull request #3261 from acemod/Fix-french-translation-string 
Fix french translation refresh marker interval
 2016-02-04 20:35:55 +01:00
VKing
f652db1d2f Add Loadout box for easy conversion 2016-02-04 20:35:00 +01:00
Glowbal
f1ce133d32 Merge branch 'release' 
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
 2016-02-04 20:34:32 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval 
As per @alganthe's comment on #3114
 2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master 
Fixed and added French Translation
 2016-02-04 20:28:00 +01:00
Glowbal
376b611b89 Merge branch 'master' into Mortar_interact 2016-02-04 20:21:03 +01:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202 
Fix laser_selfdesignate does not measure the distance
 2016-02-04 20:17:06 +01:00
PabstMirror
54870f872a Disable Debug 2016-02-04 13:16:41 -06:00
Nicolás Badano
c967bd1ace Merge pull request #3259 from acemod/fix3denGoggles 
Fix ACE_goggle changing the tint on the 3den camera
 2016-02-04 16:08:02 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX 
Deterministic overheating (updated)
 2016-02-04 16:03:30 -03:00
Thomas Kooi
dd3613c357 Merge pull request #3190 from acemod/fcs_enableGMG 
Add FCS to more things
 2016-02-04 20:03:19 +01:00
Thomas Kooi
893040b08a Merge pull request #3102 from buddytex/SandbagEditor 
Add Sandbag to editor
 2016-02-04 20:00:51 +01:00