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,878 Commits 73 Branches 88 Tags 752 MiB
7b526a99a3
Commit Graph

7878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
945ec7a388 more goggles code cleanup 2015-09-30 01:31:45 +02:00
commy2
dc882a3c66 more goggles code cleanup 2015-09-30 01:26:08 +02:00
commy2
c0105bf083 Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles 2015-09-30 00:28:26 +02:00
commy2
75d1ea7df3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-30 00:14:41 +02:00
commy2
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
commy2
8bbd6b69f0 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:12:35 +02:00
commy2
28e0e781f5 Merge pull request #2645 from acemod/340fixopticszeus 
fix zeus forced interface broken, fix #2642
 2015-09-29 23:04:51 +02:00
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
PabstMirror
eb7731aed4 Merge pull request #2653 from gienkov/setDefaultChannel-PL-translation 
PL translation
 2015-09-29 13:39:07 -05:00
gienkov
251437c415 pl translation 2015-09-29 20:37:30 +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
PabstMirror
c0b78ecf3a Set Default Channel at mission start 2015-09-29 11:36:30 -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
e375dbe0d7 Merge pull request #2598 from acemod/340modifierkey2 
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
 2015-09-28 21:20:19 +02: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
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +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