Glowbal
89a1306605
Merge branch 'master' into KeyPressesWhileUnconscious
2015-04-20 22:19:40 +02:00
Glowbal
362051e2db
Merge pull request #717 from acemod/medicalFixes
...
Medical fixes
2015-04-20 22:16:57 +02:00
Glowbal
f7719f0e0a
tab
2015-04-20 22:08:31 +02:00
Glowbal
842bfe0b98
enabled advanced wounds setting
2015-04-20 22:00:11 +02:00
Glowbal
90cf882e02
Using setvar instead of event sync again
2015-04-20 21:58:27 +02:00
Glowbal
8be7ccaab7
setting for moving unit from group on unconscious
2015-04-20 21:37:30 +02:00
commy2
12f3bb8dfd
Merge pull request #762 from acemod/wselect
...
remove weapon select in favor of the new controls from bi
2015-04-20 21:12:28 +02:00
commy2
ae3c8e3d88
weapon select keys are optional
2015-04-20 21:10:56 +02:00
Felix Wiegand
fead905d83
Merge pull request #781 from OnkelDisMaster/patch-3
...
Added my name to AUTHORS.txt
2015-04-20 20:34:25 +02:00
OnkelDisMaster
51abafd099
Added my name to AUTHORS.txt
...
Added myself to the contirbutors, after #485
2015-04-20 20:28:34 +02:00
commy2
43707342a8
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into wselect
2015-04-20 20:07:48 +02:00
Felix Wiegand
f61ffb707e
Merge pull request #486 from OnkelDisMaster/patch-2
...
script_component.hpp for asdg_comp
2015-04-20 19:58:50 +02:00
Felix Wiegand
c92a6d5e11
Merge pull request #485 from OnkelDisMaster/patch-1
...
Config for compatiblity to ASDG Joint Rails
2015-04-20 19:58:43 +02:00
OnkelDisMaster
a1afd87342
Update config.cpp
2015-04-20 19:56:10 +02:00
commy2
438b6a1adb
Merge pull request #618 from acemod/recoil
...
Recoil overhaul
2015-04-20 19:47:02 +02:00
commy2
ed72697141
Merge pull request #728 from acemod/error
...
Show error message and quit mission if a dll isn't present
2015-04-20 19:41:38 +02:00
esteldunedain
66af69def8
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-20 13:55:42 -03:00
esteldunedain
9295393dd6
Allow cursor for interactions
2015-04-20 13:54:51 -03:00
commy2
ea368511b7
ace extensions class for modularity
2015-04-20 18:48:58 +02:00
commy2
14214090dc
manual merge
2015-04-20 18:22:17 +02:00
commy2
16c6a3ee78
tweaking recoil
2015-04-20 17:38:45 +02:00
commy2
6c00aef6e8
coeficients for recoil configs
2015-04-20 16:02:36 +02:00
KoffeinFlummi
06a4f3d10e
Remove tabler comments.
2015-04-20 15:48:50 +02:00
KoffeinFlummi
e8cd918b90
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-20 15:46:36 +02:00
commy2
d8fbb49bbd
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into recoil
2015-04-20 15:14:57 +02:00
ulteq
be378adfee
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-20 13:54:28 +02:00
ulteq
89e33dc177
Refactored the weather module:
...
* No changes in functionality
2015-04-20 13:54:22 +02:00
bux578
89f6b6bfd0
Merge pull request #766 from ruPaladin/patch-3
...
Rus translation (nametags)
2015-04-20 13:23:04 +02:00
bux578
13b11d7225
Merge pull request #768 from Tachii/patch-17
...
Update stringtable.xml
2015-04-20 13:02:38 +02:00
ulteq
6c2982548f
Fixed incorrect function header
2015-04-20 12:35:08 +02:00
ulteq
0e08fd4457
Incremented the ATragMX profile namespace version
2015-04-20 11:09:12 +02:00
ulteq
de0414803e
Fixed some more airFriction values in the ATragMX gun list
2015-04-20 11:08:28 +02:00
ulteq
c049ee5c08
Fixed incorrect .408 Chey Tac airFriction value
2015-04-20 11:02:28 +02:00
ulteq
2bf47ca0c4
Added two more asterix (*) meter indicator GUI elements
2015-04-20 10:36:20 +02:00
ulteq
8ff72e7fc8
Fixed another bug in the unit conversion code
2015-04-20 10:35:29 +02:00
esteldunedain
f928f37e26
Eliminate interact_menu fps drops due to high nearby object counts.
...
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
2015-04-20 01:16:51 -03:00
Tachii
20293bd11b
Update stringtable.xml
2015-04-20 00:26:20 +03:00
Grzegorz Sikora
8530684fa6
PL fix #2
2015-04-19 23:09:11 +02:00
Tachii
6c8b587890
Update stringtable.xml
2015-04-20 00:02:01 +03:00
ulteq
f7d35d5593
The ATragMX now also accounts for vertical coriolis drift (Eötvös effect)
2015-04-19 22:30:13 +02:00
Tachii
5038674aef
Update stringtable.xml
2015-04-19 23:01:38 +03:00
Tachii
60cab963bf
Update stringtable.xml
2015-04-19 23:00:51 +03:00
Glowbal
17899db086
added some missing privates
2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926
Merge branch 'master' into medicalFixes
2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785
Fixed: max litter scalar array, have internal values.
2015-04-19 09:04:42 -07:00
Tachii
a7d913b80e
Update stringtable.xml
2015-04-19 18:54:47 +03:00
Tachii
596fadcba0
ru translations fixes
...
Не стоит додумывать правильные значения или то, как вы думаете это должно интерпертироваться. Нужно переводить то, что написано. Как пример Very Light Wounds - это не царапины, это очень лёгкие ранения. Царапины - это scratches
2015-04-19 18:51:35 +03:00
Tachii
a83925dd2d
Update stringtable.xml
2015-04-19 18:43:05 +03:00
ulteq
20740679cc
Fixed inconsistent 'workingMemory' initialization
2015-04-19 17:40:49 +02:00
Glowbal
f6bbeb6bd6
switched back to old init method
2015-04-19 17:28:47 +02:00