Thomas Kooi
|
2930fab6c6
|
Merge pull request #3354 from acemod/playerBodybags
Fix bagging respawning players (alt)
|
2016-02-20 17:26:07 +01:00 |
|
Thomas Kooi
|
911cba81b7
|
Merge pull request #3347 from GitHawk/refuel_removedTruck
Handling disconnect and removal of fuel truck
|
2016-02-20 17:24:32 +01:00 |
|
Thomas Kooi
|
ff7dbfa9f2
|
Merge pull request #3305 from GitHawk/dagr_fix
Disable ACE_Laser for choppers (aka Changes to DAGR)
|
2016-02-20 17:17:46 +01:00 |
|
Thomas Kooi
|
6048d15847
|
Merge pull request #3290 from acemod/nametagsOptimization
Nametags optimization
|
2016-02-20 17:15:01 +01:00 |
|
Thomas Kooi
|
14b526d417
|
Merge pull request #3272 from acemod/deadmanBombVest
Deadman switch - trigger explosives in inventory
|
2016-02-20 17:11:06 +01:00 |
|
PabstMirror
|
918413030b
|
Short Circuit Tagging
|
2016-02-20 10:08:41 -06:00 |
|
Thomas Kooi
|
427b14e3ba
|
Merge pull request #3245 from GitHawk/rearm_fix
Fixing setVehicleAmmo for rearm
|
2016-02-20 17:08:37 +01:00 |
|
Thomas Kooi
|
8055eae580
|
Merge pull request #3210 from acemod/taggingX
Tagging X
|
2016-02-20 17:05:02 +01:00 |
|
Thomas Kooi
|
8d12f1cc08
|
Merge pull request #3130 from acemod/ab-subsonicAmmo
AB - Handle subsonic ammo when configs not defined
|
2016-02-20 17:01:22 +01:00 |
|
bux578
|
76bacf184d
|
Merge pull request #2237 from gienkov/patch-29
Make reserve steerable
|
2016-02-20 17:00:51 +01:00 |
|
Thomas Kooi
|
2e47cb5b40
|
Merge pull request #3079 from jonpas/tacticalLadderFixes
Prevent Tactical Ladder interaction if unit on ladder
|
2016-02-20 16:59:23 +01:00 |
|
Thomas Kooi
|
1e3596b92a
|
Merge pull request #3043 from acemod/Mortar_interact
Mortar interaction and ammunition handling
|
2016-02-20 16:57:55 +01:00 |
|
Thomas Kooi
|
4f10d551d6
|
Merge pull request #2949 from gienkov/fixWoundCount
ceil number of wounds
|
2016-02-20 16:56:17 +01:00 |
|
Thomas Kooi
|
27c6934ff2
|
Merge pull request #2230 from SzwedzikPL/interactions_lamps
Interaction with portable lamps
|
2016-02-20 16:47:28 +01:00 |
|
Thomas Kooi
|
fbcfbb92a6
|
Merge pull request #3346 from acemod/betterFlashEffects
Better flash effects
|
2016-02-20 10:22:57 +01:00 |
|
PabstMirror
|
fc3bb0de6b
|
Fix #3355 - add missing semi-colons
|
2016-02-19 18:51:25 -06:00 |
|
PabstMirror
|
dffcbc7650
|
Cleanup events
|
2016-02-19 15:45:37 -06:00 |
|
PabstMirror
|
44b526ab6d
|
bodybag - hide player corpse and delete later
Fix #1301
|
2016-02-19 15:41:13 -06:00 |
|
PabstMirror
|
488d24bc01
|
Fix cargo loading on the big huron containers
|
2016-02-19 15:30:23 -06:00 |
|
PabstMirror
|
ed653456e5
|
Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
|
2016-02-19 15:09:40 -06:00 |
|
esteldunedain
|
f2566afc73
|
Another 5m of effect
|
2016-02-19 15:22:24 -03:00 |
|
bux578
|
d601e50b15
|
Merge pull request #3350 from gienkov/patch-2
medical PL translation
|
2016-02-19 19:21:15 +01:00 |
|
bux578
|
ecf2cd58ca
|
Merge pull request #3351 from gienkov/patch-1
frag PL translation
|
2016-02-19 19:21:04 +01:00 |
|
Grzegorz
|
95250c8ecd
|
medical PL translation
3.5.0 ready
|
2016-02-19 19:10:59 +01:00 |
|
Grzegorz
|
99e24aab6d
|
frag PL translation
3.5.0 ready
|
2016-02-19 19:07:00 +01:00 |
|
Githawk
|
5b908b4be8
|
Adding disconnect EH
|
2016-02-19 17:32:02 +01:00 |
|
Githawk
|
e925c48798
|
Adding HandleDisconnect EH and deletion of fuel truck
|
2016-02-19 17:24:32 +01:00 |
|
esteldunedain
|
b420512139
|
Fix reduction based on looking away from the grenade
|
2016-02-19 12:34:50 -03:00 |
|
esteldunedain
|
9e5f52d161
|
Make units heavily affected by the blast turn away from the light.
|
2016-02-19 12:33:49 -03:00 |
|
esteldunedain
|
0f7853f6c6
|
Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539
|
2016-02-19 12:18:22 -03:00 |
|
esteldunedain
|
648a0259ec
|
Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage.
|
2016-02-19 12:02:29 -03:00 |
|
Thomas Kooi
|
95532ea521
|
Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
|
2016-02-19 12:00:00 +01:00 |
|
commy2
|
e66dafeab9
|
Merge pull request #2339 from acemod/322jump
don't force free looking while jumping
|
2016-02-19 11:54:30 +01:00 |
|
commy2
|
08e09d5cbd
|
manual merge
|
2016-02-19 11:50:17 +01:00 |
|
commy2
|
97008d8fc3
|
Merge pull request #3131 from acemod/removedep
remove deprecated functions
|
2016-02-19 11:48:20 +01:00 |
|
commy2
|
5d0d8576ea
|
Merge pull request #3288 from SzwedzikPL/edenassignsettings
Repair & medical object attributes for eden editor
|
2016-02-19 11:47:26 +01:00 |
|
PabstMirror
|
f6a19e8dd4
|
Merge pull request #3341 from looterz/readme-3278
Update README to reflect #3278
|
2016-02-18 16:43:35 -06:00 |
|
looterz
|
4999f30e0b
|
Updated README's to reflect #3278
|
2016-02-18 16:39:23 -06:00 |
|
PabstMirror
|
d2a3f35c80
|
Fix deleted czech strings from merge
|
2016-02-18 13:39:14 -06:00 |
|
bux
|
8063163b9c
|
Merge branch 'licht-im-Norden87-patch-25'
|
2016-02-18 20:06:39 +01:00 |
|
bux
|
49f565f541
|
fix merging errors
|
2016-02-18 20:05:30 +01:00 |
|
ViperMaul
|
14c5558bbf
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2016-02-18 10:50:52 -08:00 |
|
ViperMaul
|
52b3f1e219
|
Bump version to 3.4.3
|
2016-02-18 10:50:33 -08:00 |
|
bux578
|
93e655588b
|
Merge pull request #3294 from gienkov/pltranslations
pl translation
|
2016-02-18 19:38:43 +01:00 |
|
bux
|
52438856fe
|
Merge branch 'looterz-issue-template'
|
2016-02-18 19:30:32 +01:00 |
|
bux
|
e2d072973e
|
adjust wording in github templates, add pr template
|
2016-02-18 19:29:33 +01:00 |
|
bux
|
cec86bf895
|
Merge branch 'issue-template' of https://github.com/looterz/ACE3 into looterz-issue-template
|
2016-02-18 19:21:51 +01:00 |
|
bux578
|
178ca42fab
|
Merge pull request #3336 from acemod/steamWSServer
Add steam workshop support
|
2016-02-18 19:18:00 +01:00 |
|
looterz
|
092906b19e
|
Moved ISSUE_TEMPLATE.md and CONTRIBUTING.md to the new .github folder
|
2016-02-18 11:54:39 -06:00 |
|
bux
|
34691decdf
|
add meta.cpp to make.py importantFiles array
|
2016-02-18 17:00:19 +01:00 |
|