PabstMirror
|
a501c7e1c3
|
Remove new models and just combine existing litter
|
2015-12-11 19:47:40 -06:00 |
|
jonpas
|
e5f64bcdc1
|
Fix refuel PFH not exiting on nozzle disconnect
|
2015-12-11 22:45:28 +01: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 |
|
PabstMirror
|
cae9f436f6
|
Merge branch 'release'
|
2015-12-08 15:14:33 -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 |
|
Joko
|
55f6237b88
|
Merge pull request #2948 from gienkov/removeOriginal
remove Original entries
|
2015-12-05 22:33:58 +01:00 |
|
gienkov
|
f6e7cad678
|
remove Original entries
|
2015-12-05 22:08:39 +01:00 |
|
PabstMirror
|
b13656e54b
|
addDamageToUnit - Disable debug / testing code
|
2015-12-05 12:19:34 -06:00 |
|
IngoKauffmann
|
b80a7803c7
|
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
|
2015-12-05 16:00:51 +01:00 |
|
IngoKauffmann
|
a7dff52d6a
|
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
|
2015-12-05 16:00:23 +01: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 |
|