[OMCB]kaban
16792fe9f1
Merge pull request #2 from acemod/master
...
Fork update from master
2015-10-19 23:22:12 +03:00
bux578
a8295b6d53
Merge pull request #2769 from licht-im-Norden87/patch-14
...
Readme_DE.md, small grammar fix
2015-10-19 21:34:30 +02:00
PabstMirror
acc3504d7b
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
licht-im-Norden87
9c28ea5004
Readme_DE.md, small grammar fix
2015-10-19 17:21:54 +02:00
bux578
8f33790bf2
Merge pull request #2759 from acemod/reorderReadme
...
Improve readme
2015-10-19 11:03:34 +02:00
bux578
5db3f61113
add back the flat-square styles
2015-10-19 10:59:48 +02:00
bux578
a74908a905
fix merge conflicts
2015-10-19 10:40:31 +02:00
Felix Wiegand
ece11c335d
Merge pull request #2756 from acemod/flat-badges
...
Use "flat-square" badge style
2015-10-19 09:45:31 +02:00
KoffeinFlummi
c5fd41b9a1
Add flat badges to other READMEs
2015-10-19 09:44:40 +02: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
0ef6de0404
Merge branch 'licht-im-Norden87-patch-12'
2015-10-19 07:37:41 +02:00
bux578
a873481c36
improve german readme
2015-10-19 07:37:14 +02:00
bux578
94b90fe0b4
Merge branch 'patch-12' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-12
2015-10-19 07:30:59 +02:00
bux578
e186266133
Merge branch 'licht-im-Norden87-patch-11'
2015-10-19 07:29:30 +02: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
BaerMitUmlaut
98c6c37d9c
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-10-18 17:58:37 +02: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
Joko
1365aebe2a
Merge pull request #2748 from acemod/simpleMapLightActions
...
Simplify Map Light Interactions
2015-10-17 23:19:27 +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
bux578
b3032da51c
reorder badges, social networks
2015-10-17 11:48:12 +02:00
KoffeinFlummi
38be666b37
Use "flat-square" badge style
2015-10-16 18:34:31 +02: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
PabstMirror
cb65a67a3e
Merge pull request #2745 from acemod/fixChairsOverWater
...
Use AGL for sitting setPos
2015-10-14 13:19:54 -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
733c695c41
Merge pull request #2736 from acemod/mapEffectsTrippleHead
...
Map effects / flashlights for TrippleHead
2015-10-14 10:46:38 -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
