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,947 Commits 73 Branches 88 Tags 752 MiB
7981faad64
Commit Graph

7947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
12c663978a Merge pull request #2649 from acemod/captiveEvents 
Global Event for "CaptiveStatusChange"
 2015-10-03 12:47:58 -05:00
PabstMirror
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
gienkov
3d4a37614c Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-03 12:19:48 +02:00
licht-im-Norden87
e056a3b2cd Update README_DE.md 2015-10-03 04:54:10 +02:00
licht-im-Norden87
411ddac3b9 Update README_DE.md 2015-10-03 04:53:00 +02:00
licht-im-Norden87
2afbe36b89 Update README_DE.md 2015-10-03 04:39:22 +02:00
licht-im-Norden87
978d002112 Update README_DE.md 2015-10-03 04:37:28 +02:00
licht-im-Norden87
4d867cb4f7 Update README_DE.md 2015-10-03 04:36:38 +02:00
commy2
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
commy2
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
commy2
ea01db4030 Merge pull request #2648 from acemod/340goggles 
Code cleanup / refactoring Goggles
 2015-10-01 16:54:57 +02:00
licht-im-Norden87
66e8914360 Update stringtable.xml 2015-10-01 04:38:21 +02:00
Derek Sauer
f9352de489 Clarified comment slightly. 2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e Improved efficiency of wound counting. 
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
 2015-09-30 20:27:40 -04:00
licht-im-Norden87
88ee846d7d Update Stringtable, german: "captives" 2015-10-01 01:36:27 +02:00
commy2
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
Derek Sauer
f69f4066e9 Fix capitalization on forEach and getVariable. 2015-09-30 06:17:54 -04:00
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