Commit Graph

7252 Commits

Author SHA1 Message Date
f419762653 Fix time of flight display 2015-09-14 23:33:32 -05:00
61cbe543ee Fix #2432 - Don't check for null attached when mounted 2015-09-14 18:06:46 -05:00
16b7bb389c Merge pull request #2428 from acemod/FixMainMenuInfo151
Fix main menu info151
2015-09-14 23:30:00 +02:00
d52cc917ea Merge pull request #2419 from acemod/FixBBTexturePath2
Fix Bandage Texture Path and UV
2015-09-14 23:26:00 +02:00
4b6082d836 Merge pull request #2424 from acemod/medical-tweaks
Medical tweaks
2015-09-14 23:20:50 +02:00
7b7ad6eea8 fixed tweak to basic bandage 2015-09-14 23:18:20 +02:00
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
cbc86a1280 Merge pull request #2408 from acemod/FixRTPinMDAGR
Posible fix for #2407
2015-09-14 16:01:55 -05:00
10ac127159 Fixed incorrect new damage value in handleDamage advanced.
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
2015-09-14 21:15:57 +02:00
33ac78dbac Addresses the large amount of bandages required in basic medical
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
2015-09-14 21:14:56 +02:00
8c60e76979 Tweaks made to improve determine if fatal algorithm 2015-09-14 21:13:58 +02:00
37639066c2 Include missing frame in the caching execution 2015-09-14 15:19:58 +02:00
6d4744b9ea Increased duration of knock down for basic medical 2015-09-14 15:19:18 +02:00
032dd6c87c Tweaked visual effects. 2015-09-14 15:18:56 +02:00
fb75f6ad9e Fix Bandage Texture Path and UV 2015-09-13 18:57:07 +02:00
b2b41ce8af Merge branch 'release' of https://github.com/acemod/ACE3 into release 2015-09-12 18:13:12 +02:00
5feee53c69 Posible fix for #2407 2015-09-12 18:12:57 +02:00
33a7340c8c Merge branch 'spectatorRespawnTemplate' into release 2015-09-12 14:04:17 +01:00
e6c2916a14 Fix spectator template for negligible respawnDelay
When the value of respawn delay is 0 the timing of the killed and respawn events can be a little strange and result in spectator being entered but never exited. The respawn template should just do nothing when the delay is so small.
2015-09-12 14:02:42 +01:00
e59a4163f7 Merge pull request #2404 from acemod/330bloodPressureReadoutFix
change order of BloodPressure readout, fix #2400
2015-09-12 11:01:23 +02:00
9748abdb48 change order of BloodPressure readout, fix #2400 2015-09-12 10:58:29 +02:00
bda41f2cd1 Merge branch 'orbitalSpectator' into release 2015-09-11 14:46:50 +01:00
aa7b6cf39f Improve angular behaviour of spectator camera
Changes the position calculation of the external spectator camera to correctly retain the pan and tilt of the free camera. Makes transitioning between the two less disorienting for the user.
2015-09-11 14:46:21 +01:00
77c2b99ee5 Change spectator external camera behaviour
Using the "external" view is limited by the server difficulty setting. Instead the spectator external camera has been replaced with an oribtal camera as was originally planned to be added alongside the default views.
2015-09-11 14:46:21 +01:00
17f9eab03a Improve display name of medical heal hitpoints setting
ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing
2015-09-11 12:33:18 +01:00
f60954a49b increased build number (3.3.0.1) 2015-09-10 22:18:13 +02:00
70dfbe2ec0 Fix some merging errors 2015-09-10 22:11:09 +02:00
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
82d9e70c88 Merge pull request #2385 from jokoho48/BackBlastEnhanced
Back blast enhanced
2015-09-09 19:39:32 +02:00
1ed52e08bf fix missing default 2015-09-08 19:45:46 +02:00
6a31140f7d Version 3.3.0 2015-09-08 19:38:52 +02:00
d6b51b2138 Merge pull request #2374 from acemod/microDagr
Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373
2015-09-08 19:31:02 +02:00
0c371ddf37 disabled debug for medical 2015-09-08 19:06:01 +02:00
74cb948323 Merge pull request #2177 from alganthe/documentation_pass_11
documentation pass 11
2015-09-07 18:49:24 +02:00
b3da51c1c5 information center typo fix 2
THE FINAL COUNTDOOOOWN TADADA DAA DDADADA DA DA
2015-09-07 18:28:08 +02:00
a28e9d96c7 Czech Translations - Update 2015-09-07 17:40:14 +02:00
46b4c43911 reloadlauncher typo fix and sitting framework removed 2015-09-07 16:59:29 +02:00
a602feb5ba information center typos fix 2015-09-07 16:54:09 +02:00
aac356cff8 how to report an issue typos fix 2015-09-07 16:45:05 +02:00
12caa51040 reloadlaunchers typos fix 2015-09-07 16:30:59 +02:00
5cefa11c68 HuntIR typos fix 2015-09-07 16:27:52 +02:00
d2013794ec mk6 mortar typos fix 2015-09-07 16:25:37 +02:00
127af91037 Merge pull request #2308 from gienkov/pl-translation-7
PL Translation
2015-09-07 16:16:54 +02:00
ad50c1ab4b medical and repair translation 2015-09-07 16:15:18 +02:00
7f6e7de68c Add LoD
Lower Poly in Shadow LoD
2015-09-07 16:10:55 +02:00
c4475ff5be Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7 2015-09-07 16:06:17 +02:00