Commit Graph

7543 Commits

Author SHA1 Message Date
commy2
9bf7b68d76 fix errors on game start 2015-09-28 17:28:51 +02:00
commy2
5c5a65443b more interaction cleanup 2015-09-28 17:20:56 +02:00
commy2
f48636e633 more interaction cleanup, remove dead code 2015-09-28 17:11:53 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
commy2
af24428363 Merge pull request #2607 from acemod/340cleanupBackpacks
Code cleanup Backpacks
2015-09-27 13:50:20 +02:00
commy2
1a5f65ec5a Merge pull request #2625 from acemod/340safetymodecleanup
Code Cleanup SafetyMode, also fixes "cannot load sound .wss" RPT error
2015-09-27 13:50:11 +02:00
commy2
92ae1da660 Merge pull request #2622 from jonpas/aliveCommand
Replaced isAlive function with alive command
2015-09-27 13:49:58 +02:00
commy2
5387700460 Merge pull request #2610 from acemod/340cleanupNoRadio
Code Cleanup NoRadio
2015-09-27 13:49:08 +02:00
commy2
0500d4385d Merge pull request #2611 from acemod/340cleanupHitReactions
Code Cleanup HitReactions
2015-09-27 13:48:57 +02:00
commy2
fbe157614b Merge pull request #2612 from acemod/340cleanupGrenades
Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing
2015-09-27 13:48:46 +02:00
commy2
3211e6432e Merge pull request #2614 from jonpas/loadCargoOptionalHint
Optionalized Cargo Loaded Hint
2015-09-27 13:48:27 +02:00
commy2
50046decf3 Code Cleanup SafetyMode 2015-09-27 08:28:55 +02:00
jonpas
2ab58ab9ce Replaced common,isAlive function with alive command 2015-09-27 02:23:56 +02:00
jonpas
151903ace4 Expanded optional hint to addCargoItem and AddCargoByClass event 2015-09-27 00:31:23 +02:00
jonpas
30544dc757 Make cargo loaded hint optional, disable it when not loading manually 2015-09-26 23:16:05 +02:00
commy2
cd839a0ddc remove superfluous brackets 2015-09-26 22:42:47 +02:00
commy2
6cc920dc34 Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing 2015-09-26 22:39:12 +02:00
commy2
028aa404e9 change description in function header 2015-09-26 21:27:00 +02:00
commy2
c12584e15c Code Cleanup HitReactions 2015-09-26 21:23:18 +02:00
commy2
0509e26690 Code Cleanup NoRadio 2015-09-26 20:45:19 +02:00
commy2
9ae215704c Code cleanup Backpacks 2015-09-26 20:29:08 +02:00
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
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
SilentSpike
5f7c30dd7c Merge pull request #2597 from Cuel/delay-spectator
fix spectator view if called instantly
2015-09-25 13:34:37 +01: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
KoffeinFlummi
3471ebef16 Merge https://github.com/dudakov/ACE3 into russian-merge 2015-09-23 19:17:52 +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
PabstMirror
5add8d6789 #2537 - Delay one frame when selecting explosives 2015-09-22 11:31:58 -05: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
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
commy2
24f0df55a2 Merge pull request #2559 from acemod/340disableuserinputcleanup
Use CBA PFH in disableUserInput
2015-09-22 00:52:58 +02:00