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
Thomas Kooi
c911fcdafc
Fix travis configuration
...
Travis yml was using invalid notification configuration for slack.
2015-12-14 14:08:50 +01:00
commy2
e6be1537cd
replace more private with private keyword in common
2015-12-14 13:17:48 +01:00
commy2
bfa29246be
replace private with private keyword in other half of common
2015-12-14 13:08:19 +01:00
Thomas Kooi
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
PabstMirror
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
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
Glowbal
c689cbfdfe
Add release branch to travis
2015-12-13 15:41:37 +01:00
Glowbal
f485ae41b1
Add travis notification for private slack
2015-12-13 15:39:33 +01:00
Glowbal
d159c2738c
Fix travis notifications
2015-12-13 14:56:04 +01:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
commy2
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
commy2
2839cff753
common code fixes
2015-12-12 17:26:47 +01:00
commy2
3d5ea74c7e
replace private with private keyword in first half of common
2015-12-12 16:48:54 +01: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
commy2
ff95aab100
remove helmets from items filter
2015-12-11 15:05:43 +01:00
commy2
ee7f8f82f5
remove debug
2015-12-11 14:24:54 +01:00
commy2
5d9a057165
add more filters to ammo boxes
2015-12-11 14:18:11 +01:00
commy2
2b63b2efa8
add more filters to ammo boxes
2015-12-11 13:14:58 +01: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
commy2
68388bc976
add more filters to ammo boxes
2015-12-11 01:02:15 +01:00
bux
8e6a057f52
fix common stringtable
2015-12-10 18:48:00 +01:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
[OMCB]kaban
aec2c3fef2
HotFix: removed duplicated key.
...
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
2015-12-10 18:24:28 +03: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
[OMCB]kaban
b7a05e206e
Merge pull request #6 from acemod/master
...
Fork update from master
2015-12-10 18:14:52 +03: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
bux578
e9a669b03b
Merge pull request #2996 from havena/patch-1
...
fix Unexpected stringtable format
2015-12-09 20:42:33 +01:00
havena
6f0568c370
fix Unexpected stringtable format
...
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +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
