PabstMirror
683f45682a
Fix Eotvos effect
2015-12-20 02:16:29 -06:00
PabstMirror
4d041c3c94
Merge pull request #3049 from acemod/fixlaserdesignator
...
Remove undefined laser selfdesignate macro
2015-12-18 12:09:04 -06:00
commy2
e3ecc64771
remove undefined macro
2015-12-18 13:53:25 +01:00
PabstMirror
d8d3c146d3
Merge pull request #3041 from acemod/fixThreeDenCam
...
Optics - Don't modify camera for ThreeDen Editor
2015-12-17 16:28:36 -06:00
PabstMirror
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
PabstMirror
43a9865fa2
Use isNil for better future compatiblity
2015-12-16 12:10:53 -06:00
PabstMirror
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
PabstMirror
9833a543b0
Merge pull request #3039 from acemod/fixInteractionDoor
...
Building Interact - Dummy object instead of hiding
2015-12-15 13:05:25 -06:00
PabstMirror
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
PabstMirror
7258a0084a
Merge pull request #2995 from acemod/repairThreshholdToolkit
...
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784
Toolkit also consumed on fullRepair
2015-12-14 19:28:31 -06:00
PabstMirror
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
PabstMirror
0b5b11c966
Merge pull request #3014 from acemod/fixNameSanatize
...
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
PabstMirror
e5abb59f1d
Merge pull request #3011 from acemod/rhsMergeERA
...
RHS Compat - Combine all ERA Hitpoints
2015-12-14 19:22:51 -06:00
PabstMirror
aa668a44e4
Merge pull request #3027 from acemod/fixServerLog
...
Send string to serverLog instead of strucText
2015-12-14 19:22:20 -06:00
PabstMirror
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
PabstMirror
a501c7e1c3
Remove new models and just combine existing litter
2015-12-11 19:47:40 -06:00
PabstMirror
24d77d1b7c
Fix Typo
2015-12-11 12:17:05 -06:00
PabstMirror
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
PabstMirror
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
PabstMirror
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
PabstMirror
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
bux
8e6a057f52
fix common stringtable
2015-12-10 18:48:00 +01:00
PabstMirror
f3b7b3b94f
Merge pull request #2994 from acemod/microDagrListBoxKeyblock
...
MicroDagr - Prevent Home Key being blocked
2015-12-10 09:20:06 -06:00
PabstMirror
a71cce1981
Merge pull request #2987 from acemod/gesturesCleanup
...
Setting For Gestures - Fix BI* gestures
2015-12-10 09:19:35 -06:00
commy2
f0642950e3
Merge pull request #3005 from acemod/cleanupFCS2
...
code cleanup fcs
2015-12-10 16:05:21 +01:00
commy2
077b9827e8
code cleanup fcs
2015-12-10 16:00:14 +01:00
commy2
48e9a257f7
Merge pull request #3004 from acemod/markerscleanup2
...
code cleanup markers
2015-12-10 15:36:04 +01:00
commy2
7748131e73
code cleanup markers
2015-12-10 15:32:31 +01:00
commy2
f64f4f4c4b
Merge pull request #3003 from acemod/tweaklasersize
...
tweak size of laserpointer - release
2015-12-10 15:27:45 +01:00
commy2
a08cf69149
tweak size of laserpointer, fix #2975
2015-12-09 22:56:14 +01:00
PabstMirror
3ae7cd15bd
cleanup stringtable phrasing
2015-12-09 12:27:47 -06:00
PabstMirror
3d560108a3
Setting For Gestures - Fix BI* gestures
2015-12-08 23:08:09 -06:00
PabstMirror
0eed4799af
MicroDagr - Prevent Home Key being blocked
...
Fix #2974
2015-12-08 21:31:03 -06:00
PabstMirror
e964b2c135
Fix PostRepairDamage and toolkit consumtion setting
...
Fix #2982
2015-12-08 20:31:40 -06:00
Glowbal
0599b35fc6
Bump version to 3.4.1
2015-12-08 14:47:48 +01:00
PabstMirror
dec74a9d2d
Merge pull request #2964 from acemod/fixUnload
...
Fix refuel unconc error - Man unloading for air
2015-12-07 19:08:25 -06:00
PabstMirror
38bf869f07
Also Fix Rearm
2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5
Change disable NVG with sights by default
...
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794
Merge pull request #2941 from acemod/DieStringtables
...
Update German Stringtables
2015-12-07 10:27:11 +01:00
bux578
821ccf5726
fix medical menu stringtable name
2015-12-07 10:21:48 +01:00
bux578
af31d43567
fix german typos
2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
commy2
5237ed15dd
Merge pull request #2955 from acemod/configcleanup
...
Vehicles config cleanup, fix #2897
2015-12-06 11:26:15 +01:00
commy2
9fa62c6d2a
clean up vehicles config
2015-12-06 11:18:07 +01:00
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8
Merge pull request #2939 from acemod/fixMicroDagrDefines
...
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00
Thomas Kooi
8e88740730
Merge pull request #2924 from acemod/woundReopeningArray
...
Don't update openWounds if not bandaged
2015-12-05 11:28:56 +01:00
