Commit Graph

4871 Commits

Author SHA1 Message Date
jonpas
defe356940 New-school .format, Fixed prefix 2015-05-23 02:26:48 +02:00
jonpas
02580d510d Added mainprefix and prefix variables
Fixed prefix variable values
2015-05-22 19:59:56 +02:00
ulteq
9536423f2e Merge pull request #1353 from acemod/cleanup_ATragMX_AB
Removed a deprecated function and fixed some typos.
2015-05-22 18:42:20 +02:00
ulteq
e88c570ef2 Removed a deprecated function and fixed some typos. 2015-05-22 18:42:09 +02:00
jaynus
7913f27229 Merge branch 'master' of github.com:acemod/ACE3 2015-05-22 07:25:01 -07:00
jaynus
582ea318d4 Merge remote-tracking branch 'origin/superTime'
Conflicts:
	addons/frag/functions/fnc_fired.sqf
	addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
Glowbal
2c00f7b11e Merge pull request #1350 from BullHorn7/docs
Fix copypasta
2015-05-22 16:24:49 +02:00
Nicolás Badano
24542300f2 Merge pull request #1349 from BullHorn7/installation
Docs: Add zeus, add images to installation
2015-05-22 11:06:09 -03:00
BullHorn
c82b7dc6d6 Fix copypasta 2015-05-22 16:42:37 +03:00
BullHorn
a1dd0cfae5 Docs: installation - convert .png to .jpg
Edit the file extensions according to the edit done on gh-pages per bux'
request
2015-05-22 16:34:31 +03:00
BullHorn
690a800884 Merge remote-tracking branch 'upstream/master' into installation 2015-05-22 16:34:00 +03:00
Garth "L-H" de Wet
3703394bae Merge pull request #1340 from acemod/defuseObjectForAllExplosives
Defuse object for all explosives
2015-05-22 15:22:31 +02:00
BullHorn
6c5fb94d9b Docs: missionmaker - add Zeus
Add Zeus module description to modules.md
2015-05-22 16:16:32 +03:00
BullHorn
2abafc5147 Docs: Add zeus.md and fix others
Add zeus.md for ACE3 Zeus feature/module
Fix standardization of vehiclelock.md, weather.md and windeflection.md
2015-05-22 15:51:36 +03:00
bux578
f71812c4ed Merge pull request #1345 from BullHorn7/installation
Doc: Installation-guide - improve
2015-05-22 14:30:18 +02:00
BullHorn
c7f77a610f Update installation-guide.md - add images
Add images for Vanilla and A3S launchers
2015-05-22 13:42:13 +03:00
BullHorn
c208bb3fce Doc: Installation-guide - improve
Divide Installation process from Launch process
2015-05-22 12:54:00 +03:00
PabstMirror
72020a43f1 Privates / Remove Debug 2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8 Create Defuse Helpers for spawned Explosives 2015-05-21 17:47:54 -05:00
jaynus
46751fd912 Merge pull request #1163 from acemod/fragSpallOptimization
Frag spall optimization
2015-05-21 15:08:07 -07:00
jaynus
3cb4094429 Merge branch 'fragSpallOptimization' of github.com:acemod/ACE3 into fragSpallOptimization 2015-05-21 15:07:12 -07:00
jaynus
c297257421 Disable frag by default. Add @pabstmirror fix closes #1339 closes #820 2015-05-21 15:06:55 -07:00
Felix Wiegand
fd2676c7b9 Merge pull request #1135 from acemod/fcsPrivates
FCS - Privates
2015-05-21 22:18:14 +02:00
PabstMirror
6cd90d15e7 Merge pull request #1292 from alganthe/mk6mortar
mk6mortar and missing entries
2015-05-21 14:02:59 -05:00
Glowbal
8b69b3b1b1 Merge pull request #1332 from acemod/medicalBinocTreatment
Fix Script Error when treating with bincos
2015-05-21 20:20:41 +02:00
ulteq
c4bd97c016 Merge pull request #1338 from acemod/kestrelPersistentRefHeading
Persistent reference heading for the Kestrel 4500.
2015-05-21 19:29:13 +02:00
ulteq
24b2fea303 Persistent reference heading for the Kestrel 4500. 2015-05-21 19:28:59 +02:00
ulteq
90ffee4ce6 Merge pull request #1333 from acemod/negativeTailwinds
Tailwinds are displayed as negative values.
2015-05-21 19:18:43 +02:00
ulteq
1816208997 Proper Min/Max storing of negative tailwind values. 2015-05-21 19:18:15 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
jaynus
1f105a9596 Merge remote-tracking branch 'origin/master' into superTime 2015-05-21 09:36:20 -07:00
bux578
4c5f20fa1a shields.io is down atm 2015-05-21 17:12:30 +02:00
bux578
af5b7779b2 version update for readme.md 2015-05-21 17:07:29 +02:00
bux578
4f944bbf04 Merge pull request #1327 from BullHorn7/installation
Docs: Installation guide
2015-05-21 16:57:08 +02:00
Glowbal
a4e5bfff95 Merge pull request #1323 from gienkov/patch-18
Update medical guide
2015-05-21 12:31:06 +02:00
BullHorn
74d146078b Update installation-guide.md - style 2015-05-21 13:22:09 +03:00
ulteq
db7c2a19e6 Tailwinds are displayed as negative values. 2015-05-21 11:14:37 +02:00
BullHorn
1054dc0654 Docs: installation - rename file 2015-05-21 10:44:52 +03:00
PabstMirror
1aa9520adb Fix Script Error when treating with bincos 2015-05-20 23:24:44 -05:00
Nicolás Badano
72d955bc0c Merge pull request #1328 from alef/master
Fixed: Removed § typo at the end of EH call
2015-05-20 19:01:52 -03:00
Nicolás Badano
e322d5f541 Merge pull request #1331 from kavinsky/fixPathCapitalization
Fixed Capitalized folders on include paths
2015-05-20 18:58:24 -03:00
Kavinsky
4b048553e2 wops... corrected wrong path 2015-05-20 23:44:50 +02:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
ulteq
7d3bb526dd Merge pull request #1263 from acemod/bulletTraceTweak
Slightly increased the bullet trace effect size
2015-05-20 22:12:37 +02:00
ulteq
149e3ae8b0 Slightly decreased the visibility of the bullet trace effect. 2015-05-20 22:12:02 +02:00
BullHorn
542c606946 Docs: installation - fix url
Replace ACE3 release URL with /latest/
2015-05-20 23:10:22 +03:00
Alessandro Foresi
67319b6808 Fixed: Removed § at the end of EH call 2015-05-20 22:04:19 +02:00
BullHorn
c1d01e8963 Docs: Installation guide
First draft.
Need to add PWS guide
Verify nothing important is missing
2015-05-20 22:01:58 +03:00
jaynus
e6270f6e39 Fixed: Font config breaking checkPBO 2015-05-20 10:42:24 -07:00
KoffeinFlummi
f16f282abd Merge remote-tracking branch 'origin/release' into master-fix
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00