Commit Graph

124 Commits

Author SHA1 Message Date
SzwedzikPL
3bb16508df Update authors.txt 2015-06-04 22:55:21 +02:00
Dimas
a3a2c66775 Update AUTHORS.txt
Corrected my email address due to a missing letter.
2015-06-03 16:06:16 +02:00
KoffeinFlummi
fa73aec15b Merge https://github.com/Macusercom/ACE3 into german-merge 2015-06-01 14:27:49 +02:00
Macusercom
a44546af83 Added my name to AUTHORS.txt 2015-05-30 23:38:08 +02:00
Bracconiere
4ef8bbace8 Alphabetized the contributor list
More recent additions seem to have been just stacked unsorted at the bottom.
2015-05-28 14:30:26 +03:00
jonpas
eea09390dd Added @legman to AUTHORS.txt 2015-05-16 19:07:40 +02:00
BullHorn
77374212c0 Authors.txt - add BullHorn 2015-05-15 14:18:11 +03:00
esteldunedain
32f7854bf6 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into viewdistance 2015-05-14 14:09:12 -03:00
jaynus
d5a8f21480 Merge pull request #1087 from SilentSpike/zeustemp
Added zeus changes module as per #1082
2015-05-14 09:32:03 -07:00
esteldunedain
5b856e0966 Merge branch 'master' into viewdistance
Conflicts:
	AUTHORS.txt
2015-05-14 10:55:31 -03:00
Dharma Bellamkonda
7c1875b624 add name to authors.txt 2015-05-12 18:31:03 -06:00
SilentSpike
e0c658560b Added myself to authors.txt 2015-05-10 15:33:03 +01:00
Alessandro Foresi
87974b12b2 Added: Myself as contributor 2015-05-10 00:06:41 +02:00
SAM
96e1e9c59f Added name + email to authors.txt 2015-05-08 18:46:30 +02:00
ToasterBR
1ae2b640c2 Added myself to Authors
Nick and real email included
2015-05-02 03:45:57 -03:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
adam3adam
1189bd69e6 Added author
adam3adam added
2015-05-01 23:27:28 +02:00
KoffeinFlummi
2d1af98af5 Add nikolauska to AUTHORS
Also remove Bla's email address as per request.
2015-05-01 23:09:30 +02:00
Felix Wiegand
15f1680c20 Add Bla1337 to AUTHORS file 2015-05-01 01:47:59 +02:00
KoffeinFlummi
a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
bux578
95536f0a94 update authors.txt 2015-04-29 10:10:30 +02:00
ulteq
2a759aba70 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-04-28 18:55:23 +02:00
NukeDev
67a4b7ea30 Authors.txt 2015-04-28 18:12:05 +02:00
Josuan Albin
b5524fb3ee French pass
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
Dimas
e6e8765134 Update AUTHORS.txt
Added myself
2015-04-27 15:27:51 +02:00
Brisse89
882bfd711b Update AUTHORS.txt
Added myself, including e-mail (only made two minor contributions so far though)
2015-04-26 23:50:03 +02:00
ulteq
a148ded254 Added an e-mail address 2015-04-26 21:15:04 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +02:00
Simon Reuter
769953d8c1 Update AUTHORS.txt
Added email address.
2015-04-26 14:46:04 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
OnkelDisMaster
51abafd099 Added my name to AUTHORS.txt
Added myself to the contirbutors, after #485
2015-04-20 20:28:34 +02:00
Tachii
e6f29cfdb1 Update AUTHORS.txt 2015-04-16 18:23:00 +03:00
Tachii
f5078020fb Update AUTHORS.txt
https://github.com/acemod/ACE3/blob/master/addons/movement/config.cpp

I want to be famous!
2015-04-16 18:20:40 +03:00
Clon1998
fa14befe63 Update AUTHORS.txt
Added my self to the # CONTRIBUTORS
2015-04-15 20:51:29 +02:00
Marco
ead2b1f064 Update AUTHORS.txt 2015-04-15 17:52:12 +02:00
KoffeinFlummi
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
Coren4
9b94692ca5 Update AUTHORS.txt 2015-04-15 15:02:36 +02:00
Felix Wiegand
3032c84eda Merge pull request #577 from nomisum/patch-3
added myself to authors.txt as requested
2015-04-15 14:54:15 +02:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
Pierre (meat)
c76abbe98a Update AUTHORS.txt
blackpixxel was twice listed
2015-04-14 19:57:23 +02:00
nomisum
128a6f3e0f added myself to authors.txt 2015-04-14 16:09:04 +02:00
Harakhti
35044fa16b Contribution!
It feels awkward to add myself on a list.
2015-04-14 00:06:50 +02:00
ulteq
6f5a03d4e2 Merged Blackpixxel back into the contributor list 2015-04-13 21:33:48 +02:00
commy2
f4f69deb83 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 11thmeu-master 2015-04-13 20:22:36 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Pierre (meat)
c9e048e6b3 Update AUTHORS.txt 2015-04-13 20:03:19 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
jaynus
c9e2eb0869 Changed: no-crosshair reticle for Titan by BlackPixxel 2015-04-12 14:05:12 -07:00
KoffeinFlummi
390a777286 Merge branch 'patch-1' of https://github.com/Kllrt/ACE3
Conflicts:
	AUTHORS.txt
2015-04-12 15:55:17 +02:00
ruPaladin
215f3059f3 Update AUTHORS.txt
Russian translation
2015-04-12 15:33:24 +03:00
Asgar
32400a21ac update AUTHORS.txt 2015-04-12 10:49:22 +02:00
Felix Wiegand
0efcd7d56f Merge pull request #499 from gienkov/patch-2
AUTHORS.TXT / e-mail of me and ACCtomeek
2015-04-12 04:23:59 +02:00
Felix Wiegand
4d1e21d362 Merge pull request #500 from licht-im-Norden87/patch-4
Update AUTHORS.txt
2015-04-12 03:41:18 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
licht-im-Norden87
200c380622 Update AUTHORS.txt 2015-04-12 03:16:42 +02:00
Grzegorz
2182e8b631 e-mail of me and ACCtomeek 2015-04-12 03:15:57 +02:00
Kllrt
37a80139b8 Update AUTHORS.txt 2015-04-12 00:56:58 +02:00
FreeZbe
2ccec59b80 Update AUTHORS.txt 2015-04-12 00:14:33 +02:00
EpMAK
8406031a6e Update AUTHORS.txt 2015-04-12 00:03:45 +03:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master
Count the commander camera as a 3rd person camera
2015-04-10 21:54:52 +02:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
Kavinsky
7c2b1a4ecc Added Kavinsky to AUTHORS.txt 2015-04-10 17:03:07 +02:00
Legolasindar
fa9923c027 Update AUTHORS.txt
added my email
2015-04-10 16:15:53 +02:00
Anthariel
396f6bd0ea Update AUTHORS.txt 2015-04-10 06:34:36 +02:00
KoffeinFlummi
bfca14493a Update AUTHORS file 2015-04-04 01:04:03 +02:00
bux578
869e36eb5f added email address 2015-02-02 19:22:07 +01:00
PabstMirror
5958aab66f Update AUTHORS.txt 2015-02-01 14:21:30 -06:00
KoffeinFlummi
979222d21c Add AGM authors list 2015-01-11 22:36:31 +01:00