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
10,906 Commits 73 Branches 88 Tags 752 MiB
5965326ca1
Commit Graph

8983 Commits

Author SHA1 Message Date
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
commy2
5a19d4884b disable debug medical_damage 2016-09-27 19:22:54 +02:00
commy2
09c5fbde15 Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-27 18:59:43 +02:00
classicarma
1fe8cc03db translate realisticnames 2016-09-28 01:38:19 +09:00
classicarma
3f79d47fb4 translate zeus 2016-09-28 01:27:05 +09:00
classicarma
30a62b1337 translate yardage450 2016-09-28 01:26:50 +09:00
classicarma
b2e1432c2b translate winddeflection 2016-09-28 01:26:42 +09:00
classicarma
c4038970f2 translate weather 2016-09-28 01:26:31 +09:00
classicarma
5a2f92613d translate weaponselect 2016-09-28 01:26:17 +09:00
classicarma
e1b1a9cfec translate viewdistance 2016-09-28 01:26:08 +09:00
classicarma
de60b9fdbf translate vehicle 2016-09-28 01:25:57 +09:00
classicarma
d1c2c5be2e translate vehiclelock 2016-09-28 01:25:47 +09:00
classicarma
8f86482a86 translate vector 2016-09-28 01:25:36 +09:00
classicarma
ff4464370c translate ui 2016-09-28 01:25:23 +09:00
classicarma
04e3a5f92e translate tripod 2016-09-28 01:25:14 +09:00
classicarma
2f2c426e97 translate trenches 2016-09-28 01:25:06 +09:00
classicarma
eed1f50ae0 translate tagging 2016-09-28 01:24:58 +09:00
classicarma
4ee9ffba3f translate tacticalladder 2016-09-28 01:24:47 +09:00
classicarma
95da6b471c translate switchunits 2016-09-28 01:24:37 +09:00
classicarma
2b4bcfc585 translate spottingscope 2016-09-28 01:24:28 +09:00
classicarma
038e7775a3 translate spectator 2016-09-28 01:24:21 +09:00
classicarma
4cfa3d95cc translate slideshow 2016-09-28 01:23:18 +09:00
classicarma
6bcdaae866 translate sitting 2016-09-28 01:23:04 +09:00
classicarma
686b534701 translate scopes 2016-09-28 01:22:56 +09:00
classicarma
953ba0ff98 translate sandbag 2016-09-28 01:22:49 +09:00
classicarma
ae82c41a1b translate safemode 2016-09-28 01:22:40 +09:00
classicarma
775a6a5bc9 translate respawn 2016-09-28 01:22:33 +09:00
classicarma
cb842a4e1c translate repair 2016-09-28 01:22:20 +09:00
classicarma
3935a1b781 translate reloadlaunchers 2016-09-28 01:22:08 +09:00
classicarma
52d9c080cb translate reload 2016-09-28 01:21:58 +09:00
classicarma
feebd8e1b8 translate refuel 2016-09-28 01:21:49 +09:00
classicarma
45486fa843 translate rearm 2016-09-28 01:20:20 +09:00
classicarma
31229ffa0d translate rangecard 2016-09-28 01:18:10 +09:00
classicarma
ae69ec9338 translate parachute 2016-09-28 01:18:03 +09:00
classicarma
f61c54ad91 translate overheating 2016-09-28 01:17:56 +09:00
classicarma
de0f944013 translate opitionsmenu 2016-09-28 01:17:49 +09:00
classicarma
a25bc3b42b translate optics 2016-09-28 01:17:40 +09:00
classicarma
d0d826350b translate nightvision 2016-09-28 01:17:28 +09:00
classicarma
a778240d0e translate nametags 2016-09-28 01:17:07 +09:00
classicarma
1b39e6428b translate mx2a 2016-09-28 01:17:00 +09:00
classicarma
6f0c860aab translate movement 2016-09-28 01:16:50 +09:00
classicarma
6084b81e51 translate mk5motar 2016-09-28 01:16:42 +09:00
classicarma
a7b6d45f45 translate missionmodules 2016-09-28 01:16:34 +09:00
classicarma
2f86ed9a1c translate missileguidance 2016-09-28 01:16:21 +09:00
classicarma
33fde9ea72 translate minedetector 2016-09-28 01:16:13 +09:00
classicarma
60e57709cf translate microdagr 2016-09-28 01:16:06 +09:00
classicarma
188a1bf02b translate medical_ai 2016-09-28 01:15:59 +09:00
classicarma
a35e50e6af translate medical_menu 2016-09-28 01:15:51 +09:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
classicarma
0ced153e53 translate markers 2016-09-28 01:15:26 +09:00
classicarma
4afd71d293 translate map_gestures 2016-09-28 01:15:19 +09:00
classicarma
530946180b translate maptools 2016-09-28 01:14:58 +09:00
classicarma
4c2692c2ba translate map 2016-09-28 01:14:38 +09:00
classicarma
a6ae9047f6 translate main 2016-09-28 01:14:28 +09:00
classicarma
ef6ea019c9 translate magazinerepack 2016-09-28 01:14:15 +09:00
classicarma
c1fb635add translate logistics_wirecutter 2016-09-28 01:14:07 +09:00
classicarma
0f6b15e569 translate logistics_uavbattery 2016-09-28 01:13:45 +09:00
classicarma
d0d52b5604 translate laser_selfdesignate 2016-09-28 01:13:33 +09:00
classicarma
4dbdb8bd93 translate laserpointer 2016-09-28 01:13:20 +09:00
classicarma
f3b3105f01 translate laser 2016-09-28 01:13:12 +09:00
classicarma
7b4582d8e0 translate kestrel4500 2016-09-28 01:12:56 +09:00
classicarma
f2cbe233ab translate javelin 2016-09-28 01:12:46 +09:00
classicarma
10484e696c translate inventory 2016-09-28 01:12:32 +09:00
classicarma
fd069c48d4 translate interact_menu 2016-09-28 01:12:22 +09:00
classicarma
fda61324c8 translate interaction 2016-09-28 01:12:05 +09:00
classicarma
a44c26efb8 translate huntir 2016-09-28 01:11:47 +09:00
classicarma
e59c93988b translate hearing 2016-09-28 01:11:40 +09:00
classicarma
5453b15dd8 translate common 2016-09-28 01:11:27 +09:00
classicarma
c6806872c9 translate ballistics 2016-09-28 01:11:19 +09:00
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
commy2
5e35204811 woundHandler(SQF), fixes, improvements, more consistent variable naming 2016-09-27 17:29:49 +02:00
commy2
72e2bc72c0 don't exit loop prematurely 2016-09-27 11:57:37 +02:00
commy2
f90a91dfb5 add todo 2016-09-27 11:14:22 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
commy2
cae5196656 fix wound translations being lost in limbo 2016-09-26 21:09:32 +02:00
commy2
0637a7401e travis pls 2016-09-26 20:52:08 +02:00
commy2
c21323f9ed travis 2016-09-26 20:45:29 +02:00
commy2
2bfa1370a5 port injury parse fnc to medical damage 2016-09-26 20:30:45 +02:00
commy2
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
commy2
8fd7e8335a simplify and fix medical engine damage 2016-09-26 19:59:00 +02:00
PabstMirror
055c6d23f3 Fix passanger interaction (#4467) 2016-09-26 12:09:20 -05:00
commy2
80232c39cc add todo note 2016-09-26 19:07:14 +02:00
commy2
4b9873d304 fix various issues with handleDamage engine component 2016-09-26 18:30:39 +02:00
PabstMirror
11b6370e8f Fix undefined var in paradrop (#4465) 2016-09-25 21:25:11 +02:00
commy2
033c7c7eec Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-25 18:11:48 +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
PabstMirror
f6941b29bf Add changes to AB 2016-09-22 15:12:07 -05:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
PabstMirror
39fa0b5d0e #4366 - Fix treatment animion with no weapon equiped 2016-09-21 15:55:29 -05:00
PabstMirror
c7afae88f7 Fix base interaction nodes 2016-09-21 10:55:19 -05:00
BaerMitUmlaut
7d2d40ee55 Added 3D treatment actions 2016-09-21 14:36:00 +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
236d1f9669 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite 2016-09-19 18:23:37 +02:00
commy2
729ba9178b Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-19 18:23:26 +02:00
commy2
8937a27b96 port litter settings to treatment, stringtable fixes 2016-09-19 18:20:56 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
10d4047b4c fix problems with ported treatment 2016-09-19 17:52:16 +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
commy2
158b1eed69 add server only event handler only on server machine 2016-09-19 10:05:16 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +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
Glowbal
b74245c323 Merged branch medical-rewrite into medical-rewrite 2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02: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
031bb1ec91 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-18 15:17:01 +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
a5dcdf102f use TRACE macros for parseConfig function 2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d Fix handleDamage not working 2016-09-18 14:05:05 +02:00
Glowbal
7691af47f3 Further clean up 2016-09-18 13:33:22 +02:00
commy2
1c4cd81680 add displayName to blown off turret object 2016-09-18 12:19:29 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d Merge branch 'master' 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
 2016-09-18 11:51:21 +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