Glowbal
032dd6c87c
Tweaked visual effects.
2015-09-14 15:18:56 +02:00
SilentSpike
33a7340c8c
Merge branch 'spectatorRespawnTemplate' into release
2015-09-12 14:04:17 +01:00
SilentSpike
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
Glowbal
e59a4163f7
Merge pull request #2404 from acemod/330bloodPressureReadoutFix
...
change order of BloodPressure readout, fix #2400
2015-09-12 11:01:23 +02:00
bux578
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02:00
SilentSpike
bda41f2cd1
Merge branch 'orbitalSpectator' into release
2015-09-11 14:46:50 +01:00
SilentSpike
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
SilentSpike
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
SilentSpike
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
Glowbal
f60954a49b
increased build number (3.3.0.1)
2015-09-10 22:18:13 +02:00
KoffeinFlummi
70dfbe2ec0
Fix some merging errors
2015-09-10 22:11:09 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Glowbal
82d9e70c88
Merge pull request #2385 from jokoho48/BackBlastEnhanced
...
Back blast enhanced
2015-09-09 19:39:32 +02:00
jokoho48
1ed52e08bf
fix missing default
2015-09-08 19:45:46 +02:00
Glowbal
6a31140f7d
Version 3.3.0
2015-09-08 19:38:52 +02:00
Glowbal
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
Glowbal
0c371ddf37
disabled debug for medical
2015-09-08 19:06:01 +02:00
bux578
74cb948323
Merge pull request #2177 from alganthe/documentation_pass_11
...
documentation pass 11
2015-09-07 18:49:24 +02:00
alganthe
b3da51c1c5
information center typo fix 2
...
THE FINAL COUNTDOOOOWN TADADA DAA DDADADA DA DA
2015-09-07 18:28:08 +02:00
ProfessorCZ
a28e9d96c7
Czech Translations - Update
2015-09-07 17:40:14 +02:00
alganthe
46b4c43911
reloadlauncher typo fix and sitting framework removed
2015-09-07 16:59:29 +02:00
alganthe
a602feb5ba
information center typos fix
2015-09-07 16:54:09 +02:00
alganthe
aac356cff8
how to report an issue typos fix
2015-09-07 16:45:05 +02:00
alganthe
12caa51040
reloadlaunchers typos fix
2015-09-07 16:30:59 +02:00
alganthe
5cefa11c68
HuntIR typos fix
2015-09-07 16:27:52 +02:00
alganthe
d2013794ec
mk6 mortar typos fix
2015-09-07 16:25:37 +02:00
Glowbal
127af91037
Merge pull request #2308 from gienkov/pl-translation-7
...
PL Translation
2015-09-07 16:16:54 +02:00
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
jokoho48
7f6e7de68c
Add LoD
...
Lower Poly in Shadow LoD
2015-09-07 16:10:55 +02:00
gienkov
c4475ff5be
Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7
2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
alganthe
84afb0f602
medical system typos fix
2015-09-07 15:56:09 +02:00
alganthe
96b7c42a63
maptools typos fix
2015-09-07 15:56:09 +02:00
Glowbal
7b349ab388
Merge pull request #2361 from acemod/medical-adjustments2
...
Medical adjustments2
2015-09-07 15:51:27 +02:00
nsgundy
eee5664ec5
Move MicroDAGR 3D model from BFT branch to microdagr module
2015-09-07 11:05:18 +02:00
ViperMaul
2fc35338d5
Build number for Release Candidate
2015-09-06 21:37:20 -07:00
Felix Wiegand
fe99cf83b3
Change alt text on slack badge
2015-09-07 00:50:22 +02:00
Felix Wiegand
ad8660c989
Add slack badge to README
2015-09-07 00:44:15 +02:00
jokoho48
45eb8c4822
Add Code for CBA update 2.1
2015-09-06 19:34:46 +02:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
[OMCB]kaban
78084f271a
Changed "Effect Zeus RC" to "Affects Zeus RC"
2015-09-06 07:11:27 +03:00
ViperMaul
98202f4f38
Additional debug statements for caching and wounds.
2015-09-05 15:31:14 -07:00
Glowbal
a745b07cb6
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
...
Used new setting init delay function in addSpareParts
2015-09-05 21:18:25 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
jonpas
a8412361bd
Use setting init delay function for addSpareParts
2015-09-05 19:33:25 +02:00
Joko
b03589ec34
Merge pull request #2364 from TheMagnetar/patch-1
...
Repair: Fix possible out of bounds setting
2015-09-05 19:18:15 +02:00
