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
6,434 Commits 73 Branches 88 Tags 752 MiB
94a5b38cf6
Commit Graph

6434 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
SilentSpike
91ca532496 Preserve equipment, added comments 2015-07-02 23:43:33 +01:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31 finddisplay into curatorcamera 2015-07-02 19:36:34 +02:00
SilentSpike
8c98f98472 Fixed end mission code on server 2015-07-02 16:42:40 +01:00
SilentSpike
eeeb543424 Simplified default pen position assignment 2015-07-02 16:30:37 +01:00
SilentSpike
4df1738b43 Don't move respawn markers 
Exit on HC
Only run end mission PFH on server
 2015-07-02 16:23:25 +01:00
SilentSpike
3a4a32382d Removed empty stringtables 2015-07-02 15:56:01 +01:00
Nicolás Badano
13f5b08892 Merge pull request #1760 from voiperr/master 
ACE_Spectator
 2015-07-02 10:52:59 -03:00
SzwedzikPL
c2e4ee431f no pain effect in zeus camera 2015-07-02 13:56:56 +02:00
Nicolás Badano
cabddf89b7 Merge pull request #1007 from acemod/userActionPrototype 
Add Actions to buildings (UserActions - Ladders)
 2015-07-01 18:11:38 -03:00
PabstMirror
89305473a2 Add performance note. 2015-07-01 15:50:14 -05:00
Nicolás Badano
6157deb904 Merge pull request #1776 from SzwedzikPL/rhs_compat 
RHS Headgear compat to hearing
 2015-07-01 17:42:45 -03:00
SzwedzikPL
46e51f6788 rhs headgear compat 2015-07-01 22:25:19 +02:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05:00
PabstMirror
b02086ca52 Intersection Check / FOV adjustment 2015-07-01 14:53:59 -05:00
Nicolás Badano
790d8d404e Merge pull request #1773 from alganthe/documentation_pass_8 
Documentation pass 8
 2015-07-01 16:34:45 -03:00
Nicolás Badano
6cfaba04cb Merge pull request #1775 from SzwedzikPL/hearing_headgear 
Headgear influence on hearing
 2015-07-01 16:32:14 -03:00
SzwedzikPL
6b4eeedbad headgear influence on hearing 2015-07-01 21:21:09 +02:00
Josuan Albin
d1187ad82e Documentation pass 8 
- Finished: MicroDAGR doc, note that the images can't be viewed properly on GitHub.
- Coding guidelines are more readable now, added the STRING family of macros to it.
- How to enable dragging / carrying added to dragging / carrying framework with a BIG disclaimer that the functions are not public and may change.
- Shortcut updated to fit the convention established in the shortcut page.
 2015-07-01 21:19:26 +02:00
PabstMirror
319e50a9cc Viewdistance - Fix Error Missing ) 2015-07-01 12:39:49 -05:00
Nicolás Badano
10ef88b655 Merge pull request #1596 from SzwedzikPL/interaction_box_inventory 
Open action for boxes
 2015-07-01 12:59:24 -03:00
Nicolás Badano
9d0dcc5ea2 Merge pull request #1757 from Winter259/viewdistance-settings-init 
Viewdistance settingsInitialized
 2015-07-01 12:58:07 -03:00
Nicolás Badano
e01ff79e41 Merge pull request #1759 from jonpas/addEarplugsEnhancement 
Exit addEarplugs if earplugs are used
 2015-07-01 12:48:14 -03:00
jonpas
8f0101a1d9 Merge branch 'master' into addEarplugsEnhancement 
Conflicts:
	addons/hearing/functions/fnc_addEarPlugs.sqf
 2015-07-01 17:45:00 +02:00
Nicolás Badano
86b9174b6c Merge pull request #1764 from jonpas/extrasCleanup 
Organized extras/assets/icons, Added Thumbs.db to .gitignore
 2015-07-01 11:33:26 -03:00
Nicolás Badano
f175490298 Merge pull request #1772 from acemod/aceModuleSyncronizedObjects 
Ace_modules - Pass synced objects to functions
 2015-07-01 11:33:03 -03:00
Nicolás Badano
f1f31cd94a Merge pull request #1769 from acemod/mapShakePanning 
Allow moving map while shake effect active
 2015-07-01 11:31:31 -03:00
Nicolás Badano
d06ac6cace Merge pull request #1771 from acemod/fixRallyPoint 
Rally point object names
 2015-07-01 11:30:32 -03:00
Nicolás Badano
1e8d4327df Merge pull request #1763 from naizarak/patch-1 
Update fnc_addEarPlugs.sqf
 2015-07-01 11:22:59 -03:00
ulteq
f7a866fa2a Merge pull request #1770 from FadiCBB/master 
Correcting RHS class inheritence from my previous PR
 2015-07-01 12:45:14 +02:00
PabstMirror
57f88fe77a Ace_modules - Pass synced objects to functions 2015-07-01 01:53:15 -05:00
PabstMirror
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
Fadi
acc8a08d52 Cleaning up unnessecary spaces 2015-07-01 00:36:46 -05:00
Fadi
9c2009217b Correcting RHS class inheritence for ace_isbelt 2015-07-01 00:34:49 -05:00
PabstMirror
c58ff8d31d #1736 - Allow moving map while shake effect active 2015-07-01 00:13:55 -05:00
Joko
30111b4f15 Fix Merge Problems 
Use CString Macro
 2015-07-01 03:03:51 +02:00
Joko
737753fbab Merge branch 'acemod-master' 2015-07-01 02:52:25 +02:00
Joko
a74bc3a748 Merge branch 'master' of https://github.com/acemod/ACE3 into acemod-master 
Conflicts:
	AUTHORS.txt
	addons/parachute/CfgVehicles.hpp
 2015-07-01 02:49:29 +02:00
PabstMirror
c1dd2df57a Move grid funcs and map long,lat,altitude to common 2015-06-30 12:26:51 -05:00
PabstMirror
ccebb4f86a Merge branch 'master' into 10digitGrids2 
Conflicts:
	addons/microdagr/functions/fnc_updateDisplay.sqf
 2015-06-30 11:25:55 -05:00
PabstMirror
923018a9f6 mdagr use getMapPosFromGrid 2015-06-30 11:18:47 -05:00
PabstMirror
1f47ffc5de Error checking, handle out of bounds grids 2015-06-30 11:11:53 -05:00
PabstMirror
1f7994e10f Calc real X and Y offsets 2015-06-29 21:18:21 -05:00
jonpas
f08bd7acc2 Improved Slide Duration module option description 2015-06-29 22:24:16 +02:00
Nicolás Badano
a284cc3f6b Merge pull request #1755 from ToasterBR/master 
Translation to Brazilian Portuguese (PT-BR)
 2015-06-29 17:22:38 -03:00
jonpas
71609c70e6 Properly moved PNGs and shortened folder tree of extras/assets/icons, Added Thumbs.db to .gitignore 2015-06-29 22:21:07 +02:00
jonpas
a9c6e3c065 Disabled debug 2015-06-29 22:14:38 +02:00
jonpas
bb3495468e Replaced PFH for waitAndExecute with PFH-like handling 2015-06-29 22:13:28 +02:00
jonpas
9ee75dbb21 Multiple modules support 2015-06-29 21:54:40 +02:00