commy2
|
1dea63067a
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics
|
2015-04-04 16:14:19 +02:00 |
|
Nicolás Badano
|
b78b93f2cd
|
Merge pull request #303 from KoffeinFlummi/strongerTextShadow
Stronger shadow for the interact_menu text
|
2015-04-04 10:25:27 -03:00 |
|
commy2
|
d496cabbbb
|
remove obsolete folder from TO_MERGE folder
|
2015-04-04 14:38:49 +02:00 |
|
commy2
|
a5b071912f
|
CfgPreloadtextures for optics
|
2015-04-04 13:15:27 +02:00 |
|
commy2
|
b7fa2bd8b3
|
disable pip scopes in arsenal
|
2015-04-04 12:06:20 +02:00 |
|
commy2
|
5fdd93587c
|
localization
|
2015-04-04 09:16:41 +02:00 |
|
commy2
|
ea275b1e52
|
2d with and without PIP
|
2015-04-04 08:51:22 +02:00 |
|
commy2
|
98d217d97e
|
handle 2d optics recoil
|
2015-04-04 06:19:19 +02:00 |
|
esteldunedain
|
06f6039dca
|
Stronger shadow for the interact_menu text
|
2015-04-04 01:04:32 -03:00 |
|
PabstMirror
|
07dfe52133
|
Remove Duplicate Mortar Code (inherit from statics)
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
|
2015-04-03 19:07:13 -05:00 |
|
esteldunedain
|
a5ff34e1d8
|
Keep cursored menus always centered. Fix #299.
|
2015-04-03 20:49:40 -03:00 |
|
PabstMirror
|
824448833f
|
Basic Test Mission
Very simple test mission with creates, debug console enabled for all.
|
2015-04-03 18:14:45 -05:00 |
|
esteldunedain
|
bd813d0d7a
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-04-03 18:22:47 -03:00 |
|
esteldunedain
|
2b4d806925
|
Reduce or eliminate backblast cause by terrain depending on relative slope. Fix #294
|
2015-04-03 18:22:04 -03:00 |
|
Glowbal
|
7b3a0ebe97
|
Merge pull request #283 from KoffeinFlummi/medicalAdvanced
Medical improvements
|
2015-04-03 23:19:15 +02:00 |
|
Glowbal
|
36288fce43
|
Updated medical action config.
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
|
2015-04-03 22:59:28 +02:00 |
|
Glowbal
|
a6ce961ca1
|
Usage of isBeingCarried and isBeingDragged
|
2015-04-03 22:45:16 +02:00 |
|
Glowbal
|
244bac8562
|
Merge branch 'master' into medicalAdvanced
|
2015-04-03 22:42:09 +02:00 |
|
Glowbal
|
05389e7e25
|
Implemented useItems for treatment (basic and adv)
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
|
2015-04-03 22:40:36 +02:00 |
|
commy2
|
9968bc132c
|
get a pip scope to work
|
2015-04-03 22:30:29 +02:00 |
|
Glowbal
|
038ed5f23e
|
Removed deprecated returnDamage parameters
|
2015-04-03 21:59:47 +02:00 |
|
Glowbal
|
1ef262c119
|
Support for enableOverdosing setting in advanced
|
2015-04-03 21:53:58 +02:00 |
|
Glowbal
|
c3ddbb4be7
|
Prevent the usage of the blood loss coefficient to increase blood volume on bleeding
|
2015-04-03 21:51:44 +02:00 |
|
Glowbal
|
ecf16ad9f1
|
fixed prevent instant death setting
|
2015-04-03 21:49:46 +02:00 |
|
PabstMirror
|
604e851423
|
Medical - isBeingCarried
|
2015-04-03 14:37:04 -05:00 |
|
Glowbal
|
d4a6dd1038
|
Removed the options to enable fractures and airway through mission module
|
2015-04-03 21:32:49 +02:00 |
|
Glowbal
|
1b02cb2e82
|
examine actions now use activity log
|
2015-04-03 21:03:39 +02:00 |
|
Glowbal
|
43efc21f27
|
Only display the activity log in the activity list.
|
2015-04-03 21:03:22 +02:00 |
|
Glowbal
|
8881de4a07
|
Removed activity log background, made wider. Added shadow to text.
|
2015-04-03 21:02:56 +02:00 |
|
Glowbal
|
8d7ac1f930
|
Added selected bodypart text
Changed "No injuries on bodypart" to still display if the generic messages have entries
|
2015-04-03 20:26:24 +02:00 |
|
PabstMirror
|
254a25b139
|
Medical - isBeingDragged func
|
2015-04-03 13:16:48 -05:00 |
|
Glowbal
|
b92978fb80
|
Now resets the proper hasMovedOut value
|
2015-04-03 20:11:20 +02:00 |
|
Glowbal
|
e68e487769
|
fixed units not moving out of unconscious animation
|
2015-04-03 20:07:39 +02:00 |
|
Glowbal
|
d5f0cf5cbd
|
Incorrect value for airwayStatus
|
2015-04-03 20:06:53 +02:00 |
|
commy2
|
025c1ef63f
|
simplify optics
|
2015-04-03 19:25:28 +02:00 |
|
Glowbal
|
14e00940cd
|
fixed incorrect airwayStatus values for initialization (adv medical)
|
2015-04-03 18:59:22 +02:00 |
|
esteldunedain
|
d1d6252299
|
Nerf the backblast damage of the Titan and NLAW, adopting standard values for soft-launch launchers from the AGM_Compatibility project
|
2015-04-03 13:50:47 -03:00 |
|
commy2
|
b0575bad21
|
improve infoDisplayChanged EH
|
2015-04-03 17:50:52 +02:00 |
|
Glowbal
|
1d7f351cb5
|
Merge pull request #288 from KoffeinFlummi/Banana
Added banana to curator item list
|
2015-04-03 12:56:37 +02:00 |
|
Glowbal
|
4478602cfb
|
Consistent use of quotes for localized text
|
2015-04-03 12:56:12 +02:00 |
|
commy2
|
6d3ddfeb5e
|
2d scripted optics
|
2015-04-03 12:33:12 +02:00 |
|
Glowbal
|
8226edc6cb
|
Fixed module function call
Wind deflection module was using the incorrect function name,
|
2015-04-03 09:43:06 +02:00 |
|
Glowbal
|
368002cc79
|
fixed undefined _selectionName variable #289
|
2015-04-03 08:48:10 +02:00 |
|
Glowbal
|
ffcc01ef74
|
Removed rouge systemChat message on unconsciousness #292
|
2015-04-03 08:45:02 +02:00 |
|
PabstMirror
|
98428c42f5
|
#291 - RemoveDeadBodiesDisconnected
|
2015-04-03 01:05:14 -05:00 |
|
PabstMirror
|
33ee7dc07c
|
iMenu - Add some localization and fix veh icons
|
2015-04-03 00:42:25 -05:00 |
|
PabstMirror
|
e99e35d70b
|
mdagr - remove unneeded error msg
|
2015-04-02 22:37:00 -05:00 |
|
PabstMirror
|
7c121e6a80
|
Missing, unused stringtable
|
2015-04-02 22:32:16 -05:00 |
|
Glowbal
|
2d0e8dea7e
|
Added banana to curator item list
|
2015-04-03 01:27:22 +02:00 |
|
jaynus
|
6864529d9c
|
Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events.
|
2015-04-02 16:20:22 -07:00 |
|