Commit Graph

8440 Commits

Author SHA1 Message Date
Thomas Kooi
d68c79efb1 Merge pull request #3204 from acemod/m67_dns
Fix Handgrenade DisplayNameShort
2016-02-04 19:37:20 +01:00
Thomas Kooi
69746a133b Merge pull request #3254 from ProfessorCZ/master
Czech Translation - Update
2016-02-04 19:36:28 +01:00
Thomas Kooi
692ead07f1 Merge pull request #2264 from jonpas/make_versionFiles_subFolder_support
Add subfolder support to importantFiles and versionFiles to make.py
2016-02-04 19:35:15 +01:00
Thomas Kooi
8034d91d76 Merge pull request #3249 from GitHawk/refuel_nozzle
Added a real nozzle
2016-02-04 19:32:17 +01:00
Thomas Kooi
d72c73dc25 Merge pull request #3257 from acemod/flashbangUnderwater
Flashbangs - pass pos instead of obj reference
2016-02-04 19:31:11 +01:00
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
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
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
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
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
84e76efc7f Not needed on CfgMagazines 2016-01-27 15:54:45 -06:00
PabstMirror
b15716860d Remove VehicleLock Items from Virtual Arsenal
Close #3215
2016-01-25 14:29:27 -06:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06: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
1cf7fc727d Fix Handgrenade DisplayNameShort 2016-01-22 13:12:20 +01:00
PabstMirror
be8afe507c Few more privates 2016-01-20 17:19:08 -06:00
PabstMirror
3dac426bc6 Merge pull request #3132 from acemod/interactionMenuCleanup
Cleanup Interaction Menu
2016-01-20 17:04:10 -06:00
PabstMirror
abb01e0653 Merge pull request #3129 from acemod/frag-cacheIfWillFrag
Frag - only run addPfhRound on ammo that will frag (for master)
2016-01-20 17:03:55 -06:00
Thomas Kooi
232fe62d8d Merge pull request #3195 from acemod/fix3194
Fix typo in ACE_hearing config
2016-01-20 22:26:13 +01:00
PabstMirror
a140f29784 Remove inherited classes that were not used 2016-01-20 09:45:03 -06:00
esteldunedain
1a115e7f9c Fix #3194 2016-01-20 11:48:12 -03:00
SilentSpike
ca5f6df3d0 Merge pull request #3147 from acemod/spectatorBandAid
Restart specatator display if player in unitList
2016-01-19 20:15:24 +00:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
esteldunedain
8e2d489312 Add warnings to deprecated functions 2016-01-19 09:39:06 -06:00
PabstMirror
7e84a9d9b0 Add getter, readd old public funcs, add blockSprint 2016-01-19 09:39:06 -06:00
PabstMirror
d2e006397d cleanup, don't setVar public if no change 2016-01-19 09:39:05 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
Thomas Kooi
b99be6122b Merge pull request #3187 from acemod/fixFCS
Add missing FUNC to FCS key (Rangefinders)
2016-01-19 16:05:56 +01:00
PabstMirror
6d6cbec5ef Add missing FUNC to FCS key (Rangefinders)
#3160
2016-01-19 09:02:51 -06:00
PabstMirror
69771d531d Merge pull request #3173 from acemod/fixInvintoryLock
Fix Vehicle inventory is not locked
2016-01-19 08:37:58 -06:00
PabstMirror
0ea1c0c03f Cleanup non-working code, and documentation 2016-01-19 08:31:52 -06:00
Thomas Kooi
e083e60e8c Merge pull request #3142 from acemod/switchUnitsCleanup
Cleanup SwitchUnits, Possible fix for #3122
2016-01-19 09:40:24 +01:00