Thomas Kooi
dc8e7e2994
Merge pull request #3255 from acemod/tourniquetMedications
...
Tourniquets block medication until released
2016-02-04 19:30:40 +01:00
PabstMirror
336184dfaa
Change medication removal from array
2016-02-04 10:00:33 -06:00
esteldunedain
c87f19c8da
Fix #3258
2016-02-04 10:04:26 -03:00
PabstMirror
2cf2cb0e59
Fix statusEffect error in refuel
2016-02-04 01:31:12 -06:00
PabstMirror
7fc84c60dd
Flashbangs - pass pos instead of obj reference
...
Fix #3205
2016-02-03 17:53:24 -06:00
PabstMirror
3cc10a27ce
Tourniquets block medication until released
...
Close #2704
2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
Lukas
714a885566
Merge pull request #1 from acemod/master
...
Update
2016-02-03 01:20:14 +01:00
PabstMirror
397a12056a
Merge branch 'master' into deterministicOverheatingX
2016-02-02 17:11:00 -06:00
Githawk
cbeac7f154
params stuff
2016-02-02 15:47:05 +01:00
Githawk
4d403d21aa
Fixes
...
Moved models into data
fixed vehicle attach for certain angles
2016-02-02 15:45:57 +01:00
Githawk
5e103ba398
Added nozzle
...
Added code for nozzle object
Params and private update
2016-02-02 15:03:06 +01:00
esteldunedain
f744e164d3
Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0
2016-02-01 14:58:01 -03:00
esteldunedain
8d437c91f1
Fix ace_scopes capturing native adjustment keys for the PSO scope. Close #3238
2016-02-01 14:42:11 -03:00
Felix Wiegand
4612652f8c
Use proper image URL
2016-02-01 18:16:55 +01:00
Nicolás Badano
1f9d817133
Merge pull request #3233 from fr89k/master
...
As bux578 requested: Added myself to AUTHORS.txt
2016-01-29 09:58:17 -03:00
fr89k
bd9587981d
Added email address for fr89k
2016-01-29 13:58:01 +01:00
fr89k
ddd63bf1a8
AUTHORS.txt now in alphabetical order
2016-01-29 13:54:57 +01:00
fr89k
d2296411d8
As bux578 requested: Added myself to AUTHORS.txt
...
Forgot to change the AUTHORS.txt in the last pull request
2016-01-29 13:45:52 +01:00
Thomas Kooi
665ac862ab
Merge pull request #3232 from fr89k/master
...
Added the correct preprocessor macro for parse_imagepath
2016-01-29 13:06:08 +01:00
fr89k
7f0821dd12
Added the correct preprocessor macro for parse_imagepath, so that the source can now be compiled on Linux.
2016-01-29 12:21:46 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
af6b084ba3
Don't allow carrying with injured legs
...
Fix #2644
2016-01-28 23:05:55 -06:00
PabstMirror
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
a7aae3e0e4
Merge pull request #3223 from acemod/remKeysFromArsenal
...
Remove VehicleLock Items from Virtual Arsenal
2016-01-28 17:30:51 -06:00
PabstMirror
3f1d6ffeb7
Fix dragging sending objects to random location
...
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
2016-01-28 17:11:05 -06:00
PabstMirror
d9eafbdf0f
Privates / Headers
2016-01-28 12:52:53 -06:00
PabstMirror
84e76efc7f
Not needed on CfgMagazines
2016-01-27 15:54:45 -06:00
esteldunedain
2eb91cf2b4
Delete spare models
2016-01-27 18:23:04 -03:00
PabstMirror
7a7e0d689a
Improve underwater cargo unloading
2016-01-27 14:56:25 -06:00
esteldunedain
d2d7e46401
Align trench to ground surface to avoid having to lower them too much on slopes
2016-01-27 17:54:40 -03:00
esteldunedain
b20a2f338b
Replace trench models: bigger and opaque
2016-01-27 17:54:10 -03:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
esteldunedain
f8a1215264
Align trenches to ground
2016-01-26 11:03:11 -03:00
esteldunedain
0358b10298
Bigger trenches
2016-01-26 11:02:55 -03:00
PabstMirror
b15716860d
Remove VehicleLock Items from Virtual Arsenal
...
Close #3215
2016-01-25 14:29:27 -06:00
SzwedzikPL
03fca3c372
fix fcs keyup/down forced params #3202
2016-01-25 09:49:47 +01:00
SzwedzikPL
8a2250768d
Merge branch 'master' of https://github.com/acemod/ACE3
2016-01-25 09:08:50 +01:00
PabstMirror
78729e96ff
Fix bad forceWalk params
2016-01-24 11:39:59 -06:00
esteldunedain
0fd6981809
Don't allow placing is standig above the terrain level
2016-01-23 22:05:29 -03:00
esteldunedain
4970423cd7
Cancel placing if position is no longer suitable
2016-01-23 22:04:49 -03:00
esteldunedain
8ff8204905
Initial code implementation of ace_trenches
2016-01-23 20:45:59 -03:00
esteldunedain
1d886ac624
Merge branch 'master' into trenches
...
Conflicts:
AUTHORS.txt
2016-01-23 17:39:54 -03:00
esteldunedain
758611d230
Restrict temp update to current weapon, and only primary or handgun
2016-01-23 11:48:23 -03:00
PabstMirror
3a62956e24
Fix wind display angle being reversed
2016-01-22 20:43:22 -06:00
PabstMirror
5df211c586
Merge pull request #3126 from acemod/weatherCleanup
...
Weather cleanup, fix wind inversion, add non-color based wind speed indicator
2016-01-22 14:56:21 -06:00
PabstMirror
73b29085e2
Merge pull request #3200 from acemod/moreCache
...
Hearing - Cache Weapon/Ammo loudness
2016-01-22 14:56:00 -06:00
PabstMirror
45138aea18
Merge pull request #3163 from acemod/unifiedStatusEffects
...
Unified status effect handler
2016-01-22 14:55:25 -06:00
VKing
9501c54530
Fix #3203 IEDs magically changing shape
2016-01-22 14:21:25 +01:00
VKing
68531bd4a9
Merge branch 'master' into explosives_cleanup_plus_minetriggers
2016-01-22 14:15:45 +01:00