commy2
|
f77242fce3
|
Merge pull request #2604 from acemod/340fixunconaftersettngsinit
delay setUnconscious until the settings are inited
|
2015-09-26 19:54:09 +02:00 |
|
commy2
|
07774647e9
|
delay setUnconscious until the settings are inited, fix #148
|
2015-09-26 19:30:13 +02:00 |
|
Niner1309
|
1a43341506
|
Fixed Laser Update Position Bug
|
2015-09-26 19:15:09 +02:00 |
|
commy2
|
93114802d2
|
Merge pull request #2603 from acemod/340fixcargodestroyed
dont access cargo of destroyed vehicles, fix #2523
|
2015-09-26 18:29:56 +02:00 |
|
commy2
|
8affae9f7a
|
dont access cargo of destroyed vehicles, fix #2523
|
2015-09-26 18:16:38 +02:00 |
|
commy2
|
777ac05d16
|
Merge pull request #2602 from acemod/340respawncleanup
Code cleanup respawn module, close #2184
|
2015-09-26 17:58:17 +02:00 |
|
commy2
|
6d9943ff2e
|
fix wrong macro, missing ;
|
2015-09-26 16:45:39 +02:00 |
|
commy2
|
b1fb7befe8
|
remove wrong isServer check
|
2015-09-26 16:32:29 +02:00 |
|
commy2
|
5425836e47
|
cleanup respawn module, close #2184
|
2015-09-26 16:28:18 +02:00 |
|
commy2
|
f0584adeff
|
Merge pull request #2601 from acemod/340fixfixfloatingSelections
fix fixFloating resetting reflector hitpoints, close #2279
|
2015-09-26 14:45:50 +02:00 |
|
commy2
|
dc7d24a3fd
|
fix fixFloating resetting reflector hitpoints, close #2279
|
2015-09-26 14:38:50 +02:00 |
|
Glowbal
|
e257827a69
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-09-26 10:13:02 +02:00 |
|
PabstMirror
|
8bb5f71ba1
|
Macro for non spawned CBA Debug Logging
|
2015-09-25 22:30:57 -05:00 |
|
commy2
|
2fe142032e
|
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
|
2015-09-26 03:16:55 +02:00 |
|
SilentSpike
|
5f7c30dd7c
|
Merge pull request #2597 from Cuel/delay-spectator
fix spectator view if called instantly
|
2015-09-25 13:34:37 +01:00 |
|
jokoho48
|
4ad16ed938
|
fix that waitUntilAndExecute have a return
|
2015-09-25 13:29:39 +02:00 |
|
jokoho48
|
998fbcc403
|
Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-09-25 13:19:19 +02:00 |
|
Cuel
|
dcbf977d6d
|
fix spectator view if called instantly
If you call setSpectator directly from init.sqf you'll be put into some
weird limbo mode with borders and spectator not working. This should fix
it
|
2015-09-25 12:51:13 +02:00 |
|
commy2
|
43cdfaecc0
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-09-25 11:15:46 +02:00 |
|
commy2
|
412685e0ff
|
fix some code was commented out in loadPersonLocal and unloadPersonLocal
|
2015-09-25 11:15:25 +02:00 |
|
jokoho48
|
f7787730e1
|
fix Littergeneric fly over ground(add Landcontact Points)
|
2015-09-23 20:17:16 +02:00 |
|
jokoho48
|
d6203d0f2e
|
Posible Fix for Invisible Tactical Ladder V2
|
2015-09-23 19:54:12 +02:00 |
|
jokoho48
|
dce49721e4
|
Posible Fix for Invisible Tactical Ladder
|
2015-09-23 19:17:57 +02:00 |
|
KoffeinFlummi
|
3471ebef16
|
Merge https://github.com/dudakov/ACE3 into russian-merge
|
2015-09-23 19:17:52 +02:00 |
|
alganthe
|
10296d2883
|
PAK and Surgical Kit strings normalized inside modules.
Signed-off-by: alganthe <alganthe@live.fr>
|
2015-09-23 15:50:50 +02:00 |
|
bux578
|
95ec25736e
|
Merge pull request #2563 from gienkov/missing-strings
Missing english strings
|
2015-09-23 09:48:54 +02:00 |
|
Glowbal
|
3c5f222959
|
Merge branch 'release'
|
2015-09-22 22:22:39 +02:00 |
|
PabstMirror
|
3c9e1899e2
|
Merge pull request #2574 from acemod/fixClickExplosivePlace
Delay one frame when selecting explosives
|
2015-09-22 13:25:27 -05:00 |
|
PabstMirror
|
ebcc540943
|
Merge pull request #2572 from acemod/fixClickExplosivePlace
Delay one frame when selecting explosives
|
2015-09-22 13:23:33 -05:00 |
|
Glowbal
|
93e5429ed5
|
Add sqf validator script to travis configuration
|
2015-09-22 20:18:12 +02:00 |
|
PabstMirror
|
5add8d6789
|
#2537 - Delay one frame when selecting explosives
|
2015-09-22 11:31:58 -05:00 |
|
jonpas
|
a42685af2e
|
Removed copy/pasted maintainer intruder
|
2015-09-22 18:04:27 +02:00 |
|
Grzegorz
|
1848ea6325
|
fixez
|
2015-09-22 14:58:59 +02:00 |
|
[OMCB]kaban
|
49d1355ad8
|
Fix due to review
|
2015-09-22 11:52:06 +03:00 |
|
PabstMirror
|
cf8a7f742e
|
#2541 - Attach getIn/Out run on local unit
|
2015-09-21 22:50:48 -05:00 |
|
PabstMirror
|
f93538eb9a
|
#2423 - assign vehicle module fix for prefilled veh
|
2015-09-21 21:44:52 -05:00 |
|
PabstMirror
|
079d88ded7
|
Merge pull request #2509 from acemod/miscFixNilFunctions
Fix some nil functions
|
2015-09-21 20:36:09 -05:00 |
|
PabstMirror
|
bf0cdbaf77
|
Merge pull request #2534 from acemod/unconcHandcuffs
Take Unconscious captive
|
2015-09-21 20:35:02 -05:00 |
|
Grzegorz
|
55eae90484
|
tabz
|
2015-09-22 02:35:06 +02:00 |
|
gienkov
|
bbccfbaa35
|
pl medical string
|
2015-09-22 01:04:46 +02:00 |
|
commy2
|
24f0df55a2
|
Merge pull request #2559 from acemod/340disableuserinputcleanup
Use CBA PFH in disableUserInput
|
2015-09-22 00:52:58 +02:00 |
|
commy2
|
617b1ec78d
|
Merge pull request #2556 from acemod/340deprecation
add deprecated warnings
|
2015-09-22 00:52:43 +02:00 |
|
gienkov
|
229ba1f758
|
Merge remote-tracking branch 'upstream/master' into missing-strings
|
2015-09-22 00:36:32 +02:00 |
|
gienkov
|
b05f0c62ff
|
missing english respawn strings
|
2015-09-22 00:36:10 +02:00 |
|
PabstMirror
|
45e44251b6
|
Merge branch 'release'
Conflicts:
addons/repair/stringtable.xml
|
2015-09-21 17:14:53 -05:00 |
|
PabstMirror
|
6702a1faa4
|
Fix warnings for WeaponHolderSimulated
|
2015-09-21 16:34:02 -05:00 |
|
jonpas
|
2e3014daa3
|
Merge branch 'master' into parseList
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
|
2015-09-21 22:46:01 +02:00 |
|
commy2
|
23e3db9cc0
|
use CBA pfh in disableUserInput and fix key input weirdness
|
2015-09-21 22:42:31 +02:00 |
|
Glowbal
|
62ad9d4284
|
Version 3.3.2
|
2015-09-21 22:31:01 +02:00 |
|
Glowbal
|
42b2c18509
|
Merge pull request #2542 from acemod/FixSparePartsCargo
Fix cargo setVariable on server with InitPost
|
2015-09-21 22:28:59 +02:00 |
|