Commit Graph

3923 Commits

Author SHA1 Message Date
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
Grzegorz Sikora
222aceaf56 PL fix 2015-04-20 17:11:22 +02:00
Grzegorz
5d2d13ec00 Merge pull request #5 from acemod/master
Update master
2015-04-20 17:04:40 +02:00
ulteq
ac74e6c611 More WIP 2015-04-20 16:33:36 +02:00
commy2
6c00aef6e8 coeficients for recoil configs 2015-04-20 16:02:36 +02:00
ulteq
8aa69663d6 More WIP 2015-04-20 16:01:13 +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
esteldunedain
7953919b89 Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis 2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis 2015-04-20 10:24:24 -03:00
commy2
d8fbb49bbd Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into recoil 2015-04-20 15:14:57 +02:00
ulteq
9155056a50 Proof of concept wind code (custom debug output enabled) 2015-04-20 15:11:14 +02:00
ruPaladin
08caf0c695 Updated russian translation (medical)
Перевел как смог, вероятно данная настройка будет в ACE3 Настройки. Нужно проверить влезет ли туда. Если влезет, то подкорректировать перевод. Правки строго приветствуются.
2015-04-20 15:18:17 +03: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
PabstMirror
822bd22c97 gj git 2015-04-20 02:18:46 -05:00
PabstMirror
e747234443 Cleanup Spelling 2015-04-20 02:17:47 -05:00
PabstMirror
8c449a454b merge conflict 2015-04-19 23:57:15 -05: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
ViperMaul
5793175c1f Fixing issue when release directory is missing
#552
2015-04-19 16:00:34 -07:00
ViperMaul
9c11e47ef4 Missing changes that Git Extensions client left out #552 2015-04-19 15:28:54 -07:00
simon84
a950a91766 Merge remote-tracking branch 'acemod/master' 2015-04-20 00:22:13 +02:00
ViperMaul
ac201d334c Added support for building server.pbo
Added new optionals_root to make.cfg
Updated version
Added global variables. #552
2015-04-19 14:51:51 -07: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