Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,705 Commits 73 Branches 88 Tags 752 MiB
b3032da51c
Commit Graph

6343 Commits

Author SHA1 Message Date
Derek Sauer
2824009317 Incorrectly retrieving list of current wounds. 
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
 2015-09-29 17:00:49 -04:00
commy2
8d5ce1dbe2 more goggles code cleanup 2015-09-29 22:24:25 +02:00
Derek Sauer
8d05214eb0 Resolve merge conflict from upstream pull. 2015-09-29 16:24:17 -04:00
gienkov
ba42e3e295 pl string for dragging, tactical ladder 2015-09-29 22:12:11 +02:00
commy2
62349f685c more goggles code cleanup 2015-09-29 22:01:40 +02:00
gienkov
d88d2fe578 Merge remote-tracking branch 'origin' into pl-strings 2015-09-29 21:56:29 +02:00
commy2
b7ce315240 more goggles code cleanup 2015-09-29 21:28:57 +02:00
commy2
d1aacf3fef more goggles code cleanup 2015-09-29 19:51:41 +02:00
commy2
53bfcdb61e more goggles code cleanup 2015-09-29 18:51:24 +02:00
PabstMirror
d454271fb9 Give the event the D 2015-09-29 11:40:32 -05:00
commy2
d051d4c208 more goggles code cleanup 2015-09-29 17:57:09 +02:00
PabstMirror
16b1244b0a Global Event for "CaptiveStatusChange" 2015-09-29 10:17:17 -05:00
commy2
477e9f06b6 more goggles code cleanup 2015-09-29 17:09:23 +02:00
commy2
2731ac360a more goggles code cleanup 2015-09-29 16:56:10 +02:00
commy2
d25d79c485 Goggles Code refactoring initial commit 2015-09-29 16:22:57 +02:00
Derek Sauer
954fad615a Reformatted to follow ACE3 coding guidelines. 2015-09-29 06:36:36 -04:00
Derek Sauer
8619f02538 Take into account wounds that do no cause blood loss. 2015-09-29 06:19:49 -04:00
PabstMirror
6e24d2868c Fix playerChanged event 2015-09-28 22:41:45 -05:00
Derek Sauer
a864a3411c Clarified a comment. 2015-09-28 21:32:04 -04:00
commy2
1ec4556bb8 fix zeus forced interface broken, fix #2642 2015-09-29 02:48:22 +02:00
Derek Sauer
488541bba6 Fix for Arma wounds not being healed with healHitPointAfterAdvBandage. 2015-09-28 20:08:07 -04:00
commy2
19131f001d fix error in handleplayerchanged for tacticl ladder 2015-09-28 21:16:13 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
commy2
34793ce044 Merge pull request #2635 from acemod/340interactcleanup 
Code Cleanup Interaction
 2015-09-28 21:04:28 +02:00
commy2
6c968d8bc7 per frame handler for incremental door opening 2015-09-28 20:07:01 +02:00
commy2
443cbf8be3 fix compile error when trying to open a locked door by shortcut 2015-09-28 19:03:37 +02:00
commy2
6f64fcd0fb search for door in geometry lod (lineintersectssurface) 2015-09-28 18:45:10 +02:00
commy2
6289a0cadb Merge pull request #2626 from acemod/340weaponselectcleanup 
Code Cleanup WeaponSelect
 2015-09-28 18:10:16 +02:00
commy2
5a3a32f236 more interaction cleanup 2015-09-28 18:06:25 +02:00
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
Glowbal
e1bbc06ef8 Merge pull request #2613 from jonpas/improveSlideshowParams 
Improved Slideshow API
 2015-09-28 16:38:00 +02:00
jonpas
e4d8f13c89 Change may to must in slideshow error log 2015-09-28 16:02:18 +02:00
Glowbal
7215dd9082 Merge pull request #2368 from jonpas/removeVignetteAndCleanUI 
Removed Vignette and Cleaned up UI component
 2015-09-28 15:56:34 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
Glowbal
74805caa5d Merge pull request #2565 from acemod/medVehAssignFix 
assign vehicle module fix for prefilled veh
 2015-09-28 15:02:48 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
commy2
e9770fcb97 remove obsolete functions 2015-09-27 17:15:59 +02:00
commy2
1613ce3ff6 correct comment 2015-09-27 16:55:43 +02:00
commy2
b6532a05cc new function to select a grenade 2015-09-27 16:47:02 +02:00
commy2
f8819d3ee4 WeaponSelect cleanup 2015-09-27 14:55:36 +02:00
commy2
e3b926296f Merge branch 'master' of https://github.com/acemod/ACE3 into 340weaponselectcleanup 2015-09-27 13:53:00 +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
a078d73230 Code Cleanup WeaponSelect 2015-09-27 08:51:42 +02:00
commy2
50046decf3 Code Cleanup SafetyMode 2015-09-27 08:28:55 +02:00
PabstMirror
4a935eb129 Remove debug 2015-09-26 22:02:44 -05:00
PabstMirror
174d8ac306 #2486 - Run color setup on settingsInit 2015-09-26 22:02:05 -05: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
b345db4ae9 Added Zeus modules for adding Spare Tracks and Wheels 2015-09-27 00:29:19 +02:00
jonpas
30544dc757 Make cargo loaded hint optional, disable it when not loading manually 2015-09-26 23:16:05 +02:00
jonpas
498dddcc26 Used isEqualTo 2015-09-26 23:06:35 +02:00
jonpas
b787286837 Fixed allowed data types 2015-09-26 23:02:18 +02:00
jonpas
4a5d6cade1 Bracket to Brace 2015-09-26 22:54:31 +02:00
jonpas
64d6a172c7 Improved public function parameter handling, Fixed issue with synchronized objects 2015-09-26 22:53:49 +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
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
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
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