jaynus
e6270f6e39
Fixed: Font config breaking checkPBO
2015-05-20 10:42:24 -07:00
KoffeinFlummi
f16f282abd
Merge remote-tracking branch 'origin/release' into master-fix
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
extensions/common/p3d/animation.cpp
extensions/common/p3d/compressed.cpp
extensions/common/p3d/compressed.hpp
extensions/common/pbo/archive.cpp
extensions/common/pbo/search.cpp
extensions/common/pbo/search.hpp
extensions/common/shared.hpp
extensions/common/simplepipe_win32.cpp
extensions/common/simplepipe_win32.hpp
extensions/common/simulation/object.cpp
extensions/common/simulation/object.hpp
extensions/common/targetver.h
extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
64a401ee8c
#1241 closed - Add Editor placeable item
2015-05-20 17:17:10 +02:00
PabstMirror
0d00894d9f
#1318 - isInMedicalVehicle - medicClass is number
2015-05-20 17:17:09 +02:00
Garth L-H de Wet
8edeb45d6d
Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive.
2015-05-20 17:17:09 +02:00
esteldunedain
23117db401
- Default viewDistance to video settings - Add 500m and 100m as optional view distances
2015-05-20 17:17:08 +02:00
Grzegorz
96322fe689
PL translation for new advanced ballistics option
2015-05-20 17:17:08 +02:00
esteldunedain
22b83826f0
Bandaid for #1281 , until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)
2015-05-20 17:15:25 +02:00
Glowbal
694a24c970
Only change the color if bleeding (adv)
2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c
Changed: morphine works 15 minutes
2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f
Made atropine less effective
2015-05-20 17:15:23 +02:00
Glowbal
82260e5090
Changed: Made Morphine suppress more pain
2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24
Added pain suppression instead of removal
2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1
fixed missing parameters for non local unit
2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d
Added force unconscious parameter #1205
2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a
Adjusted item mass #1226
2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589
fixes #1155
2015-05-20 17:15:19 +02:00
jaynus
d57b93c1a4
woops. tabs. path.
2015-05-20 17:15:19 +02:00
jaynus
5b5ea907d2
Custom fonts for ACE.
2015-05-20 17:15:18 +02:00
Grzegorz
911c7693b2
Update medical guide
...
Fix errors, some additions.
2015-05-20 13:18:35 +02:00
Glowbal
d6cc1d4b76
Proposed fix for #1158
...
Sent directly to extension instead of splitting it
2015-05-20 10:26:32 +02:00
ulteq
3a3b2bc1dc
Merge pull request #1317 from BullHorn7/proofread
...
Proofread docs: AB to Explosives
2015-05-20 10:23:18 +02:00
ulteq
10df66f218
Merge pull request #1312 from acemod/scopeIncrement
...
Elevation and windage can now have different adjustment increments:
2015-05-20 10:20:22 +02:00
ulteq
0d3d4a9bdd
Merge pull request #1315 from acemod/abModuleOptionReordering
...
AB module option reordering
2015-05-20 10:19:42 +02:00
ulteq
c81446400c
Grammar
2015-05-20 10:14:10 +02:00
PabstMirror
df722c7c7d
#1318 - isInMedicalVehicle - medicClass is number
2015-05-19 18:34:48 -05:00
PabstMirror
ebeba23834
Nametag Size Option, selectionPosition for tag pos
2015-05-19 16:57:47 -05:00
PabstMirror
6dc81796b5
ambientBrightness effects tag distance
2015-05-19 16:18:10 -05:00
BullHorn
4eeb5a0e6c
Docs: fix capital letters
...
Remove capital letters of first words inside parentheses
fix difficulties.md grammar
2015-05-19 23:56:35 +03:00
BullHorn
37ad56bfa8
Docs: fix typos
...
Fix a couple more typos
2015-05-19 23:29:33 +03:00
Glowbal
527f89fc32
Merge pull request #1303 from acemod/fixBasicMedPFHSpam
...
fix for #1297
2015-05-19 22:23:37 +02:00
BullHorn
0b793ccf99
Docs: proofread continues
...
Perform proofread on all \documentation\feature\ starting from AB till
Explosives.
All mentioned docs are uniform/standardized.
Improve grammar, typos, etc.
2015-05-19 23:15:26 +03:00
Nicolás Badano
4d3521cff4
Merge pull request #1314 from acemod/Explosives_PlacementAnimation
...
Changed the animation from medic to put when placing an explosive.
2015-05-19 16:07:58 -03:00
BullHorn
1a833101e2
Docs - continue proofreading
2015-05-19 21:54:51 +03:00
ulteq
28c8aba9bd
Added missing !
2015-05-19 20:46:55 +02:00
ulteq
57c37ecb9a
Reorder/Rewrite of some advanced ballistics module options:
...
* alwaysSimulateForSnipers -> simulateForSnipers
* alwaysSimulateForGroupMembers -> simulateForGroupMembers
* onlyActiveForLocalPlayers -> simulateForEveryone
2015-05-19 20:46:13 +02:00
BullHorn
2c8906ece8
Docs: proofreading 1st iteration continued
...
Continue improving standardization, typos, grammar
Update modules.md Advanced Ballistics according to new module settings
2015-05-19 21:40:00 +03:00
Garth L-H de Wet
02c85eae07
Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive.
2015-05-19 20:29:23 +02:00
ulteq
bd3b84901f
Merge pull request #1309 from gienkov/patch-17
...
PL translation for new advanced ballistics option
2015-05-19 20:23:34 +02:00
ulteq
458daad5bb
Elevation and windage can now have different adjustment increments:
...
* ACE_ScopeAdjust_VerticalIncrement
* ACE_ScopeAdjust_HorizontalIncrement
2015-05-19 20:13:31 +02:00
Nicolás Badano
0e7e4e112c
Merge pull request #1311 from acemod/viewDistanceFix
...
Fix for the viewDistance module
2015-05-19 15:03:37 -03:00
ulteq
ac04ee1a43
Merge pull request #1310 from acemod/scopeCompat
...
"Scope Mod A3" compat pbo
2015-05-19 19:49:41 +02:00
esteldunedain
e022499068
- Default viewDistance to video settings
...
- Add 500m and 100m as optional view distances
2015-05-19 14:48:29 -03:00
ulteq
b518313ad6
Added compat pbo for IanSkys "Scope Mod A3"
2015-05-19 19:47:04 +02:00
ulteq
eaeb84f7c9
Added RH_shortdot config draft
2015-05-19 19:46:12 +02:00
Grzegorz
e3aabe2c42
PL translation for new advanced ballistics option
2015-05-19 18:52:17 +02:00
jaynus
c4393862aa
Merge pull request #1293 from acemod/nametagFireteamColors
...
Add assignedTeam color propagation to nametags from the leader
2015-05-19 09:19:48 -07:00
jaynus
6eec702263
Added isNull check wrapper to nametag color propagation.
2015-05-19 09:19:03 -07:00
ulteq
06e1435a56
Reverted the renaming: balltracers -> tracers
2015-05-19 17:25:27 +02:00
