PabstMirror
|
7da258111d
|
Merge pull request #1739 from acemod/virtualAttachObject
Virtual attach object
|
2015-07-25 13:55:48 -05:00 |
|
Glowbal
|
3514f07d31
|
Merge pull request #1806 from jonpas/sittingFixes
Akward Sitting Fixes Part 2
|
2015-07-25 20:42:38 +02:00 |
|
Glowbal
|
f0a2c7c454
|
Merge pull request #1854 from jonpas/lookUp
Increased ability to look up
|
2015-07-25 20:41:46 +02:00 |
|
Felix Wiegand
|
20b8d0091d
|
Merge pull request #1909 from acemod/fixParachutes
fix parachutes
|
2015-07-25 19:59:07 +02:00 |
|
Glowbal
|
2f186ffbf1
|
Merge pull request #1897 from acemod/vectorCtrlTextGroupFix
#1871 - Don't do ctrlText(set) on RscControlsGroup
|
2015-07-25 19:57:55 +02:00 |
|
PabstMirror
|
40ed985d34
|
Config Fixes
|
2015-07-25 12:56:57 -05:00 |
|
bux578
|
d8d4a6a8c7
|
fix parachutes
|
2015-07-25 19:55:39 +02:00 |
|
Glowbal
|
c729672e53
|
Merge pull request #1885 from acemod/kestullHeightFix
Fix Kestrel Y position on large interface
|
2015-07-25 19:53:48 +02:00 |
|
Glowbal
|
6422c20e46
|
Merge pull request #1867 from acemod/cWire-localVehDamage
concWire - Apply damage where vehicle is local
|
2015-07-25 19:52:42 +02:00 |
|
PabstMirror
|
e616f2240e
|
Merge pull request #1863 from acemod/huntIR-itemRemoved
Close huntIR monitor if item removed
|
2015-07-25 12:50:05 -05:00 |
|
PabstMirror
|
1008567cba
|
Merge pull request #1847 from acemod/optionsOnIntroOutro
Show Options on Intro/Outro in Missions
|
2015-07-25 12:49:20 -05:00 |
|
Glowbal
|
0e872a5ed5
|
Merge pull request #1845 from acemod/huntir-deadProjectile
HuntIR - Handle Dead Projectile
|
2015-07-25 19:48:32 +02:00 |
|
ViperMaul
|
38bd2896ab
|
Merge pull request #1851 from SzwedzikPL/hearing_in_zeus
Disable hearing in zeus camera
|
2015-07-25 10:44:34 -07:00 |
|
ViperMaul
|
55614b9ac3
|
Merge pull request #1839 from acemod/hearingUnification
Hearing PFEH unification / Flashbangs
|
2015-07-25 10:44:11 -07:00 |
|
PabstMirror
|
2a19521f68
|
Merge pull request #1820 from acemod/mk6-fixBISleveling
Mk6 fix leveling
|
2015-07-25 12:36:28 -05:00 |
|
KoffeinFlummi
|
88a5609016
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-07-25 19:35:26 +02:00 |
|
KoffeinFlummi
|
9805a8270a
|
Merge branch 'master' into german-merge
|
2015-07-25 19:35:03 +02:00 |
|
PabstMirror
|
9e831d257d
|
Merge pull request #1768 from acemod/10digitGrids2
10 digit grids 2
|
2015-07-25 12:32:02 -05:00 |
|
Glowbal
|
9d7374c893
|
Merge pull request #1307 from jokoho48/master
Cut Parachute/Reserve parachute
|
2015-07-25 19:17:37 +02:00 |
|
Glowbal
|
76c0108430
|
Merge pull request #1904 from SzwedzikPL/backpack_macro
macro_addbackpack
|
2015-07-25 16:49:42 +02:00 |
|
SzwedzikPL
|
6569fe1d62
|
macro_addbackpack
|
2015-07-25 13:13:31 +02:00 |
|
Glowbal
|
0ce50d7b17
|
Merge pull request #1896 from acemod/medicalTreatmentEndAnim
Medical - Don't play *_medic anims at end
|
2015-07-25 09:27:18 +02:00 |
|
PabstMirror
|
aa3b9e7b1c
|
#1871 - Don't do ctrlText(set) on RscControlsGroup
Throws `control[ACE_ScriptedDisplayControlsGroup]: Unexpected control
type [15]`
|
2015-07-23 16:46:30 -05:00 |
|
Glowbal
|
216ea007f8
|
Merge pull request #1895 from acemod/revert-1894-fixNameTagsSettings
Revert "Fixed NameTags Settings defaults"
|
2015-07-23 21:05:46 +02:00 |
|
Glowbal
|
9c3afe3b82
|
Revert "Fixed NameTags Settings defaults"
|
2015-07-23 21:05:30 +02:00 |
|
PabstMirror
|
1b590bf0f9
|
More nametag fixes / setSetting casting
|
2015-07-23 14:05:20 -05:00 |
|
Glowbal
|
ae65198ed8
|
Merge pull request #1894 from jonpas/fixNameTagsSettings
Fixed NameTags Settings defaults
|
2015-07-23 20:31:23 +02:00 |
|
jonpas
|
817dfe94e2
|
Added possible values
|
2015-07-23 20:29:51 +02:00 |
|
jonpas
|
964f32a721
|
Fixed NameTags Settings defaults
|
2015-07-23 20:26:31 +02:00 |
|
PabstMirror
|
cbd74d768b
|
Medical - Don't play *_medic anims at end
|
2015-07-23 02:43:19 -05:00 |
|
bux
|
2377a54051
|
replace underscore with dash
|
2015-07-23 09:05:26 +02:00 |
|
PabstMirror
|
24cda6e37c
|
#1655 - Fix Kestrel Y position on large interface
|
2015-07-22 01:06:36 -05:00 |
|
bux578
|
3e420b6bf6
|
replace underscore by dashes
|
2015-07-21 19:02:32 +02:00 |
|
bux578
|
d98b60dd17
|
fix typos in the right repo
oh bux ...
|
2015-07-21 18:59:53 +02:00 |
|
Glowbal
|
5508eae314
|
Merge pull request #1875 from jokoho48/3dModelUpdate2
3D Model Update 2.0
|
2015-07-21 12:22:28 +02:00 |
|
SilentSpike
|
186d4d0583
|
Fix for #1665
|
2015-07-20 21:14:30 +01:00 |
|
ViperMaul
|
22d41797ac
|
Merge pull request #1804 from acemod/misGuideStuff
Missle Guidance / Javelin Fixes
|
2015-07-20 11:28:18 -07:00 |
|
Joko
|
9bdb192c8a
|
Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
|
2015-07-19 15:31:15 +02:00 |
|
Glowbal
|
da5afde324
|
Merge pull request #1874 from jokoho48/TacticalLadderShootFix
Fix shoot through Tacticalladder
|
2015-07-19 15:08:12 +02:00 |
|
SilentSpike
|
123825a6fe
|
Updating zeus waypoint actions icon
|
2015-07-19 12:23:57 +01:00 |
|
Joko
|
2615d99178
|
Fix shoot through Tacticalladder
|
2015-07-19 03:32:07 +02:00 |
|
PabstMirror
|
bf802f4f5d
|
Merge branch 'master' into virtualAttachObject
|
2015-07-17 17:56:22 -05:00 |
|
PabstMirror
|
ddc83e0889
|
#1639 - Apply damage where vehicle is local
|
2015-07-17 15:43:00 -05:00 |
|
Glowbal
|
015fd1afb0
|
Merge pull request #1864 from jokoho48/TextureUpdate
Update IV Blood and Plasma Texture
|
2015-07-17 11:06:49 +02:00 |
|
Joko
|
1b9d02a8a5
|
Update IV Blood and Plasma Texture
|
2015-07-17 09:40:43 +02:00 |
|
Glowbal
|
0154dfc51e
|
Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
|
2015-07-17 08:17:42 +02:00 |
|
PabstMirror
|
b6e124d340
|
#1856 - Close huntIR monitor if item removed
|
2015-07-16 19:12:11 -05:00 |
|
PabstMirror
|
f845d54290
|
#1634 - Integrate with DAGR
|
2015-07-16 18:35:38 -05:00 |
|
PabstMirror
|
f438c6d0c5
|
Revert "Use new worldSize command instead of whileLoop"
This reverts commit 7d26519b2e.
|
2015-07-16 18:10:10 -05:00 |
|
PabstMirror
|
7d26519b2e
|
Use new worldSize command instead of whileLoop
|
2015-07-16 17:47:39 -05:00 |
|