Commit Graph

10633 Commits

Author SHA1 Message Date
BaerMitUmlaut
7d2d40ee55 Added 3D treatment actions 2016-09-21 14:36:00 +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
6c720a7c09 Merge pull request #4440 from acemod/medical-rewrite-port-litter
port litter to treatment
2016-09-19 18:23:19 +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
ace3mod
0532249430 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-19 17:42:34 +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
bux578
98da86b74d Merge pull request #4436 from gienkov/patch-3
typo
2016-09-18 19:00:47 +02:00
Grzegorz
9877a58466 typo
This will fix typo on the wiki.
2016-09-18 18:50:33 +02:00
BaerMitUmlaut
a8b490bfca Merge pull request #4358 from acemod/tweakFatigueDuty
Tweak fatgiue duty factors
2016-09-18 16:31:21 +02:00
ace3mod
48a572573e [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-18 15:22:39 +02:00
commy2
19c4cd4e32 Merge pull request #4434 from acemod/fix-nocross
fix nocrosshair being in addons and optionals
2016-09-18 15:21:35 +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
ace3mod
543819c5f5 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-18 15:10:11 +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
c4e35a754a Merge pull request #4425 from acemod/curator-editable-blown-off-turrets
auto add blown off turrets to curator
2016-09-18 12:53:42 +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