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
667 Commits 73 Branches 88 Tags 752 MiB
28dbd857c2
Commit Graph

588 Commits

Author SHA1 Message Date
KoffeinFlummi
28dbd857c2 Fix generic error 2015-02-10 23:14:11 +01:00
KoffeinFlummi
faa7e1fb63 Merge alive and Zeus conditions 2015-02-10 23:13:52 +01:00
KoffeinFlummi
4ec19429ae Fix initial value of bloodVolume 2015-02-10 23:13:14 +01:00
KoffeinFlummi
fe0eac7896 First port of AGM's visual loop. 2015-02-10 18:17:26 +01:00
KoffeinFlummi
fba44f490d First draft of death prevention 2015-02-10 13:33:40 +01:00
Glowbal
a609d00730 Implemented a setDead function. Allows for interception of all kills and using a revive script instead. 
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
 2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f Added possibility to add unconscious conditions. 2015-02-08 13:06:44 +01:00
Glowbal
633037c1b4 Replaced injuredCollection array for separate PFH for each unit. 2015-02-08 11:34:20 +01:00
Glowbal
3be442c31a Added initial draft of new player effects handling. 2015-02-08 11:24:36 +01:00
Glowbal
0a161319d2 Added initial draft of setUnconscious 2015-02-08 10:25:03 +01:00
Glowbal
bf762bbdf1 Updated headers to correct format 
Reorganized function names.
Added unit vitals loop
 2015-02-08 10:01:32 +01:00
Glowbal
35de875382 Added cardiac arrest 2015-02-08 00:08:36 +01:00
Glowbal
b8be7775bd Updated open wounds injuries to newest CMS version. 2015-02-08 00:07:49 +01:00
Glowbal
aadb289962 Added initial rewrite of CMS vitals script for medium and advanced medical. 2015-02-07 23:55:48 +01:00
Glowbal
26527489d6 Added initial medium wounds. 
Fixed merge conflict.
 2015-02-07 23:48:24 +01:00
KoffeinFlummi
35386f19d6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d First draft of basic damage handling. 2015-02-06 13:47:17 +01:00
Glowbal
596d018f45 Added function PREPs. 2015-02-03 21:48:53 +01:00
Glowbal
0a403ff422 Added initial advanced medical handleDamage functionality. 2015-02-03 21:48:08 +01:00
Glowbal
a50276ddaf Added a getTypeOfDamage function. 2015-02-03 21:47:45 +01:00
KoffeinFlummi
79aa8d1c7a Use macros, remove var assignments 2015-02-03 20:14:34 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +01:00
KoffeinFlummi
bb48d1234c Merge remote-tracking branch 'origin/interact_menu' 2015-01-28 22:17:27 +01:00
Nou
5dfa4304d3 Tweaks 2015-01-28 12:03:30 -08:00
Nou
26f353b94d Merge branch 'master' into interact_menu 2015-01-28 10:19:58 -08:00
Nou
984fee03ac Merge branch 'interact_menu' of https://github.com/KoffeinFlummi/ACE3 into interact_menu 2015-01-28 10:19:30 -08:00
Nou
8e9883a111 Make sure object actions are set. 2015-01-28 10:18:19 -08:00
PabstMirror
3b3944b56c ProgressBar - Check canInteract (w/ exceptions) 2015-01-27 20:51:12 -06:00
PabstMirror
c14514a3f9 VehLock - canInteract check 2015-01-27 20:11:06 -06:00
PabstMirror
5bfaf7da7d VehLock - new progessBar 2015-01-27 19:49:21 -06:00
PabstMirror
c0e76dd3c7 Merge pull request #91 from KoffeinFlummi/agmVehicleLock 
Port: Vehicle Lock
 2015-01-27 19:30:46 -06:00
PabstMirror
bf791e32c4 Merge pull request #93 from KoffeinFlummi/progresBarNew 
#87 - New Progress Bar
 2015-01-27 19:28:51 -06:00
Nicolás Badano
d42be7b5f8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-27 19:26:32 -03:00
Nicolás Badano
7a08bd3722 common: fixed fnc_addLineToDebugDraw 2015-01-27 19:26:09 -03:00
Nicolás Badano
8bc92482f3 common: function for drawing debug lines 2015-01-27 19:26:06 -03:00
Nicolás Badano
60fa6dfbe6 gforces: fixed prefix for config entries 2015-01-27 19:25:37 -03:00
Thomas Kooi
f52417cc3b Added readme file 2015-01-27 17:10:16 +01:00
Glowbal
c57cf88965 Merge pull request #85 from KoffeinFlummi/cse_medical_port 
PORT: CSE Medical
 2015-01-27 17:06:22 +01:00
bux578
f0c06beb23 fix #95 & add ADDON = bool 2015-01-27 09:01:57 +01:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Felix Wiegand
0f027e7e09 Create README.md 2015-01-26 13:56:37 +01:00
Felix Wiegand
7c1703ae11 Create README.md 2015-01-26 13:46:21 +01:00
Felix Wiegand
59563a934c Create README.md 2015-01-26 13:45:24 +01:00
Felix Wiegand
91bdd36268 Create README.md 2015-01-26 13:44:05 +01:00
Felix Wiegand
bf452b2c24 Create README.md 2015-01-26 13:42:07 +01:00
Felix Wiegand
6037f8e05b Create README.md 2015-01-26 13:40:31 +01:00
Felix Wiegand
3ed88ca17a Create README.md 2015-01-26 13:37:41 +01:00
Felix Wiegand
8d24c9fdbd Create README.md 2015-01-26 13:35:31 +01:00
KoffeinFlummi
3e00ebd12b Add README for ballistics 2015-01-26 07:36:45 +01:00
PabstMirror
5e932f8c71 Replace calls to progressBar 
Mag repack
Defuse
Swap Barrel
 2015-01-26 00:24:33 -06:00