Commit Graph

5774 Commits

Author SHA1 Message Date
SilentSpike
27a4ecd747 Expanded readme 2015-06-22 00:43:39 +01:00
SilentSpike
378b39db77 Merge remote-tracking branch 'upstream/master' 2015-06-22 00:37:28 +01:00
SilentSpike
93f6c48acf Moved myself 2015-06-22 00:33:18 +01:00
SilentSpike
398f1c768f Fix the module on dedicated servers 2015-06-22 00:17:29 +01:00
SilentSpike
e3e415c727 Added readme 2015-06-21 23:46:23 +01:00
jonpas
91dc9f5f18 Added version argument to run version update, default will stash and restore changes to keep git work dir clean 2015-06-21 21:58:19 +02:00
jonpas
2e50261bd3 Exit entire map Client XEH on Headless 2015-06-21 21:10:50 +02:00
jonpas
a7d9489555 Fixed map module init, Prevented BFT execution on Headless, Changed BFT Enabled string 2015-06-21 21:08:37 +02:00
PabstMirror
ce2a617c7b #1709 - Remove ACE_Comanche_Test from zeus 2015-06-21 13:00:51 -05:00
PabstMirror
f0adf256a8 #573 - mdagr use ambientBrightness 2015-06-21 12:25:16 -05:00
jonpas
4f35e10afa Changed BFT_Enabled to module option for proper ACE_Settings handling 2015-06-21 04:46:55 +02:00
jonpas
10602f10c6 Fixed BFT ACE_Settings, Fixed Map Module Initialized diag_log 2015-06-21 04:19:12 +02:00
PabstMirror
2c64abb816 #1704 - Add missing AnimationSources 2015-06-20 20:17:27 -05:00
Glowbal
e153e47bb2 Disabled litter on treatment failure. #1403
We give back the items, so litter does not make sense at the moment.

In the future we need to expand this with conditions for success/failure.
2015-06-20 12:54:00 +02:00
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
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
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
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
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
ViperMaul
e5a5832cac Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release 2015-06-16 22:43:46 -07:00