[OMCB]kaban
|
298b475433
|
Fix due to review
|
2015-09-05 05:15:29 +03:00 |
|
[OMCB]kaban
|
ce49f752f1
|
Fix due to review
|
2015-09-05 05:14:34 +03:00 |
|
[OMCB]kaban
|
1bad390dba
|
Fix due to review
|
2015-09-05 05:09:47 +03:00 |
|
[OMCB]kaban
|
8ef007b727
|
Fix due to review
|
2015-09-05 05:08:16 +03:00 |
|
[OMCB]kaban
|
6c48a4a0de
|
Fix due to review
|
2015-09-05 05:07:18 +03:00 |
|
[OMCB]kaban
|
85b0127f56
|
Fix due to review
|
2015-09-05 05:00:18 +03:00 |
|
[OMCB]kaban
|
6f7437bb80
|
Fix due to review
|
2015-09-05 04:57:07 +03:00 |
|
[OMCB]kaban
|
f69b94af98
|
Fix due to review
|
2015-09-05 04:53:30 +03:00 |
|
[OMCB]kaban
|
421f7bc6f8
|
Fix due to review
|
2015-09-05 04:38:39 +03:00 |
|
[OMCB]kaban
|
9f416b796c
|
Fix due ti review
|
2015-09-05 02:07:26 +03:00 |
|
ViperMaul
|
4c0c7bc290
|
debug change
|
2015-09-04 10:21:10 -07:00 |
|
ViperMaul
|
7f58d5a94d
|
Revert "Adding same ADV special case to BASIC handle damage." -Not Needed
This reverts commit bf267246bf .
|
2015-09-04 10:20:34 -07:00 |
|
ViperMaul
|
bf267246bf
|
Adding same ADV special case to BASIC handle damage.
|
2015-09-04 07:48:16 -07:00 |
|
ViperMaul
|
2bc20501bc
|
Adding more debug
|
2015-09-04 07:46:35 -07:00 |
|
ViperMaul
|
813e54a668
|
Fixing Debug for object variable hasPain
|
2015-09-04 07:37:20 -07:00 |
|
ViperMaul
|
89b0c05929
|
Fixed a debug statement.
|
2015-09-03 13:17:59 -07:00 |
|
commy2
|
b737f42777
|
fix error when opening triage card
|
2015-09-03 18:30:29 +02:00 |
|
bux578
|
9e1ae58f4f
|
fix restore gear
|
2015-09-03 18:17:53 +02:00 |
|
PabstMirror
|
f63e652636
|
Merge pull request #2334 from acemod/mapToolsAspectRatio
MapTools - Handle Bad Aspect Ratio
|
2015-09-03 10:44:34 -05:00 |
|
commy2
|
795b7a893f
|
Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2
|
2015-09-03 17:18:32 +02:00 |
|
ViperMaul
|
6d28214287
|
Add some debug values.
|
2015-09-03 08:18:37 -07:00 |
|
commy2
|
0bd92af072
|
fix variables not inited, csat armor scaleing
|
2015-09-03 17:17:54 +02:00 |
|
commy2
|
e753131f2d
|
arms and legs to vulnerable, better scaling for pilots and csat
|
2015-09-03 16:17:48 +02:00 |
|
commy2
|
a84be46ed4
|
fix errors from cleanup
|
2015-09-03 15:49:49 +02:00 |
|
commy2
|
0436209dae
|
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments
|
2015-09-03 15:33:53 +02:00 |
|
commy2
|
736be74c2b
|
Merge pull request #2344 from acemod/322hideclock
hide clock on map if no watch in inventory, #414
|
2015-09-03 13:44:20 +02:00 |
|
commy2
|
36b42f2780
|
Merge pull request #2343 from acemod/322flares
scripted approach to hand flares, fix #1079
|
2015-09-03 13:44:04 +02:00 |
|
commy2
|
529c85df58
|
Merge pull request #2338 from acemod/322sit
Sitting improvements
|
2015-09-03 13:43:53 +02:00 |
|
commy2
|
6b7f84b297
|
add missing ;
|
2015-09-03 13:39:17 +02:00 |
|
commy2
|
76bb2bd2b8
|
replace function with FUNC macro
|
2015-09-03 13:37:36 +02:00 |
|
commy2
|
a187be7255
|
sort flashbang under explosive grenades
|
2015-09-03 13:23:15 +02:00 |
|
PabstMirror
|
024dc3effe
|
Cleanup
|
2015-09-03 00:16:48 -05:00 |
|
PabstMirror
|
789de9d111
|
runAfterSettingsInit helper func
|
2015-09-03 00:11:49 -05:00 |
|
PabstMirror
|
cbccd898ea
|
Run functions after setting init
|
2015-09-02 23:58:24 -05:00 |
|
kaban
|
15fe2c32b8
|
Russian Translations - Update
|
2015-09-03 04:58:08 +03:00 |
|
kaban
|
08b7110e58
|
Russian Translations - Update
|
2015-09-03 04:54:52 +03:00 |
|
kaban
|
50b05fcdf0
|
Russian Translations - Update
|
2015-09-03 04:38:38 +03:00 |
|
commy2
|
fbf00b9aa5
|
correct comment
|
2015-09-03 02:55:40 +02:00 |
|
kaban
|
91cae690c0
|
Russian Translations - Update
|
2015-09-03 03:36:15 +03:00 |
|
ProfessorCZ
|
44fa520bdd
|
Czech Translations - Update
|
2015-09-03 01:20:24 +02:00 |
|
PabstMirror
|
c213c0e05a
|
Merge pull request #2352 from jonpas/slideshowPrivates
Cleaned up Slideshow privates
|
2015-09-02 16:10:31 -05:00 |
|
jonpas
|
def2d29501
|
Cleaned up slideshow privates
|
2015-09-02 22:51:31 +02:00 |
|
jonpas
|
0bbf4d4128
|
Prevent Cargo opening if vehicle is locked
|
2015-09-02 22:24:46 +02:00 |
|
Glowbal
|
f38d245771
|
fixed bloodloss for basic medical
|
2015-09-02 21:56:00 +02:00 |
|
commy2
|
f939f9215e
|
stop flickering of wounds, fix #346
|
2015-09-02 20:49:17 +02:00 |
|
commy2
|
7d2f1f52a4
|
remove protection, hitpoint config (fix ubc), some debug stuff
|
2015-09-02 20:13:51 +02:00 |
|
commy2
|
dc5e6b7c3c
|
Merge branch '323medicalstrcturaldamage' into medical-adjustments
|
2015-09-02 20:02:19 +02:00 |
|
commy2
|
9665f73fa3
|
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments
|
2015-09-02 17:03:36 +02:00 |
|
SilentSpike
|
6aa191b788
|
Merge pull request #2327 from acemod/fixGunnerGoggles
Fix gunner goggles
|
2015-09-02 13:31:50 +01:00 |
|
commy2
|
07ab7d1c35
|
correct comment
|
2015-09-02 02:00:53 +02:00 |
|