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

7663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaerMitUmlaut
7d7aa5b67f !hasHatch condition part 2 2015-10-28 17:15:46 +01:00
BaerMitUmlaut
a1d72b81bf Switch to unit namespace, added !hasHatch condition 2015-10-28 17:13:05 +01:00
BaerMitUmlaut
2fe53431c7 Split event handlers 2015-10-08 19:29:30 +02:00
BaerMitUmlaut
e50a28874f Fix for BI bug, FFV support 2015-10-08 11:31:29 +02:00
BaerMitUmlaut
edb76ffae4 Initial commit 2015-10-07 20:11:07 +02:00
BaerMitUmlaut
f98c7dc285 Merge branch 'master' of https://github.com/acemod/ACE3 2015-10-07 14:20:57 +02:00
PabstMirror
39b838c7ab Merge pull request #2681 from acemod/vehDetachLocalfix 
Attach getIn/Out run on local unit
 2015-10-06 13:49:58 -05:00
commy2
9c22052871 Merge pull request #2685 from acemod/340removeactionsondead 
remove check ammo action on destroyed static weapons
 2015-10-06 19:36:19 +02:00
Glowbal
825b410ae8 Merge pull request #2684 from acemod/sqfValidatePython3 
Validate sqf - python 3 compat
 2015-10-05 20:33:31 +02:00
SilentSpike
e5b29727a5 Merge pull request #2617 from jonpas/zeusSpareparts 
Add Zeus Modules for Adding Spare Parts
 2015-10-05 19:01:50 +01:00
Glowbal
646907f77a Merge pull request #2562 from gienkov/pl-strings 
PL medical string
 2015-10-05 17:07:36 +02:00
gienkov
b6d2cdee69 Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-04 12:25:55 +02:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
92ed7eeac2 remove check ammo action on destroyed static weapons, fix #2671 2015-10-04 11:58:26 +02:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags 
fix missing magazines after certain scenarios
 2015-10-04 11:46:36 +02:00
commy2
5ed290362d Merge pull request #2663 from acemod/340rallypointminutes 
fix broken time format for rallypoints, fix #2662
 2015-10-04 11:46:25 +02:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute 
Add WaitUntilAndExecute Function
 2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
PabstMirror
dc9ba7aa4c Validate sqf - python 3 compat 2015-10-04 03:48:37 -05:00
Glowbal
f8cebd9403 Merge pull request #2007 from jokoho48/codeCleanupWeather 
Code cleanup Weather module
 2015-10-04 09:36:32 +02:00
Glowbal
58ea8d5e2c Merge pull request #2543 from alef/feature/death_short_diagnose 
Remove: pain diagnosis on dead patients
 2015-10-04 09:34:10 +02:00
Glowbal
f884f7d8fd Merge pull request #2552 from acemod/sqf-parser 
Add a first implementation of the sqf validator/parser/linter.
 2015-10-04 09:33:42 +02:00
Glowbal
9ce4ce6cdd Merge pull request #2582 from acemod/fixLitterFloating 
fix Littergeneric fly over ground
 2015-10-04 09:32:03 +02:00
Glowbal
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury 
Fix healHitPointAfterAdvBandage - Issue #2498.
 2015-10-04 09:28:47 +02:00
Glowbal
2c292af77e Merge pull request #2680 from acemod/cargoLockedVeh 
Disable loading into locked vehicles.
 2015-10-04 09:26:53 +02:00
Glowbal
4445ecd7c4 Merge pull request #2581 from acemod/invisibleLadder 
Invisible Tactical Ladder
 2015-10-04 09:26:34 +02:00
Glowbal
a823eff37f Merge pull request #2674 from acemod/triageCardGameTime 
Use ACE_gameTime for triage card
 2015-10-04 09:22:18 +02:00
PabstMirror
7315dd650f Merge branch 'master' into vehDetachLocalfix 2015-10-03 19:44:20 -05:00
PabstMirror
21f35dc7d0 #2664 - Disable loading into locked vehicles. 2015-10-03 19:42:40 -05:00
commy2
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
PabstMirror
10950d5fab Merge pull request #2623 from acemod/interactMenuSet 
Interact menu settings after init
 2015-10-03 12:49:04 -05:00
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
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
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
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