Commit Graph

3393 Commits

Author SHA1 Message Date
ViperMaul
ced0d3d576 Removing extra spaces from the end of line #783 2015-04-21 10:02:56 -07:00
ViperMaul
cebe520513 Userconfig folder is now properly added to the release folder for final distribution.
#783
2015-04-21 08:47:55 -07:00
bux578
8a55c282e1 add repair module icon 2015-04-21 13:27:45 +02:00
ViperMaul
aabec2aea2 Converting Tabs to Spaces. Confirming UTF-8 2015-04-21 04:02:10 -07:00
ulteq
0cf2374475 Atmospheric Calc Method GUI improvement 2015-04-21 11:43:16 +02:00
ulteq
f98a0cdfae Overworked the scope click number GUI 2015-04-21 11:24:59 +02:00
ulteq
6c4b078dce Updated the default gun profile used for adding new profiles 2015-04-21 09:46:57 +02:00
esteldunedain
1fa9ba1cbf Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-20 18:24:50 -03:00
esteldunedain
90288b495e Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead. 2015-04-20 18:24:12 -03:00
PabstMirror
fdbd0c1905 #777 - mDagr - Update map pos each frame. 2015-04-20 16:12:01 -05:00
ViperMaul
fd7611e982 Merge pull request #773 from acemod/makeImportantFiles
Make.py and Make.cfg ehancements - Copy Important Files
2015-04-20 13:47:02 -07:00
ulteq
43560edd6e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-20 22:29:27 +02:00
ulteq
387572c560 Added some weapon class reference data 2015-04-20 22:29:15 +02:00
Nicolás Badano
2a945df150 Merge pull request #782 from acemod/nobag
hide open bag option when it's not selected via scroll wheel
2015-04-20 17:25:11 -03:00
Glowbal
8f62f38f97 Merge pull request #480 from acemod/KeyPressesWhileUnconscious
Escape and other keys need to be enabled while unconcious
2015-04-20 22:24:46 +02:00
ulteq
404eb87631 Added some ammo class reference data 2015-04-20 22:24:37 +02:00
Glowbal
1df42b17c2 close all dialogs 2015-04-20 22:22:09 +02:00
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
commy2
afc8abce85 hide open bag option when it's not selected via scroll wheel 2015-04-20 22:00:13 +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