Commit Graph

8854 Commits

Author SHA1 Message Date
PabstMirror
257f1a1b4c Fix interaction addActionToX return values (#4461)
* Fix interaction addActionToX return values

Fix #4460
Fix returning number from pushBack

* Retrun empty array on error
2016-09-27 11:09:06 -05:00
PabstMirror
055c6d23f3 Fix passanger interaction (#4467) 2016-09-26 12:09:20 -05:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
7f07d4e4b8 fix broken parachutes, fix #4437 (#4462) 2016-09-25 09:45:55 +02:00
commy2
e7bc2e9d62 remove deprecated code for 3.8.0 (#4457)
* remove deprecated scroll wheel event handler

* remove deprecated ace hash functions

* remove deprecated execNextFrame

* remove deprecated insertionSort

* remove deprecated getConfigType

* remove deprecated binocularMagazine

* remove deprecated wait(Until)AndExecute

* remove old ass and deprecated alternative syntax setHitPointDamage

* remove deprecated event handlers (#4459)

* remove deprecated event handlers#

* remove ACE_newEvents

* Remove old ACE PlayerEventHandler wrappers
2016-09-24 22:31:10 +02:00
PabstMirror
9451716a44 Show damage on repair items interaction point (#4448)
* Show damage on repair items interaction point

* Fix dot size

* Change scaling
2016-09-24 15:15:02 -05:00
commy2
bc520c7fe7 add dmg materials to spare tracks and wheel (#4450)
* add dmg materials to spare tracks and wheel

* attempt to fix damage rvmats by making FIRE GEO components convex

* get materials to work
2016-09-24 22:08:56 +02:00
commy2
c1ead851cb Add 3den attribute to disable bft (#4452)
* add 3den object attribte to disable BFT on the object

* delay setVariable public on group

* fix tooltip
2016-09-24 21:46:03 +02:00
PabstMirror
0b3d38a72f Use waitAndExecute for fatigue loop (#4453)
* Use waitAndExecute for fatigue loop

Close #4379
- Will use CBA_missionTime so it repsects pause and time accl
- Possible performance improvment over using a PFEH

* Rename main loop function
2016-09-23 16:40:52 -05:00
PabstMirror
a7c75a3bf6 Handle RHS impact grenades (RGN/RGO) (#4447) 2016-09-23 16:38:24 -05:00
PabstMirror
f23e5d33fc Fix throwing from map screen - global XEH (#4449)
* Fix throwing from map screen - global XEH

* Fix Capitalization
2016-09-23 12:48:25 -05:00
PabstMirror
b7dfdc6c84 End path drawing when passing through Geom/Fire (#4385)
* End path drawing when passing through Geom/Fire

* Add Advanced Throwing colored circles documentation
2016-09-23 12:48:15 -05:00
PabstMirror
4abf969abf Update for newest JR / 1.64 UBC (#4208)
* Update flashsuppressor JR configs for pistols

* Update for newest JR / 1.64 UBC
2016-09-23 12:48:04 -05:00
commy2
26ae575d4a fix broken ace menu in main menu (#4451) 2016-09-22 23:55:52 +02:00
commy2
03d83b633f more immersive dogtag interaction (#4446)
* more immersive dogtag interaction

* fix indent and macro usage

* move dogtag interaction point to neck
2016-09-21 09:07:45 +02:00
PabstMirror
58bd6467b2 Debugging tool to watch variables on main display (#4408)
* Debugging tool to watch variables on main display

* Fix error when called from scheduled code

* Remove demo code
2016-09-20 12:18:44 -05:00
BaerMitUmlaut
b1f6973772 Filter player medics (#4444) 2016-09-20 16:01:54 +02:00
Glowbal
c7e16210c3 fix pboprefix path 2016-09-19 23:17:10 +02:00
commy2
3d422021ef Merge pull request #4377 from acemod/sys-blood-port
Add ace2 sys blood port
2016-09-19 17:35:32 +02:00
commy2
5b42dd8616 remove deleted models 2016-09-19 15:47:51 +02:00
commy2
9a9d547893 this variable was meant to be used here... 2016-09-19 15:38:03 +02:00
commy2
226742088b remove unused variables 2016-09-19 15:36:08 +02:00
commy2
00964bd007 add a comment 2016-09-19 15:31:53 +02:00
commy2
d9b670f45f switch to SuperShader for SMDI and NoHQ, rename blood textures 2016-09-19 15:30:12 +02:00
commy2
b1f726a1fe get rid of config and use namespace for blood models 2016-09-19 15:08:38 +02:00
commy2
f60b368c65 precompile and cache functions at game start 2016-09-19 14:41:02 +02:00
commy2
a2805fad53 fix undefined variable, synch splat direction correctly 2016-09-19 14:38:47 +02:00
commy2
70512db0e3 simplifying and fixing offset 2016-09-19 13:26:32 +02:00
commy2
bc3260c8fc convert magic numbers into macros, simplify a waitAndExecute 2016-09-19 12:27:02 +02:00
commy2
d86ceef484 use ASL instead of ATL when z isn't used anyway 2016-09-19 12:18:24 +02:00
commy2
4de8ed0f10 delete unused blood splat configs and models 2016-09-19 12:11:37 +02:00
commy2
edfc33d297 simplify serverEvent call 2016-09-19 12:06:13 +02:00
commy2
86f6a5db73 move model files into data folder 2016-09-19 12:03:05 +02:00
commy2
022e8b52d0 remove unused CBA macro from blood config, disable A3 canBeShot 2016-09-19 11:38:29 +02:00
commy2
0cf6094875 rename spawnBlood to createBlood for consistency 2016-09-19 11:21:05 +02:00
commy2
26caafdab3 fix wrong function used in a example/header 2016-09-19 11:19:16 +02:00
PabstMirror
616ec642da Add AB Terrain Extension Logging (#4391) 2016-09-18 22:00:34 +02:00
BaerMitUmlaut
7388892dac Fixed weather for inherited CfgWorlds (#4360)
* Fixed weather for inherited CfgWorlds

* toLower for inArray - check all configs exist
2016-09-18 22:00:27 +02:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395)
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
2016-09-18 22:00:13 +02:00
PabstMirror
fbb054dec4 Merge pull request #4422 from acemod/incindNull
Skip incindinary effects if projectile is null
2016-09-18 14:54:18 -05:00
BaerMitUmlaut
a8b490bfca Merge pull request #4358 from acemod/tweakFatigueDuty
Tweak fatgiue duty factors
2016-09-18 16:31:21 +02:00
commy2
6cc960aacc fix nocrosshair being in addons and optionals 2016-09-18 15:19:17 +02:00
commy2
0ff4c20861 Merge pull request #4168 from acemod/nocross
optional pbo to disable cross hair
2016-09-18 15:08:43 +02:00
commy2
1c4cd81680 add displayName to blown off turret object 2016-09-18 12:19:29 +02:00
commy2
2b4c5f9c49 auto add blown off turrets to curator 2016-09-18 11:31:28 +02:00
PabstMirror
32b7ef7b85 Skip incindinary effects if projectile is null 2016-09-17 13:09:03 -05:00
commy2
95409f6772 Merge pull request #4383 from acemod/support-disable-cookoff
Add object attribute to disable cookoff for individual vehicles
2016-09-17 18:50:34 +02:00
commy2
d5edc5a1f5 Merge pull request #4411 from acemod/burn-wheels
incendiary and cookoff improvements
2016-09-17 18:30:08 +02:00
commy2
e02516e5b5 invert reverted inverted 2016-09-17 18:08:08 +02:00
commy2
3d18374747 add object 3den setting for disabling cook off effects 2016-09-17 17:47:29 +02:00
Glowbal
e8f55348d8 Add ACE2 sys_Blood port 2016-09-17 16:52:25 +02:00
SilentSpike
e3d26c535a Merge pull request #4368 from 654wak654/delete-teleport-module
Delete "Teleport Players" module after use
2016-09-17 11:52:38 +01:00
Glowbal
48a198fea4 Add support for disabling cookoff for individual vehicles 2016-09-17 12:13:43 +02:00
Ozan Eğitmen
56751eff0e Revert "Delete "Group Side" module after use"
This reverts commit 2880c6152a.
2016-09-17 01:01:37 +03:00
classicarma
0d4a0a52ba translate gunbag 2016-09-17 01:47:01 +09:00
classicarma
7f208e094d translate grenades 2016-09-17 01:46:51 +09:00
classicarma
5c160db023 translate goggles 2016-09-17 01:46:34 +09:00
classicarma
3605778d60 translate gforces 2016-09-17 01:46:19 +09:00
classicarma
1e28c16ba2 translate gestures 2016-09-17 01:46:09 +09:00
classicarma
5fc3b05c21 translate frag 2016-09-17 01:46:00 +09:00
classicarma
f9e44a2820 translate flashsuppressors 2016-09-17 01:45:47 +09:00
classicarma
32939571e5 translate flashlights 2016-09-17 01:45:34 +09:00
classicarma
6312a19dd6 translate finger 2016-09-17 01:45:24 +09:00
classicarma
d1e57f9678 translate fcs 2016-09-17 01:45:14 +09:00
classicarma
47bd4e9991 translate fastroping 2016-09-17 01:44:56 +09:00
classicarma
4fabf8b1f1 translate exolosives 2016-09-17 01:44:45 +09:00
classicarma
647ad8c681 translate dragging 2016-09-17 01:44:37 +09:00
classicarma
4827a18aa0 translate digtags 2016-09-17 01:44:30 +09:00
classicarma
99c5122120 translate disarming 2016-09-17 01:44:22 +09:00
classicarma
dfa5a745a0 translate dagr 2016-09-17 00:58:02 +09:00
classicarma
24d365fa5d translate cookoff 2016-09-17 00:57:49 +09:00
classicarma
83a18e84de translate concertina_wire 2016-09-17 00:57:40 +09:00
classicarma
e767d65cfb translate common 2016-09-17 00:57:27 +09:00
classicarma
e6b2cc8a74 translate chemlights 2016-09-17 00:57:17 +09:00
classicarma
78ee33b46f translate cargo 2016-09-17 00:57:09 +09:00
classicarma
fb48edb667 translate captives 2016-09-17 00:57:00 +09:00
classicarma
53bee76f8d translate ballistics 2016-09-17 00:56:53 +09:00
classicarma
23d70fb6f0 translate attach 2016-09-17 00:56:45 +09:00
classicarma
1e1c202f96 translate atragmx 2016-09-17 00:56:36 +09:00
classicarma
4003b1486b translate advanced_throwing 2016-09-17 00:56:25 +09:00
classicarma
892af25bac translate advanced_fatigue 2016-09-17 00:56:13 +09:00
classicarma
4fd92b534a translate advanced_ballistics
This reverts commit 65bfee0f9481313599c654b69ca2a0370077f3ea.

translate advanced_ballistics
2016-09-17 00:55:53 +09:00
commy2
3cea9e727d fix a comment 2016-09-16 14:00:43 +02:00
commy2
a487c5e89f offset for quad engine smoke, delete destroyed RepairItem s 2016-09-16 13:51:41 +02:00
commy2
d200eadb46 incendiary and cookoff improvements 2016-09-16 13:08:19 +02:00
classicarma
524312dce3 translate aircraft 2016-09-16 19:49:08 +09:00
classicarma
53e50f4f91 translate disposable 2016-09-16 12:01:26 +09:00
Ozan Eğitmen
2880c6152a Delete "Group Side" module after use 2016-09-16 01:34:32 +03:00
PabstMirror
bbcc82acf6 Tweak fatgiue duty factors 2016-09-13 16:56:06 -05:00
PabstMirror
b81ccca3f7 Captives - rewrite findEmptyNonFFVCargoSeat (#4348)
Simplify func using `fullCrew`
Fix #4339
also switch hard `ERROR(` macro to `WARNING(`
2016-09-13 16:52:51 -05:00
Glowbal
65cdf200fb Merged branch release into master 2016-09-13 21:28:22 +02:00
Glowbal
4ae4fca852 Prep 3.7.0 release 2016-09-12 19:47:31 +02:00
jonpas
0400a857e6 Fix Advanced Throwing vanilla throw block for primed throwables (#4370)
* Fix vanilla throwing block failing after priming, simplify muzzle ammo (can only be 1 or 0, 1 doesn't influence anything if no appliccable throwable in inventory)

* Disable select grenade keys when advanced throwing is active

* Fix #4375 - select next grenade cycles between first 2 grenade muzzles due to setAmmo
2016-09-12 19:21:04 +02:00
BaerMitUmlaut
1601f6a7b7 Disable medical AI for remote controlled AI 2016-09-12 17:06:14 +02:00
PabstMirror
9844ae32c9 Exit fatiuge loop when dead (don't play breathing sound) 2016-09-11 22:03:20 -05:00
commy2
bfb88efe9a Fix script error in cargo drop function (#4369) 2016-09-10 21:21:09 +02:00
Ozan Eğitmen
d533bd1663 Delete "Teleport Players" module after use 2016-09-10 15:33:19 +03:00
Glowbal
04dd0412ff Prepare 3.7.0 RC6 2016-09-09 11:43:40 +02:00
jonpas
062f6deec8 Fix Advanced Throwing floating IR grenades and block vanilla throwing (#4365)
* Fix #4362 - floating primed IR grenades

* Fix #4363 - block vanilla throwing while prepared

* Respect last thrown time with vanilla throwing and dropping primed throwable,
2016-09-09 11:00:30 +02:00
BaerMitUmlaut
b1f91f8cf5 Use directCall on tripflare effect 2016-09-08 21:22:32 +02:00
Glowbal
ebdc883855 Prepare 3.7.0 RC5 2016-09-07 21:35:58 +02:00
PabstMirror
0d81ce34e2 Fix stop gesture keybind (#4354) 2016-09-07 21:07:51 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
commy2
6e99e8a951 don't let tripod fall over as easily (#4352) 2016-09-06 21:55:23 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5cd9b56866 don't let tripod fall over as easily (#4352) 2016-09-06 21:53:38 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351)
fix #4306
2016-09-06 21:52:22 +02:00
PabstMirror
4781903be6 Add setting for medical ai 2016-09-06 21:48:46 +02:00
PabstMirror
ec4c2276a5 Add setting for medical ai 2016-09-05 22:35:01 -05:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02:00
PabstMirror
a585a36ced Add ace mags to 7.62 SPAR_03 (#4340) 2016-09-05 20:33:12 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337)
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
2016-09-05 20:23:28 +02:00
jonpas
2474da36b3 Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336)
* Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up

* Prevent picking up GL and mortar smoke shells

* Fix pick up delay properly, Add separate define for quick throwing (for use when debugging)

* Fix forgotten rename in IR chemlight handling
2016-09-05 20:23:03 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
PabstMirror
7055b242e4 Fix AF author String (#4330) 2016-09-04 22:34:48 +02:00
PabstMirror
f21d45392f SPAR use ACE Magazines - Fix #4207 (#4329) 2016-09-04 21:56:05 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
Glowbal
5034dffec8 Fix build error with make 2016-09-04 21:51:13 +02:00
BaerMitUmlaut
cc414de8d1 Add Advanced Fatigue component (#4321)
* Initial commit advanced fatigue

* Added animation changes

* Fixes, rewrites

* Broadcast 3den attribute and fix UBC

* Further animation tweaks

* Added Eden attribute and CBA settings

* Switch to CBA events

* Add beautified component name

* Rewrites, fixes, tweaks

* Move setVars to GVARs

* Add setting to disable

* Switch to status effect handler for sprint and jog blocking

* Add component name

* Failsafe for early unit player EH

* Removed raised weapon penalty for pistols

* Added respawn compatibility

* Tweaked side jog animation speed

* Added support for virtual load

* Added stamina bar

* Remove debug flags

* Added custom duty factor functions and values

* Added structural comments

* Disabled CBA settings, added ACE settings

* Fixed config

* Added readme

* Remove leftover debug diag_logs

* Improved stringtable
2016-09-04 21:33:07 +02:00
PabstMirror
7314f863f6 Add spare barrel to VA in 1.64 (#4328)
Close #4325
2016-09-04 21:26:15 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02:00
BaerMitUmlaut
8a47d7a9b6 Add fade nametags towards screen border (#4316)
* Fade nametags towards screen border

* Use distance2D instead of vector commands

* Don't calculate fade when off screen

* Made fade on border optional
2016-09-04 20:50:12 +02:00
Glowbal
b0fa1a32d9 Fix params 2016-09-04 20:37:25 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
BaerMitUmlaut
278e7fa800 Add Medical AI implementation for basic medical (#4311)
* Initial commit medical AI

* Finished non-healing functions

* Initial work on self healin

* AI healing

* Finished medical AI for basic medical

* Finito

* Fix for dead units, medic not being close enough

* Make ace_medical required

* Fixed double systemChat

* Made AI units able to heal players

* Fixed wound treatment

* Fixed medic movement

* Made units heal themselves earlier
2016-09-04 11:25:03 +02:00
BaerMitUmlaut
c3222bdf0c Add realistic weights (#3868)
* Adjusted weapon weights - Vanilla

* Adjusted weapon weights - Marksmen DLC

* Adjusted weight of SIG 556 to SIG 550
2016-09-04 11:07:36 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
J3aLeiNe
7220d0ee5d compat RHS US : Change for default ACE_12.7x99 (#4184)
* Change for default ACE_12.7x99

 - rhsusf_ammo_127x99_M33_Ball = B_127x99_Ball from addons/ballistics/CfgAmmo.hpp

 - rhsusf_ammo_127x99_mk211 = ACE_127x99_API from addons/ballistics/CfgAmmo.hpp

* Default ACE3 12.7x99 and recheck bullets values

 - 7.62 M993 : fix Ballistic Coefficient and Mass according with ballistics/CfgAmmo.hpp
 - 7.62 M993 : add a muzzle velocity according with the Mk11 Mod0 barrel length (609.6mm) and the M14 EBR-R1 barrel length (558.8mm) (empiric, not perfect but better than nothing)
 - recheck all bullets values

* Accurate M249s' barrel length

* Little add and fix for Atragmx "GunList" (#1)

- add 12.7x99 API
 - fix .408 "Mass" according with the ballistics/CfgAmmo.hpp
 - fix .300WM MK248 Mod0 "Mass" according with the ballistics/CfgAmmo.hpp
 - Typo Mod0, Mod1 for a better reading on the Atrag's panel
 - fix .308 M80 "Mass" according with the ballistics/CfgAmmo.hpp
 - add .308 Mk316
2016-09-03 22:00:15 +02:00
PabstMirror
2b29dcadc3 Merge pull request #4310 from acemod/voiperr-flashlight_housekeeping
Map + Flashlights Cleanup (merge conflicts + fixes)
2016-09-02 18:57:48 -05:00
jonpas
0e1f2828a9 Rename Advanced Throwing component to be in-line with other advanced_ components (#4318)
* Rename Advanced Throwing component to be in-line with other advanced_ components

* Rename wiki page as well

* Add redirect from old wiki page
2016-09-03 01:39:34 +02:00
PabstMirror
12de3265b8 Fix INFO Macro not in CBA 3.0 (#4320) 2016-09-02 12:50:23 -05:00
jonpas
d3ee125d5e Fix Advanced Throwing IR Chemlight and in-hand pick up (#4313)
* Fix IR Chemlights pick up

* Fix attached throwable pick up interaction condition

* Fix in hand pick up locality
2016-09-02 14:57:20 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306)
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
2016-09-01 12:46:08 +02:00
jonpas
eb007973c1 Merge pull request #4315 from acemod/fixChemlightShieldDescriptions
Fix Chemlight Shield Green and Red descriptions
2016-09-01 01:20:04 +02:00
jonpas
cbdabfb78d Fix Chemlight Shield Green and Red descriptions 2016-08-31 23:14:12 +02:00
PabstMirror
62bb1db705 Fix chemlight supplyCreate UBC (#4314) 2016-08-31 16:10:40 -05:00
PabstMirror
41d758567e Chemlights cleanup (#4304) 2016-08-31 22:12:40 +02:00
Glowbal
df66b0876f Minor private variable fixes (#4300) 2016-08-27 17:35:45 +02:00
PabstMirror
d448ea8916 Improve interaction position for air units. (#4285)
Fix #4233
2016-08-27 10:37:58 +02:00
[OMCB]kaban
64cf8aa95a Russain Translations Update (#4286) 2016-08-27 10:36:00 +02:00
PabstMirror
df7aa38a7a Allow inheritance for addActionToClass (#4272)
* Allow inheritance for addActionToClass

* Update Headers

* Use inline code for inheritance example
2016-08-27 10:35:21 +02:00
Glowbal
1366a6f15f Merge pull request #4289 from acemod/earlyAddPlayerEventHandler
Fix null ace_player from early call to addPlayerEH
2016-08-27 10:32:12 +02:00
Grey-Soldierman
dae3d8d682 Definable classname for Spare Barrel (#4121)
* Added definable barrel classname through weapon config

* Improved condition for player carrying spare barrel
2016-08-27 10:21:15 +02:00
voiperr
fedad7f8f7 Ace_Chemlights (Chemlight Enhancements) (#3921)
* Add ace_chemlights.
Make chemlight intensity and dropoff more realistic.
Add orange, white, IR chemlights.
Add chemlight shields.
Make chemlight impact sounds more realistic.

* Moved impact sound changes to a different branch.

* Used QPATHTOF. Fixed scopes. Used initServer. Reduced lifetime duration.
Checked privates.

* Stringtable: 5 minute.

* Blue lifetime. Removed ref to deprecated function

* Use proper magazine macro. Add new chemlights to Misc box.
2016-08-27 10:19:39 +02:00
commy2
9ef24d25ba paradrop crates from helicopter or plane cargo (#2468) 2016-08-27 10:14:54 +02:00
PabstMirror
c9f9b89ea2 Fix merge (was moved to XEH_postInitServer)
Use short circuit for loadout change and add note
2016-08-25 18:56:57 -05:00
PabstMirror
fd6bd7f794 Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping 2016-08-25 15:50:11 -05:00