Commit Graph

7588 Commits

Author SHA1 Message Date
30544dc757 Make cargo loaded hint optional, disable it when not loading manually 2015-09-26 23:16:05 +02:00
498dddcc26 Used isEqualTo 2015-09-26 23:06:35 +02:00
b787286837 Fixed allowed data types 2015-09-26 23:02:18 +02:00
4a5d6cade1 Bracket to Brace 2015-09-26 22:54:31 +02:00
64d6a172c7 Improved public function parameter handling, Fixed issue with synchronized objects 2015-09-26 22:53:49 +02:00
cd839a0ddc remove superfluous brackets 2015-09-26 22:42:47 +02:00
6cc920dc34 Code Cleanup Grenades, fix dedicated server AI thrown flasbangs do nothing 2015-09-26 22:39:12 +02:00
028aa404e9 change description in function header 2015-09-26 21:27:00 +02:00
c12584e15c Code Cleanup HitReactions 2015-09-26 21:23:18 +02:00
0509e26690 Code Cleanup NoRadio 2015-09-26 20:45:19 +02:00
9ae215704c Code cleanup Backpacks 2015-09-26 20:29:08 +02:00
f77242fce3 Merge pull request #2604 from acemod/340fixunconaftersettngsinit
delay setUnconscious until the settings are inited
2015-09-26 19:54:09 +02:00
07774647e9 delay setUnconscious until the settings are inited, fix #148 2015-09-26 19:30:13 +02:00
93114802d2 Merge pull request #2603 from acemod/340fixcargodestroyed
dont access cargo of destroyed vehicles, fix #2523
2015-09-26 18:29:56 +02:00
8affae9f7a dont access cargo of destroyed vehicles, fix #2523 2015-09-26 18:16:38 +02:00
777ac05d16 Merge pull request #2602 from acemod/340respawncleanup
Code cleanup respawn module, close #2184
2015-09-26 17:58:17 +02:00
6d9943ff2e fix wrong macro, missing ; 2015-09-26 16:45:39 +02:00
b1fb7befe8 remove wrong isServer check 2015-09-26 16:32:29 +02:00
5425836e47 cleanup respawn module, close #2184 2015-09-26 16:28:18 +02:00
f0584adeff Merge pull request #2601 from acemod/340fixfixfloatingSelections
fix fixFloating resetting reflector hitpoints, close #2279
2015-09-26 14:45:50 +02:00
dc7d24a3fd fix fixFloating resetting reflector hitpoints, close #2279 2015-09-26 14:38:50 +02:00
e257827a69 Merge branch 'master' of github.com:acemod/ACE3 2015-09-26 10:13:02 +02:00
8bb5f71ba1 Macro for non spawned CBA Debug Logging 2015-09-25 22:30:57 -05:00
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
5f7c30dd7c Merge pull request #2597 from Cuel/delay-spectator
fix spectator view if called instantly
2015-09-25 13:34:37 +01:00
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
43cdfaecc0 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-25 11:15:46 +02:00
412685e0ff fix some code was commented out in loadPersonLocal and unloadPersonLocal 2015-09-25 11:15:25 +02:00
3471ebef16 Merge https://github.com/dudakov/ACE3 into russian-merge 2015-09-23 19:17:52 +02:00
95ec25736e Merge pull request #2563 from gienkov/missing-strings
Missing english strings
2015-09-23 09:48:54 +02:00
3c5f222959 Merge branch 'release' 2015-09-22 22:22:39 +02:00
3c9e1899e2 Merge pull request #2574 from acemod/fixClickExplosivePlace
Delay one frame when selecting explosives
v3.3.2
2015-09-22 13:25:27 -05:00
ebcc540943 Merge pull request #2572 from acemod/fixClickExplosivePlace
Delay one frame when selecting explosives
2015-09-22 13:23:33 -05:00
5add8d6789 #2537 - Delay one frame when selecting explosives 2015-09-22 11:31:58 -05:00
a42685af2e Removed copy/pasted maintainer intruder 2015-09-22 18:04:27 +02:00
1848ea6325 fixez 2015-09-22 14:58:59 +02:00
49d1355ad8 Fix due to review 2015-09-22 11:52:06 +03:00
f93538eb9a #2423 - assign vehicle module fix for prefilled veh 2015-09-21 21:44:52 -05:00
079d88ded7 Merge pull request #2509 from acemod/miscFixNilFunctions
Fix some nil functions
2015-09-21 20:36:09 -05:00
bf0cdbaf77 Merge pull request #2534 from acemod/unconcHandcuffs
Take Unconscious captive
2015-09-21 20:35:02 -05:00
55eae90484 tabz 2015-09-22 02:35:06 +02:00
24f0df55a2 Merge pull request #2559 from acemod/340disableuserinputcleanup
Use CBA PFH in disableUserInput
2015-09-22 00:52:58 +02:00
617b1ec78d Merge pull request #2556 from acemod/340deprecation
add deprecated warnings
2015-09-22 00:52:43 +02:00
229ba1f758 Merge remote-tracking branch 'upstream/master' into missing-strings 2015-09-22 00:36:32 +02:00
b05f0c62ff missing english respawn strings 2015-09-22 00:36:10 +02:00
45e44251b6 Merge branch 'release'
Conflicts:
	addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
6702a1faa4 Fix warnings for WeaponHolderSimulated 2015-09-21 16:34:02 -05:00
23e3db9cc0 use CBA pfh in disableUserInput and fix key input weirdness 2015-09-21 22:42:31 +02:00
62ad9d4284 Version 3.3.2 2015-09-21 22:31:01 +02:00
42b2c18509 Merge pull request #2542 from acemod/FixSparePartsCargo
Fix cargo setVariable on server with InitPost
2015-09-21 22:28:59 +02:00