Thomas Kooi
aa1c48e8e7
Merge pull request #3094 from acemod/fixTriageMacro
...
Fix Medical Triagecard Macro
2015-12-31 12:17:59 +01:00
Garth "L-H" de Wet
5f7bbd823f
Merge pull request #3085 from acemod/tripwireEnhancement
...
Explosive enhancements
2015-12-31 11:37:43 +02:00
bux
23bec6d9a8
Merge master into branch
2015-12-31 10:20:47 +01:00
PabstMirror
2e211c5a04
Fix Medical Triagecard Macro
...
Fix #3087
2015-12-31 01:46:24 -06:00
PabstMirror
f11c2af921
Update XEH_clientInit.sqf
2015-12-30 14:55:25 -06:00
PabstMirror
e367b0f0ef
Merge pull request #3057 from acemod/miscMedicalFixes
...
Fix medical menu not closing on range, litter dir
2015-12-30 13:52:54 -06:00
PabstMirror
d372111d3f
Sitting Cleanup
...
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
2015-12-30 12:23:35 -06:00
Thomas Kooi
b0b0cc2a39
Merge pull request #3086 from acemod/removeObsoleteHotkey
...
Remove obsolete hotkey entries
2015-12-30 15:43:40 +01:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
bux
d6c5643790
improve code style
2015-12-30 09:43:19 +01:00
bux
2a6042bf61
add interaction position and defuse object position
...
and reduce interaction distance
2015-12-30 09:11:57 +01:00
PabstMirror
72fe95c797
Add "isNotInZeus" to canInteractWith
...
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f
Remove Keybinds/Events for Zeus now handeld in CBA
...
Close #2937
2015-12-30 01:07:55 -06:00
bux
112c002b0b
remove ace_offset entry
...
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
Thomas Kooi
6a21b7da1e
Merge pull request #3083 from acemod/remCupCompat
...
CUP compat no longer needed: CUP makes their own
2015-12-29 12:15:07 +01:00
PabstMirror
44568ec94e
CUP compat no longer needed: CUP makes their own
...
ref
https://forums.bistudio.com/topic/179326-community-upgrade-project-cup/
2015-12-28 21:27:47 -06:00
PabstMirror
462e37e6d1
Update Heating / Cooling physics numbers
...
Attempting to update numbers based on real physics.
Effects will increase heat generated per shot and decrease cooling
- ~1.333x increased heating
- ~1.45x less cooling
2015-12-28 21:01:56 -06:00
PabstMirror
415402b5ad
Cleanup and debug
...
Fix missing weapon configs
Fix Dispersion (Radians / Degrees)
Fix comment
2015-12-28 16:08:32 -06:00
PabstMirror
42b350a40c
Cache Weapon Configs
2015-12-28 16:04:56 -06:00
PabstMirror
e587a6e6e3
Modernize code
2015-12-28 16:04:56 -06:00
PabstMirror
3020023f58
setVariablePublic - Use waitAndExecute
2015-12-28 16:04:55 -06:00
esteldunedain
c1e8b3dba9
Fix temperature bar color
2015-12-28 16:04:55 -06:00
esteldunedain
f132955d9f
Reenable refraction fx but make it optional for the moment.
2015-12-28 16:04:55 -06:00
esteldunedain
d001131314
Tweak and optimize the smoke effect to increase smoke and reduce performance impact
2015-12-28 16:04:54 -06:00
esteldunedain
3c74c4bada
Fix temperature indicator to max out red at half the bar
2015-12-28 16:04:54 -06:00
ulteq
4122d68684
Adjusted temperature display (red above 600°C)
2015-12-28 16:04:54 -06:00
ulteq
a1ee99cc8a
Remove debug code
2015-12-28 16:04:53 -06:00
ulteq
7858b65fde
Fixed misspelled function name
2015-12-28 16:04:53 -06:00
ulteq
0a27c309cb
Added missing variable definitions
2015-12-28 16:04:52 -06:00
commy2
f83206353d
jamming
2015-12-28 16:04:52 -06:00
Nicolás Badano
4264789631
Refactored code so the weapon temperature is correctly updated when checking it
2015-12-28 16:04:52 -06:00
Nicolás Badano
ac67e45098
overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion
2015-12-28 16:04:51 -06:00
Nicolás Badano
932e17cea4
fix
2015-12-28 16:04:51 -06:00
Nicolás Badano
fb56350217
small fixes
2015-12-28 16:04:51 -06:00
Nicolás Badano
de902ca4fd
Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.
2015-12-28 16:04:50 -06:00
PabstMirror
dc60860421
Fix Third Person Goggle Effect Not Displaying
...
#3074
2015-12-26 23:31:49 -06:00
SilentSpike
d36543d3a9
Merge pull request #3069 from GitHawk/rearm
...
Fix scope of rearm dummy objects
2015-12-22 18:42:52 +00:00
Githawk
2432ac3319
Changed scope for carried objects
2015-12-22 17:54:16 +01:00
Githawk
499301e73e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-12-22 17:53:15 +01:00
Githawk
d16417a00b
Changed scope on nozzle
2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1
More fixes to make jerryCan work
2015-12-21 17:54:52 +01:00
Thomas Kooi
792da96a5f
Merge pull request #3065 from acemod/tabs-are-our-enemy
...
Tabs are our enemy
2015-12-21 17:08:30 +01:00
Glowbal
e828076377
Add error on tab in sqf files to sqf validator
2015-12-21 17:06:04 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
Githawk
d9e7a43bf7
Fixes error with new interact_menu
2015-12-21 16:53:25 +01:00
Githawk
a8b306b201
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-12-21 16:01:42 +01:00
jokoho48
0addb592d3
remove Unused Varaible in AB
...
fix private in AB
2015-12-21 02:29:10 +01:00
Ken
543f13c754
More Fixes
2015-12-20 14:37:14 -06:00
PabstMirror
bba908fcae
Better fix for M_PI definition
...
Just use #define _USE_MATH_DEFINES for cmath
2015-12-20 13:50:13 -06:00
freghar
a383da5b2d
fix inverted isTurnedOut for map lighting
...
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).
Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
