Commit Graph

3107 Commits

Author SHA1 Message Date
jaynus
d8d658602f Apply to all aircraft gunner and pilot 2015-04-21 12:50:42 -07:00
Glowbal
0ab25a2866 fixed #659 2015-04-21 21:41:00 +02:00
ulteq
2fa39615f3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-21 21:06:30 +02:00
jaynus
b2f978da3c Added unstabalized optic mode to comanche for following the chopper. Is the first optic, all other zoom levels are stabalized. Fixes #556 2015-04-21 12:01:30 -07:00
jaynus
08203b26c7 Illuminate map for gunner of helicopters. Fixes #558 2015-04-21 11:58:07 -07:00
ulteq
d7f67970a4 Fixed a bug in the wind direction init code 2015-04-21 20:55:04 +02:00
ulteq
1db9f055e2 Removed debug output 2015-04-21 20:54:47 +02:00
ulteq
428baefc2c Added random temperatureShift, badWeatherShift, humidityShift 2015-04-21 20:41:50 +02:00
ulteq
30d1b1b5e5 Fixed a typo in the updateTemperature function 2015-04-21 20:20:22 +02:00
ulteq
af4fdda477 Continued work on the new wind system:
* Moved the wind data into CfgWorlds.hpp
* Modified the contents of ACE_WIND_PARAMS
* new getWind function for the clients
* new wind init based on the real world weather data
2015-04-21 20:20:05 +02:00
Nicolás Badano
ce3cc71869 Merge pull request #795 from acemod/fixAuthor
remove author from items inheriting ACE_ItemCore
2015-04-21 15:08:53 -03:00
Nicolás Badano
421954c829 Merge pull request #794 from Legolasindar/master
updated stringtable for spanish
2015-04-21 15:07:12 -03:00
bux578
3897b73d56 remove author from items inheriting ACE_ItemCore 2015-04-21 19:16:54 +02:00
PabstMirror
be031801ab #770 - m84 - don't add pain if strength is low 2015-04-21 12:09:58 -05:00
Ivan Navarro Cabello
55887b7cfe updated stringtable for spanish
added some spanish translate
2015-04-21 19:03:55 +02:00
bux578
7b4f451d8a reduce m84 mass
m84 weighs ~260g compared to a m18 with ~520g. Ingame the m18 has a mass
of 4 but giving the m84 a mass of 2 seems odd to me. That's why I've
reduced it from 10 to 4.
2015-04-21 19:00:13 +02:00
ulteq
7c57ad25bd Fixes a recently introduced bug in the relative click memory 2015-04-21 16:54:26 +02:00
ulteq
287c0d62ca Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-21 16:03:28 +02:00
ulteq
e22a7e1aad Improved the range card column spacing 2015-04-21 16:01:53 +02:00
ulteq
c27f3fb131 Added target speed direction switch / Improved the solution result output 2015-04-21 15:46:53 +02:00
ulteq
4833193860 Added a new solution setup menu 2015-04-21 15:01:23 +02:00
ulteq
c24586ce02 Reworked the result output GUI on the main page 2015-04-21 11:53:28 +02: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
commy2
616eee6aa4 remove broken launcher anim 2015-04-21 06:22:41 +02:00
commy2
5093307756 experiment with launcher anim 2015-04-21 06:10:30 +02:00
commy2
de660cf45f messing with animations 2015-04-21 05:21:04 +02:00
commy2
5e440686bb put weapon on back without having to stand up 2015-04-21 04:43:24 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05: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
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
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
ae3c8e3d88 weapon select keys are optional 2015-04-20 21:10:56 +02:00
commy2
43707342a8 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into wselect 2015-04-20 20:07:48 +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
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
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
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
Glowbal
d1fabf9733 Merge branch 'master' into medicalFixes 2015-04-19 17:26:10 +02:00
Grzegorz Sikora
4283e07942 PL fix 2015-04-19 13:50:08 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +02:00
ulteq
a73c0bc429 Sord is now able to transmit the direction of fire 2015-04-19 12:40:13 +02:00
ulteq
2b5b89604e Removed unused RscControlsGroup 2015-04-19 12:29:26 +02:00
ulteq
f6263e9e8b Overworked the scope click feature:
*TODO: Add the "Setting Up a Solution for Your Scope" screen
2015-04-19 12:07:27 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
ulteq
874858ebb4 Added a sanity check to the cycle gun list function
*Top/Down buttons only cycle the gun list in the main/gun list menu
2015-04-19 11:43:20 +02:00
ulteq
5195271894 Fixes: https://github.com/acemod/ACE3/commit/4235163
*The asterix needs to be shown on distances shown in meters not yards
2015-04-19 11:32:02 +02:00
ulteq
4430e8a0ee Increased the minimum barometric pressure value that is accepted 2015-04-19 11:18:37 +02:00
ulteq
4235163801 Added asterix (*) prefix to distances in yards on the main page 2015-04-19 11:14:18 +02:00
ulteq
de5c5139c0 Moved a private declaration out of the hot path 2015-04-19 11:02:25 +02:00
ulteq
8f20303a08 Fixed a bug in the atmosphere unit conversion 2015-04-19 11:02:06 +02:00
ulteq
336a192302 The range card setup data is now also restored on mission start 2015-04-19 10:57:55 +02:00
ulteq
51590d39ad Cleaned up the ATragMX postInit routine 2015-04-19 10:47:43 +02:00
ruPaladin
d8b96066e6 Rus translation (nametags) 2015-04-19 11:01:41 +03:00