179 Commits

Author	SHA1	Message	Date
PabstMirror	980da16826	FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution	2016-05-10 10:09:52 -05:00
looter	2f6b932511	Merge branch 'master' into c4996	2016-04-08 07:33:21 -05:00
bux578	ada519a59c	sort people	2016-03-29 20:35:34 +02:00
FFAAMOD	67695286c7	Added FFAAMOD to AUTHORS.txt	2016-03-02 20:01:41 +01:00
jonpas	f7d89479f5	Move jonpas to Core Team in AUTHORS.txt and remove typo	2016-02-22 22:08:10 +01:00
Thomas Kooi	8055eae580	Merge pull request #3210 from acemod/taggingX ... Tagging X	2016-02-20 17:05:02 +01:00
looterz	dffc087a50	Update AUTHORS.txt	2016-02-17 17:41:17 -06:00
Thomas Kooi	f47b51c0cb	Merge pull request #3070 from dixon13/newCivInteraction ... Changes to civilian interaction	2016-02-05 09:14:45 +01:00
Nicolás Badano	dadec15948	Merge pull request #2104 from acemod/trenches ... Trenches	2016-02-04 23:43:06 -03:00
Joko	a6d84eca8e	add GitHawk to AUTHORS	2016-02-04 21:08:34 +01:00
esteldunedain	2d45a28863	Merge branch 'master' into trenches	2016-02-04 17:04:09 -03:00
Thomas Kooi	f26fb9e9da	Merge pull request #3107 from jonpas/headless ... Add Dynamic AI Group Tranferring to Headless Clients	2016-02-04 20:00:16 +01:00
fr89k	bd9587981d	Added email address for fr89k	2016-01-29 13:58:01 +01:00
fr89k	ddd63bf1a8	AUTHORS.txt now in alphabetical order	2016-01-29 13:54:57 +01:00
fr89k	d2296411d8	As bux578 requested: Added myself to AUTHORS.txt ... Forgot to change the AUTHORS.txt in the last pull request	2016-01-29 13:45:52 +01:00
esteldunedain	1d886ac624	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2016-01-23 17:39:54 -03:00
esteldunedain	e113853395	Merge branch 'master' into tagging	2016-01-20 18:51:41 -03:00
jonpas	971d8d1e02	Add @System98 to AUTHORS.txt	2016-01-02 14:35:39 +01:00
dixon13	16fdde3500	Update AUTHORS.txt	2015-12-23 19:18:23 -07:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
voiper	675006a22f	Add name to authors.txt	2015-11-29 16:56:48 -08:00
Thomas Kooi	c132ef86cf	Merge pull request #2133 from jonpas/dynamicViewDistance ... Mk 1 eyeballs Integration	2015-11-28 20:40:29 +01:00
Broström.A | Evul	de90960127	Update AUTHORS.txt	2015-10-29 22:51:06 +01:00
Glowbal	8e4bc264cc	Merge branch 'master' into map_gestures ... Conflicts: AUTHORS.txt	2015-10-18 12:20:54 +02:00
[OMCB]kaban	085b60bddd	Added some name to AUTHORS.txt	2015-09-05 05:45:25 +03:00
BaerMitUmlaut	01c37f5bb5	Merge fix	2015-09-02 20:00:17 +02:00
Glowbal	2b3957324c	Merge pull request #2262 from jonpas/readmeFix ... Updated README.md files	2015-08-29 22:37:40 +02:00
Michael Braun	fa4ae6c9a8	Merge branch 'master' of https://github.com/acemod/ACE3 into map_gestures ... Conflicts: AUTHORS.txt	2015-08-29 22:22:16 +02:00
jonpas	ea79e5ef01	Updated DE readme, Fixed issues, ACE to ACE3	2015-08-25 19:30:34 +02:00
bux578	329c3591e4	add head's email address	2015-08-24 16:37:07 +02:00
bux	e7bf803056	fix order of authors, move joko to core	2015-08-24 13:19:18 +02:00
jonpas	b6a24fdb1e	Added Arkhir's email to AUTHORS.txt	2015-08-12 22:38:39 +02:00
jonpas	936e6868bc	Added README.md to viewdistance and Arkhir to AUTHORS.txt	2015-08-12 22:34:16 +02:00
Glowbal	800b254004	Merge branch 'master' into trenches ... Conflicts: AUTHORS.txt	2015-08-10 23:48:07 +02:00
Michael Braun	90e4d005ee	Give credit where credit is due	2015-08-10 08:45:43 +02:00
Michael Braun	bd79a7b8f5	Updated AUTHOR file	2015-08-02 03:30:19 +02:00
PabstMirror	bf4e95e750	Merge pull request #1548 from acemod/fingering ... Fingering	2015-07-26 16:47:41 -05:00
bux578	bd6cff2e37	fix conflict	2015-07-26 21:29:53 +02:00
SilentSpike	159937dc45	Merge branch 'master' into ace_spectator ... Conflicts: addons/explosives/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/map/stringtable.xml addons/medical/stringtable.xml addons/sitting/stringtable.xml addons/spectator/stringtable.xml extras/assets/icons/Icons_Modules.psd	2015-07-26 14:15:24 +01:00
PabstMirror	c6f21f48a4	Merge branch 'master' into fingering	2015-07-25 17:28:22 -05:00
Glowbal	f0a2c7c454	Merge pull request #1854 from jonpas/lookUp ... Increased ability to look up	2015-07-25 20:41:46 +02:00
SilentSpike	c48719a644	Attribution for F3 project devs	2015-07-17 16:45:16 +01:00
jonpas	a25ee37762	Added @Karneck to authors	2015-07-15 03:29:20 +02:00
BaerMitUmlaut	0d2db27b17	Merge remote-tracking branch 'upstream/master' into tagging ... Conflicts: AUTHORS.txt	2015-07-08 19:15:57 +02:00
BaerMitUmlaut	86fbe3c423	Added myself to contributors	2015-07-07 17:31:40 +02:00
Joko	fa900452ea	Add DAGR (by Blackpixxel) ... Add QuikClot to Medical (by Blackpixxel) Add QuikClot Litter (by Blackpixxel) Update Blackpixxel at Author Fix IRStrobe Texture Path	2015-07-05 22:21:17 +02:00
PabstMirror	88e0b67364	Merge branch 'master' into fingering	2015-07-05 12:30:31 -05:00
Joko	0c099dc4d1	Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) ... Add PaxJaromeMalues to AUTHORS	2015-07-04 22:50:32 +02:00
TheBamse	61b77332a1	Fixed spacings and alphabetical order.	2015-06-23 13:24:13 +02:00
TheBamse	e7c06fb8d7	Added me to the authors list.	2015-06-22 21:37:14 +02:00
SilentSpike	93f6c48acf	Moved myself	2015-06-22 00:33:18 +01:00
Grey-Soldierman	b6ce169170	Added Entrenching Tool	2015-06-17 15:04:23 +01:00
PabstMirror	ebc55ca6cd	Merge pull request #1542 from TheDrill/master ... Base Finger Port	2015-06-07 15:04:45 -05:00
ulteq	39ba85b213	New low-poly Kestrel model	2015-06-07 18:17:09 +02:00
Drill	96e073e66d	Initial commit for finger-pointing module	2015-06-07 12:10:50 +03:00
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