9b0641c06f
Add nil return for count
2015-12-19 21:17:36 -06:00
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
4d041c3c94
Merge pull request #3049 from acemod/fixlaserdesignator
...
Remove undefined laser selfdesignate macro
2015-12-18 12:09:04 -06:00
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
c53a0541a4
Add support for non local Zeus RC in common-isPlayer
2015-12-18 11:08:10 -06:00
db7074b6cf
Removed duplicated German entry
2015-12-18 14:45:20 -02:00
ef12439ca8
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:30:58 -02:00
40b717fd94
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:02:02 -02:00
d36988852d
Oops bollocks
2015-12-18 16:31:01 +01:00
fce245ad76
Remove SMAW Spotting Rifle backblast
2015-12-18 16:23:07 +01:00
e3ecc64771
remove undefined macro
2015-12-18 13:53:25 +01:00
e033c56cfc
RHS weapons and Frag update
...
The RHS M249 and M240 now have the overheating and change barrel, plus
the M4 and M16 branch should have overheating applied to them. The ammo
class should have all of the hand grenade fixes in there.
2015-12-17 17:04:30 -06:00
d8d3c146d3
Merge pull request #3041 from acemod/fixThreeDenCam
...
Optics - Don't modify camera for ThreeDen Editor
2015-12-17 16:28:36 -06:00
27d683f8e2
RHS Compat - Add reqAddons, Fix M113
...
Adds requiredAddons for used units
Fixes class rhsusf_m113tank_base
2015-12-17 16:27:04 -06:00
43a9865fa2
Use isNil for better future compatiblity
2015-12-16 12:10:53 -06:00
360bdcb50e
Optics - Don't modify camera for ThreeDen Editor
...
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
2015-12-16 11:28:43 -06:00
90387eaf5b
Merge pull request #3023 from acemod/disablestaminabar
...
add function to retrieve the control of the stamina bar
2015-12-16 10:39:26 +01:00
2caabcd00a
Correcting an issue in RHS AFRF Compat with Sprut turret
2015-12-15 18:59:27 -06:00
d7fbd65687
Disabling ACE FCS in RHS USF Compat for M113 family
2015-12-15 18:58:57 -06:00
9833a543b0
Merge pull request #3039 from acemod/fixInteractionDoor
...
Building Interact - Dummy object instead of hiding
2015-12-15 13:05:25 -06:00
ff3ddbe287
Building Interact - Dummy object instead of hiding
...
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
2015-12-15 12:04:03 -06:00
7258a0084a
Merge pull request #2995 from acemod/repairThreshholdToolkit
...
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
f2bcd66784
Toolkit also consumed on fullRepair
2015-12-14 19:28:31 -06:00
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
0b5b11c966
Merge pull request #3014 from acemod/fixNameSanatize
...
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
e5abb59f1d
Merge pull request #3011 from acemod/rhsMergeERA
...
RHS Compat - Combine all ERA Hitpoints
2015-12-14 19:22:51 -06:00
aa668a44e4
Merge pull request #3027 from acemod/fixServerLog
...
Send string to serverLog instead of strucText
2015-12-14 19:22:20 -06:00
c911fcdafc
Fix travis configuration
...
Travis yml was using invalid notification configuration for slack.
2015-12-14 14:08:50 +01:00
e6be1537cd
replace more private with private keyword in common
2015-12-14 13:17:48 +01:00
bfa29246be
replace private with private keyword in other half of common
2015-12-14 13:08:19 +01:00
ef1d7f4fdb
Change Travis notifications on success disabled
...
We only need to know if a build failed, since that is when action needs to be taken
2015-12-14 12:42:37 +01:00
dbdf434c1e
Reset make.py Cache on new build version
...
Close #1127
If the version (from main) changes, reset cache
Same effect as "force"
2015-12-13 15:43:12 -06:00
9064579a65
Send string to serverLog instead of strucText
...
Fix `Performance warning: SimpleSerialization::Read
'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized
by simple serialization, falling back to generic serialization, use
generic type or ask for optimizations for these types`
2015-12-13 13:27:46 -06:00
c689cbfdfe
Add release branch to travis
2015-12-13 15:41:37 +01:00
f485ae41b1
Add travis notification for private slack
2015-12-13 15:39:33 +01:00
d159c2738c
Fix travis notifications
2015-12-13 14:56:04 +01:00
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
2839cff753
common code fixes
2015-12-12 17:26:47 +01:00
3d5ea74c7e
replace private with private keyword in first half of common
2015-12-12 16:48:54 +01:00
a501c7e1c3
Remove new models and just combine existing litter
2015-12-11 19:47:40 -06:00
24d77d1b7c
Fix Typo
2015-12-11 12:17:05 -06:00
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
ff95aab100
remove helmets from items filter
2015-12-11 15:05:43 +01:00
ee7f8f82f5
remove debug
2015-12-11 14:24:54 +01:00
5d9a057165
add more filters to ammo boxes
2015-12-11 14:18:11 +01:00
2b63b2efa8
add more filters to ammo boxes
2015-12-11 13:14:58 +01:00
c7b6375092
Sanitize less/greater-than symbol to square
...
Fix #2912
The raw `<` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
2015-12-10 23:29:05 -06:00
e9be05209a
Fix litter for adv - Add bloody p3d for Pack/qClot
...
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
ee0812ad15
RHS Compat - Combine all ERA Hitpoints
...
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
2015-12-10 20:57:23 -06:00
