Commit Graph

7703 Commits

Author SHA1 Message Date
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
dc9ba7aa4c Validate sqf - python 3 compat 2015-10-04 03:48:37 -05:00
f8cebd9403 Merge pull request #2007 from jokoho48/codeCleanupWeather
Code cleanup Weather module
2015-10-04 09:36:32 +02:00
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
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
9ce4ce6cdd Merge pull request #2582 from acemod/fixLitterFloating
fix Littergeneric fly over ground
2015-10-04 09:32:03 +02:00
e36df978ec Merge pull request #2646 from DerekSauer/FixArmaInjury
Fix healHitPointAfterAdvBandage - Issue #2498.
2015-10-04 09:28:47 +02:00
2c292af77e Merge pull request #2680 from acemod/cargoLockedVeh
Disable loading into locked vehicles.
2015-10-04 09:26:53 +02:00
4445ecd7c4 Merge pull request #2581 from acemod/invisibleLadder
Invisible Tactical Ladder
2015-10-04 09:26:34 +02:00
a823eff37f Merge pull request #2674 from acemod/triageCardGameTime
Use ACE_gameTime for triage card
2015-10-04 09:22:18 +02:00
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
7315dd650f Merge branch 'master' into vehDetachLocalfix 2015-10-03 19:44:20 -05:00
21f35dc7d0 #2664 - Disable loading into locked vehicles. 2015-10-03 19:42:40 -05:00
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
10950d5fab Merge pull request #2623 from acemod/interactMenuSet
Interact menu settings after init
2015-10-03 12:49:04 -05:00
12c663978a Merge pull request #2649 from acemod/captiveEvents
Global Event for "CaptiveStatusChange"
2015-10-03 12:47:58 -05:00
b0b755720c #2672 - Use ACE_gameTime for triage card 2015-10-03 12:28:54 -05:00
3d4a37614c Merge remote-tracking branch 'origin/master' into pl-strings 2015-10-03 12:19:48 +02:00
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
ea01db4030 Merge pull request #2648 from acemod/340goggles
Code cleanup / refactoring Goggles
2015-10-01 16:54:57 +02:00
f9352de489 Clarified comment slightly. 2015-09-30 20:34:51 -04:00
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
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
f69f4066e9 Fix capitalization on forEach and getVariable. 2015-09-30 06:17:54 -04:00
945ec7a388 more goggles code cleanup 2015-09-30 01:31:45 +02:00
dc882a3c66 more goggles code cleanup 2015-09-30 01:26:08 +02:00
c0105bf083 Merge branch 'master' of https://github.com/acemod/ACE3 into 340goggles 2015-09-30 00:28:26 +02:00
75d1ea7df3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-30 00:14:41 +02:00
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
8bbd6b69f0 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:12:35 +02:00
28e0e781f5 Merge pull request #2645 from acemod/340fixopticszeus
fix zeus forced interface broken, fix #2642
2015-09-29 23:04:51 +02:00
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
8d5ce1dbe2 more goggles code cleanup 2015-09-29 22:24:25 +02:00
8d05214eb0 Resolve merge conflict from upstream pull. 2015-09-29 16:24:17 -04:00
ba42e3e295 pl string for dragging, tactical ladder 2015-09-29 22:12:11 +02:00
62349f685c more goggles code cleanup 2015-09-29 22:01:40 +02:00
d88d2fe578 Merge remote-tracking branch 'origin' into pl-strings 2015-09-29 21:56:29 +02:00
b7ce315240 more goggles code cleanup 2015-09-29 21:28:57 +02:00
d1aacf3fef more goggles code cleanup 2015-09-29 19:51:41 +02:00
53bfcdb61e more goggles code cleanup 2015-09-29 18:51:24 +02:00
d454271fb9 Give the event the D 2015-09-29 11:40:32 -05:00
d051d4c208 more goggles code cleanup 2015-09-29 17:57:09 +02:00
16b1244b0a Global Event for "CaptiveStatusChange" 2015-09-29 10:17:17 -05:00
477e9f06b6 more goggles code cleanup 2015-09-29 17:09:23 +02:00
2731ac360a more goggles code cleanup 2015-09-29 16:56:10 +02:00
d25d79c485 Goggles Code refactoring initial commit 2015-09-29 16:22:57 +02:00
954fad615a Reformatted to follow ACE3 coding guidelines. 2015-09-29 06:36:36 -04:00