581f71f8a1
Merge pull request #2141 from GitHawk/refuel
...
Adding vehicle refueling
2015-11-26 16:16:13 +01:00
bba0e999ff
Merge pull request #2164 from GitHawk/rearm
...
Adding vehicle rearming
2015-11-26 16:15:09 +01:00
60684c584a
Merge pull request #2382 from TheMagnetar/master
...
Removed pedantic errors and redefinition of M_PI variable
2015-11-26 16:14:09 +01:00
81ab280cb4
Merge pull request #2670 from acemod/simplifyFragConfig
...
Simplify frag config
2015-11-26 16:13:21 +01:00
15267c0433
Merge pull request #2219 from acemod/handSignals
...
Hand signals enhancement
2015-11-26 16:04:41 +01:00
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
185cae2fe5
Remove Old Gestures from interaction
2015-11-25 11:00:45 -06:00
095252ef76
Cleanup
...
revert `format ["'%1'", QGVAR()];` as it crashes the game
2015-11-25 10:16:37 -06:00
c731d83642
Merge pull request #2848 from acemod/fixForEachDeleteAt
...
fix Issue with forEach Loops and deleteAt Index
2015-11-25 14:00:37 +00:00
08c5374a99
Merge pull request #2390 from BaerMitUmlaut/pass-magazine
...
Added interaction to quickly pass a magazine
2015-11-25 14:04:07 +01:00
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
20bf90f3e9
Medical - Fix Hitpoints Macro when building
2015-11-24 16:30:09 -06:00
575fabb69d
#2872-Map time support for subclasses of ItemWatch
2015-11-24 16:17:06 -06:00
fd1c38c612
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
2015-11-24 22:44:32 +01:00
352db4cb66
remove some crap code
...
replace some variables with macros
2015-11-24 22:43:42 +01:00
cfefb1c40e
Cleanup spotting scope configs
2015-11-24 15:24:14 -06:00
2c6cfcf294
Merge pull request #2832 from p1nga/Spotting-Scope-Update
...
Updated spotting scope model.
2015-11-24 15:23:12 -06:00
9ecffcd133
Merge pull request #2746 from acemod/fixFlashlightPrivates
...
fix privates in Map module
2015-11-24 15:18:38 -06:00
f9266764fb
Moved module to ACE_Logistics
2015-11-24 21:33:38 +01:00
1a6730340c
Move module to ACE_Logistics category, removed single interact point
2015-11-24 21:30:08 +01:00
2c76bc3b10
Merge pull request #2605 from TheNiner/master
...
Fixed Laser Update Position Bug
2015-11-24 13:43:53 -06:00
818466d296
Added ACE setting to hide interaction
2015-11-24 19:07:17 +01:00
51a463de24
Fix tap shoulder msg display
...
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
2015-11-24 11:25:56 -06:00
8fc52a4dfb
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-11-24 17:57:21 +01:00
86f7ee2ad2
Merge pull request #2834 from acemod/addEarPlugsLoudness
...
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
2015-11-24 10:52:11 -06:00
d4c708e731
Missing ;
2015-11-24 17:33:33 +01:00
ddc8b16db2
Merge pull request #2857 from acemod/invResize154
...
Inventory Resize UI - changes for 154 GL-Mags
2015-11-24 10:24:06 -06:00
4ae209ab44
Merge pull request #2865 from acemod/154UBC
...
Fix UBC for 1.54
2015-11-24 10:23:48 -06:00
773b30df33
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
2015-11-24 15:14:30 +01:00
7981faad64
private -> local
2015-11-23 17:47:58 -06:00
0273dd1d4d
Merge branch 'master' into fixFlashlightPrivates
2015-11-23 17:45:41 -06:00
1d315bee6f
cleanup laserpointer
2015-11-23 20:52:04 +01:00
fd2fd3241e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-11-23 19:37:10 +01:00
cbe8d98f86
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-11-23 19:29:05 +01:00
931c6830fc
Added reset
...
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
2015-11-23 19:28:51 +01:00
763df43fbc
Added possibility to disallow rearm
...
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
2015-11-23 17:08:06 +01:00
3be60a2f6e
Merge pull request #2842 from acemod/fcsUpdateDisplay
...
Update FCS display after distance adjust
2015-11-23 16:34:09 +01:00
d2538c6ff2
Add spectator text chat
...
Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.
2015-11-22 20:03:10 +00:00
113ac0f370
Minor improvements
...
fnc_reset is still WIP
2015-11-21 23:24:24 +01:00
f07f06c843
Merge pull request #2760 from acemod/spectatorUpdates
...
Spectator updates
2015-11-21 15:00:44 +00:00
c2564de5ef
Fix UBC for 1.54
...
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
ab769757d9
Skip Depends Hitpoints - Use HitPoints selPos for wheels
...
Stuff
Normalize Depends - Skip Glass Repair
Fix spawned wheel/track not having correct damage
getHitpointString robustness, hatchback fuelHitpoint, fix count errors
-
Formatting
local -> private
Fix Stuff
2015-11-20 21:11:50 -06:00
839c022b84
Fix broken repair point selection code
...
Only valid hit selection + hit point combinations are usable for repair points:
- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
2015-11-20 21:11:23 -06:00
4e93b9c72d
2307 - Repair sub-turrets
...
Privates
Cleanup debug
Add repair actions for sub turrets
Cleanup
Fix Header
Error Handling
Cleanup setHitpointDamage
Fix common ACE_isEngineer to handle scalar or bool
Claim and release repair objects (wheel/track)
Repair sub-turrets
2015-11-20 21:11:05 -06:00
d0cb09196d
Merge branch 'master' of github.com:acemod/ACE3
2015-11-20 23:29:33 +01:00
67345b0178
Fix incorrect variable
...
_items was the old variable name.
2015-11-20 23:28:52 +01:00
979ff8b479
Local -> private
2015-11-20 16:13:20 -06:00
