Glowbal
9e00fc479b
CPR local is now also only executed when the target is still alive.
...
Otherwise it's quite useless
2015-06-20 12:51:42 +02:00
Glowbal
c4283404e8
Changed CPR to be available for all unconscious units
...
Including dead
2015-06-20 12:51:01 +02:00
Glowbal
ea0be1f563
Only execute the local handling of CPR when in a valid state
2015-06-20 12:46:26 +02:00
Glowbal
385baf1331
Using CPR while in revive state will extend the life timer
2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c
While in revive state, ensure vitals are never above 0 for adv medical
2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745
Fixed #1693
2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c
Removed always unconscious for basic medical
2015-06-20 12:23:40 +02:00
ulteq
8d1d0c5480
Merge pull request #1672 from acemod/hearingAmmoClassCaching
...
Improved config caching
2015-06-20 09:48:07 +02:00
Macusercom
cac8dd8b02
German translations fixes
2015-06-20 02:16:30 +02:00
Glowbal
5887c59c05
Made fix properly for advanced medical
2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a
Initial work
2015-06-19 22:53:25 +02:00
PabstMirror
25df7aad09
Attach use purely virtual object (no setPos)
2015-06-19 13:32:42 -05:00
jonpas
da9b5dd917
Merge branch 'master' into automateRelease
2015-06-19 16:44:37 +02:00
Garth "L-H" de Wet
7129cb34fd
Merge pull request #1688 from acemod/explosiveUnderwaterInteraction
...
Enable interaction with explosives while swimming
2015-06-19 11:52:49 +02:00
ulteq
474e694309
Enable interaction with explosives while swimming
2015-06-19 11:49:38 +02:00
PabstMirror
6c7ba7b5ae
Zeus module on dedicated server
2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0
Connect Zeus module to Frag
2015-06-18 22:13:06 -05:00
PabstMirror
9c0478ddfd
Cleanup
2015-06-18 22:04:48 -05:00
PabstMirror
e235ebcc15
Fix frag always killing thrower
2015-06-18 21:48:23 -05:00
ViperMaul
4eb39989e2
Merge pull request #1684 from acemod/fixMakeBuildErrorWithNOBIN
...
make.py - Fix missing backup files forr $NOBIN$ situations
2015-06-18 17:48:45 -07:00
ViperMaul
c0cdcbab62
fixing missing backup files for config.cpp and $pboprefix$ in $NOBIN$ situations
...
#1682
2015-06-18 17:43:12 -07:00
ulteq
e4701b7974
Removed obsolete HLC compat pbos:
...
toadie2k, thanks for transferring those configuration values.
2015-06-19 01:03:42 +02:00
ViperMaul
394bcafc4a
Set version to 3.1.2
2015-06-18 15:49:27 -07:00
PabstMirror
d7717448fa
#1670 - Laser pointer - pass _brightness to drawFnc
2015-06-18 17:16:53 -05:00
jonpas
4330caea9a
Removed redundant check
2015-06-18 21:30:06 +02:00
jonpas
873f861dc8
Improved release command line argument handling, Revamped set_version_in_files to support both types of versions dynamically, Release archive using long version, old archive removal improved
2015-06-18 21:19:01 +02:00
ulteq
5d2905ca42
Improved config caching
2015-06-18 11:56:58 +02:00
ulteq
c3fea42bce
Merge pull request #1622 from acemod/huntirHitpoints
...
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
2015-06-18 11:03:15 +02:00
ulteq
95ae42ef41
Merge pull request #1671 from acemod/AceMiscBoxMissingItems
...
Added HuntIR and tactical ladder to ACE_Box_Misc
2015-06-18 11:02:28 +02:00
ulteq
bb877bc54c
Added HuntIR and tactical ladder to ACE_Box_Misc
2015-06-18 11:02:04 +02:00
Glowbal
7b1015155c
Merge pull request #1626 from acemod/cupCompatImprovment
...
CUP weapon config improvement:
2015-06-18 08:35:30 +02:00
Glowbal
0631a6ae7d
Merge pull request #1647 from acemod/medicalStringtableFix
...
Fixes : #1646
2015-06-18 08:34:42 +02:00
Glowbal
160d659523
Merge pull request #1656 from acemod/wireCutterCwire
...
Add concertinawire to wirecutters
2015-06-18 08:34:02 +02:00
ViperMaul
7207aef5c2
Update proper file size for 3.1.1.zip
2015-06-17 19:24:44 -07:00
ViperMaul
85c40a4cf2
Merge pull request #1668 from acemod/release
...
Release v3.1.1 merge into Master
2015-06-17 19:15:35 -07:00
Macusercom
500504d93b
Further improvements as suggested for German translation
2015-06-18 00:43:23 +02:00
jonpas
083d34b62b
Removed redundant GVAR
2015-06-18 00:21:56 +02:00
jonpas
b708c5dd4e
Fixed zipping the zip, improved zip name definition
2015-06-17 22:05:16 +02:00
jonpas
d210c3b009
Fixed make.py release zip archive
2015-06-17 21:21:35 +02:00
jonpas
59a3e1a451
Automated version change in make.py
2015-06-17 20:42:11 +02:00
ViperMaul
bab33bfbe2
Bump the build number from 0 to 1
2015-06-17 08:15:19 -07:00
ViperMaul
6ee0672ba2
Update mod.cpp and readme to version 3.1.1
...
#1651
2015-06-17 07:52:30 -07:00
Grzegorz
1de569656d
Fix checking vitals anim
...
It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are:
* Checking pulse
* Checking BP
* Checking response
2015-06-17 14:58:35 +02:00
ViperMaul
e5a5832cac
Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release
2015-06-16 22:43:46 -07:00
ViperMaul
47ef53201a
Set version number to 3.1.1
2015-06-16 22:41:04 -07:00
Glowbal
a8998690ea
Merge pull request #1650 from acemod/tacticalladderFixes
...
Fixed model.cfg and requiredAddons
2015-06-17 07:36:01 +02:00
Glowbal
d87ce29847
Merge pull request #1640 from acemod/fix-ab-extension
...
New build of the AB extension
2015-06-17 07:19:12 +02:00
PabstMirror
ccb30e0a47
use master pfh for frag
2015-06-16 22:39:37 -05:00
Macusercom
ed4fbb5d33
More corrections
2015-06-16 23:19:47 +02:00
Macusercom
cf2f36a775
Corrections suggested by others
2015-06-16 23:17:34 +02:00
