Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,750 Commits 73 Branches 88 Tags 752 MiB
4eeb5a0e6c
Commit Graph

4750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
simon84
25e017c30b Revert "Revert "Revert "minor FCS changes (privatized variables, unnecessary counters)""" 
This reverts commit 4597da5c6c.
 2015-04-17 20:46:13 +02:00
Glowbal
b333e6e662 Keep units longer unconscious, instead of quickly fading in/out 2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229 Moved unconscious event, so it won't conflict in case the unit is still being carried 2015-04-17 20:38:02 +02:00
Glowbal
0234eedd54 Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit 2015-04-17 20:33:13 +02:00
commy2
0e90199e23 remove debug message 2015-04-17 20:29:01 +02:00
Glowbal
8b7e46c45f fixes #656 2015-04-17 20:26:28 +02:00
Glowbal
c86be12668 fixes #599 2015-04-17 20:24:05 +02:00
simon84
4597da5c6c Revert "Revert "minor FCS changes (privatized variables, unnecessary counters)"" 
This reverts commit 9f2dd61613.
 2015-04-17 20:23:26 +02:00
simon84
9f2dd61613 Revert "minor FCS changes (privatized variables, unnecessary counters)" 
This reverts commit ff0fb12ca3.
 2015-04-17 20:22:49 +02:00
Glowbal
111a350a84 Merge branch 'master' into advMedicalEventSync 2015-04-17 20:11:53 +02:00
Aleksey Yermakov
8a669c390a Update stringtable.xml 2015-04-17 20:35:34 +03:00
Felix Wiegand
f7de809c67 Merge pull request #673 from acemod/64bit-tools-merge 
Make make.py itself support 32-&64-bit systems ...
 2015-04-17 19:25:38 +02:00
Aleksey Yermakov
2f1ee94d91 Update stringtable.xml 2015-04-17 20:24:32 +03:00
jaynus
2be38c493c ACE JIP synchronized event infastructure. 2015-04-17 10:21:41 -07:00
PabstMirror
3b04e990a7 Merge pull request #713 from acemod/medicalGetVarDefaults 
Medical - Use default value instead of 0 for getVar
 2015-04-17 12:19:58 -05:00
Aleksey Yermakov
bf7a7b5bc9 Update stringtable.xml 2015-04-17 20:18:41 +03:00
PabstMirror
6e077de829 Medical - Use default value instead of 0 for getVar 
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
 2015-04-17 12:13:23 -05:00
jonpas
9cede7cf85 Module name Interact_Menu -> Interaction in documentation 2015-04-17 19:10:41 +02:00
Bracconiere
61d023456d Merge pull request #1 from usecforce/wiki-wording 
Wiki wording
 2015-04-17 19:59:24 +03:00
EpMAK
c88bda487b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	addons/weaponselect/stringtable.xml
 2015-04-17 19:48:01 +03:00
EpMAK
31a2f1b279 Russian translations 
Again, filling strings, fixing errors
 2015-04-17 19:36:07 +03:00
jonpas
2d5b10fb60 Module names 2015-04-17 17:45:10 +02:00
jonpas
ba576c5763 Capitalized Visual Studio, Corrected togglable spelling 2015-04-17 17:42:03 +02:00
jonpas
38f32cad0d bracket -> brace 2015-04-17 17:40:13 +02:00
PabstMirror
bb2383cffd #700 - ProgressBar Visual Improvement 2015-04-17 09:51:47 -05:00
ruPaladin
2698490569 medical (patient status semantic fixes) 2015-04-17 17:49:03 +03:00
jaynus
e83ab4049f Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
jaynus
3a94753645 tab 2015-04-17 07:28:59 -07:00
jaynus
6c3e699fdb tabs 2015-04-17 07:28:19 -07:00
jaynus
469dafd0c0 tab 2015-04-17 07:25:49 -07:00
KoffeinFlummi
1d93589ebc Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
commy2
f8f2748d28 Merge pull request #646 from acemod/wireCuttersSoundEffect 
Wire cutters sound effect
 2015-04-17 15:40:42 +02:00
commy2
7e275a43f4 Merge pull request #693 from acemod/parafix 
hide height / velocity while parachuting, freefallig in expert mode, fix #692
 2015-04-17 15:40:34 +02:00
commy2
77b057e188 Merge pull request #698 from acemod/dispofix 
disposable cleanup, fix #696
 2015-04-17 15:40:28 +02:00
ruPaladin
874cc75271 medical (semantic correction) 2015-04-17 16:22:02 +03:00
ruPaladin
52dc5d66a4 nametags (fix text overlapping, semantic correct) 2015-04-17 16:09:17 +03:00
ruPaladin
a4980a91e1 inventory (semantic correction) 2015-04-17 16:04:26 +03:00
ruPaladin
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
ruPaladin
766321224b hearing 2015-04-17 15:59:29 +03:00
ruPaladin
b80ec3f790 ballistics russian fixes + multilanguage fix 2015-04-17 15:57:25 +03:00
Lex Rivera
163ac7bd4a [realisticnames] Adjust MK-I. Enable actual names 2015-04-17 15:28:30 +03:00
ruPaladin
af876e3370 attach 2015-04-17 15:27:53 +03:00
bux578
a9008437aa Merge pull request #703 from EpMAK/master 
Russian stringtables finished
 2015-04-17 14:00:13 +02:00
EpMAK
c2214efeb1 Russian stringtables finished 
Filled all the missing lines, little errors fixed.
 2015-04-17 14:54:28 +03:00
Lex Rivera
2ca20f740e [realisticnames] adjust M14 2015-04-17 14:53:55 +03:00
Lex Rivera
8fc2e96367 [realisticnames] Adjust SPMG name, fix some russian 2015-04-17 14:49:43 +03:00
commy2
26944ea84e make altimeter actually usable with parachutes 2015-04-17 13:01:38 +02:00
commy2
73fd9ac62e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into parafix 2015-04-17 12:55:07 +02:00
commy2
558a4fb363 Merge pull request #461 from Tenga/altimeter-fix 
Altimeter fix, division by zero when no time has passed (game paused, etc.)
 2015-04-17 12:49:06 +02:00