Commit Graph

10922 Commits

Author SHA1 Message Date
commy2
6ae57e991f delete obsolete 2016-09-30 12:28:34 +02:00
commy2
490155270b QEGVAR vs QGVAR 2016-09-30 12:18:59 +02:00
commy2
bd98e44a94 simplify 2016-09-30 11:52:05 +02:00
commy2
77f21e9441 add some more functions to engine component 2016-09-30 11:23:07 +02:00
commy2
1196cbb210 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-30 10:39:06 +02:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
PabstMirror
a5d106c116 Fix cookoff event calling (#4487) 2016-09-29 18:44:48 -05:00
jonpas
dad4293216 Revert "Update showHud setter for Squad Radar" (#4485) 2016-09-29 17:53:17 -05:00
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
03e24d8fd9 improve checkItems function 2016-09-29 21:32:54 +02:00
jonpas
1bd7a66888 Merge pull request #4085 from acemod/apexShowHud
Update showHud setter for Squad Radar
2016-09-29 21:11:15 +02:00
commy2
f53d324c0d simplifications in the treatment config 2016-09-29 20:29:44 +02:00
commy2
bc7b055584 Merge remote-tracking branch 'origin/medical-rewrite-treatment-fnc' into medical-rewrite 2016-09-29 19:47:19 +02:00
commy2
4808e0e1cc manual merge 2016-09-29 19:46:20 +02:00
commy2
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00
commy2
ef8ad21446 fix inconsistencies in treatment time between basic and adv, fix item usage 2016-09-29 19:43:50 +02:00
commy2
e418cc05e9 cleanup, fix headers treatment has/use item functions 2016-09-29 19:31:48 +02:00
commy2
d3f6f040cd fix some problems with transitions from lowered weapon animations 2016-09-29 19:15:16 +02:00
commy2
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
ecd77630f5 some more animation time tweaks 2016-09-29 18:12:51 +02:00
PabstMirror
3c7ac5a3e4 Fix medical blood locality / bleeding in vehicles (#4469)
* Fix medical blood locality / bleeding in vehicles

- Fix ace_setting
- Don't run on headless if enabledFor = 1
- Don't create blood for non-local units
- Don't create blood when mounted (except static weapons)

* Add readme
2016-09-29 10:42:56 -05:00
PabstMirror
85c4a1f021 Fix frag - reflectionsEnabled (#4475)
PFEH never exited
2016-09-29 10:42:21 -05:00
commy2
36d244a868 'modernize' primary treatment functions, fix animation issues, add anim speed scaling 2016-09-29 16:00:19 +02:00
Nicolás Badano
2fda3e3471 Merge pull request #4480 from acemod/esteldunedain-fix4476
Remove visible id from the dog tag item
2016-09-28 20:52:49 -03:00
Nicolás Badano
0fda1b0c3d Fix #4476 2016-09-28 19:37:54 -03:00
commy2
410c5f1d5f treatment debug 2016-09-28 20:46:46 +02:00
commy2
4484a36f25 Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-28 18:33:16 +02:00
ace3mod
85a1ce6d83 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-09-28 13:16:04 +02:00
commy2
1219d3df23 remove deprecated sitting module (#4458)
* remove deprecated sitting module

* Update sitting documentation for removal

* Remove ACE3 sitting doc, redirect to ACEX and add note

* Fix wording
2016-09-28 13:14:50 +02:00
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
3d67de6fc1 fix a missing 2016-09-27 22:33:29 +02:00
commy2
035e8017cc Merge remote-tracking branch 'origin/medical-rewrite-interactions' into medical-rewrite 2016-09-27 21:38:30 +02:00
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
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
52bf52d4aa translate compat_adr_97 2016-09-28 01:27:17 +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