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,145 Commits 73 Branches 88 Tags
Commit Graph

6715 Commits

Author SHA1 Message Date
PabstMirror
ef681e4332 Captives - Fix adding duplicate animEH 2015-10-23 13:11:11 -05:00
PabstMirror
e340f5164c Wirecutters - Update Fence Configs, Use faster getModelInfo 2015-10-22 20:54:09 -05:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
VKing
a899c74133 ace_fcs_ace_time -> ace_fcs_time 2015-10-21 22:17:28 +02:00
VKing
0936238862 Fix lead calculation for vehicle FCS 2015-10-21 21:52:48 +02:00
PabstMirror
554c303be0 InteractionMenu - Auto Expand First Level 2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24 Interaction Menu - Add setting for animation speed 2015-10-20 13:26:42 -05:00
jonpas
349447c5ea Readd prone down optics removal 2015-10-20 19:37:49 +02:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
Glowbal
57abe3b885 Merge pull request #2743 from acemod/medicalStuff 
Medical Menu Fixes
 2015-10-19 22:47:13 +02:00
PabstMirror
acc3504d7b Merge branch 'master' into fixFlashlightPrivates 
Conflicts:
	addons/map/stringtable.xml
 2015-10-19 13:59:15 -05:00
PabstMirror
cfde11d2fa Fix medic treatment location check as well 2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896 #2765 - Fix location check when set to disabled 2015-10-19 01:20:11 -05:00
bux578
602832cc0c adjust german translations 2015-10-19 07:29:02 +02:00
bux578
f7b717db64 Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11 2015-10-19 07:23:51 +02:00
PabstMirror
af80635a3f ST Map Gesture Force Color Settings 2015-10-18 23:59:40 -05:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
PabstMirror
26c051d397 Sitting - Fix missing semicolon 2015-10-18 11:48:21 -05:00
IngoKauffmann
1804215dbb Readded caliber for ACE_Hydra70_DAGR 2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599 Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 
Conflicts:
	addons/missileguidance/CfgAmmo.hpp
 2015-10-18 13:19:27 +02:00
IngoKauffmann
5a453a7074 Fixed flying 
Moved attached ammo further away
 2015-10-18 13:11:28 +02:00
IngoKauffmann
8a4b3a117a Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm 2015-10-18 12:49:36 +02:00
Glowbal
843eb16837 Merge pull request #2650 from acemod/setDefaultChannel 
Set Default Channel at mission start
 2015-10-18 12:28:13 +02:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework 
Sitting Framework
 2015-10-18 12:26:53 +02:00
Glowbal
8e4bc264cc Merge branch 'master' into map_gestures 
Conflicts:
	AUTHORS.txt
 2015-10-18 12:20:54 +02:00
Glowbal
9a0aa2b14c Merge pull request #2152 from jokoho48/codeCleanupKestrel4500 
Code cleanup of Kestrel 4500 module
 2015-10-18 12:16:44 +02:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
Glowbal
ebe2bf96cd Merge pull request #2277 from jokoho48/codeCleanUpConcertina_wire 
Code cleanup of Concertina_wire Module
 2015-10-18 12:13:44 +02:00
Glowbal
3682a1710b Merge pull request #2527 from alef/issues/titan_miss 
Fix: Titan hitting ground instead of vehicle
 2015-10-18 12:11:09 +02:00
PabstMirror
da2d140a39 Cleanup unnecessary statement 2015-10-17 14:30:59 -05:00
jokoho48
bfcf057dab extract Gestures to own Module and Port THS to ACE 2015-10-17 21:17:37 +02:00
SilentSpike
b6dd7b941f Reduce overhead of spectator map icons 
Fixes #2514 by only rendering individual unit icons when zoomed in and only rendering the units currently within the screen bounds.

Behaves as expected, but whether or not it has a significant performance increase under scaled up testing conditions remains to be seen.
 2015-10-17 13:23:51 +01:00
PabstMirror
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
94e3cd1f79 Replace old use of showHud 2015-10-15 22:45:35 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
PabstMirror
6ffde8150f Simplify Map Light Interactions 2015-10-14 14:36:40 -05:00
jokoho48
2dcdd224bd fix privates in Map module 2015-10-14 19:56:54 +02:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
PabstMirror
680f52cd27 Handle Distance when mounted 2015-10-13 13:40:16 -05:00
PabstMirror
8ffe1b4e01 #2528 (2) - Integrate Dragging 2015-10-13 02:20:19 -05:00
PabstMirror
ad1191cdd5 #2528 - Medical Menu Work 
(1) Verify target is valid and in reasonable range
 2015-10-13 02:01:59 -05:00
PabstMirror
5d76395914 #2734 - Map effects / flashlights for TrippleHead 2015-10-12 11:27:38 -05:00
PabstMirror
7062f60f0a Fix UBC from #2726 2015-10-12 01:07:20 -05:00
Glowbal
1e26fee3ba Merge pull request #2683 from acemod/commonCleanupX 
Common cleanup x
 2015-10-11 12:15:27 +02:00
Glowbal
8db8e87c53 Merge pull request #2560 from acemod/lockingMissles 
#2349 - Don't disable locking for base RocketPods
 2015-10-11 12:06:11 +02:00
Glowbal
94ed78a173 Merge pull request #2578 from alganthe/strings_fix 
PAK and Surgical Kit strings normalized inside modules.
 2015-10-11 12:05:11 +02:00
PabstMirror
4ba0d72bfd #2580 (1) - Fix bandages always created at terrain level. 2015-10-10 23:09:52 -05:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 
Conflicts:
	optionals/compat_bwa3/config.cpp
 2015-10-10 13:13:30 +02:00
PabstMirror
53f833b68c #2702 - Cargo: Make "Supply Box" pallets heavy 2015-10-10 00:19:09 -05:00