Glowbal
|
27106ce59f
|
minor refactor
|
2015-05-28 20:54:13 +02:00 |
|
jonpas
|
baca5a25d5
|
Merge branch 'master' into checkpboSettings
Conflicts:
addons/common/XEH_postInit.sqf
|
2015-05-28 20:52:35 +02:00 |
|
jonpas
|
86264a7b7d
|
Reworked ACE_Settings/Module functions to support both dynamically, Added SettingsInitialized
|
2015-05-28 20:49:30 +02:00 |
|
ulteq
|
4ad82d9629
|
Switched to ctrlCreate to avoid aspect ratio problems with the listbox.
|
2015-05-28 20:13:22 +02:00 |
|
jonpas
|
d597149fc6
|
Merge branch 'master' into nametagsToggle
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/XEH_postInit.sqf
addons/nametags/functions/fnc_onDraw3d.sqf
addons/nametags/stringtable.xml
|
2015-05-28 19:51:40 +02:00 |
|
ulteq
|
697710d40d
|
Initial draft of the range card implementation.
|
2015-05-28 19:17:29 +02:00 |
|
IngoKauffmann
|
ab31891b8d
|
runOnHover can now be CODE
Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
|
2015-05-28 18:16:05 +02:00 |
|
Garth L-H de Wet
|
529e200a4c
|
Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.
|
2015-05-28 17:56:45 +02:00 |
|
BullHorn
|
de1bfa8f80
|
fix typo, add inert/not-inert description
|
2015-05-28 18:04:08 +03:00 |
|
Macusercom
|
489751f5aa
|
More German string fixed
As recommended...
|
2015-05-28 16:21:53 +02:00 |
|
BullHorn
|
da34cfa296
|
Merge remote-tracking branch 'origin/docs-optional' into docs-optional
|
2015-05-28 16:54:55 +03:00 |
|
BullHorn
|
fcd7ff5287
|
docs: optional pbos - add notice for mod makers
|
2015-05-28 16:51:53 +03:00 |
|
BullHorn
|
f00a032e17
|
Add notice for mod-makers
|
2015-05-28 16:41:23 +03:00 |
|
Nicolás Badano
|
6332e035a7
|
Merge pull request #1412 from Tourorist/patch-4
Alphabetized the contributor list
|
2015-05-28 10:03:26 -03:00 |
|
Nicolás Badano
|
5f70001ac0
|
Merge pull request #1409 from acemod/gogglesCacheSurfaceDust
Goggles - Cache Surface Dust
|
2015-05-28 09:48:42 -03:00 |
|
Bracconiere
|
670c1f8805
|
All comments off (shields stable?)
Easier to check how it loads throughout the day
|
2015-05-28 14:57:45 +03:00 |
|
Bracconiere
|
30156599db
|
All's working for now.
|
2015-05-28 14:55:45 +03:00 |
|
Bracconiere
|
6e0ca1badc
|
It's only the Issues badge that's acting up now
|
2015-05-28 14:45:21 +03:00 |
|
Bracconiere
|
33b2db186e
|
Commented out the problematic shields
|
2015-05-28 14:39:56 +03: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 |
|
Bracconiere
|
4a6a29b784
|
Removed flat styling, it's already a default.
|
2015-05-28 13:43:19 +03:00 |
|
Bracconiere
|
b7c2961765
|
Flat styling is redundant, it is the default now
|
2015-05-28 13:27:39 +03:00 |
|
Bracconiere
|
7ac3aa0baf
|
TEST: What if it wasn't flat
|
2015-05-28 13:25:44 +03:00 |
|
Bracconiere
|
87384e0717
|
Testing as HTTPS
|
2015-05-28 13:10:41 +03:00 |
|
Bracconiere
|
3796ab264e
|
Test fix
|
2015-05-28 12:57:37 +03:00 |
|
Glowbal
|
5df9bb4a60
|
Merge pull request #1322 from acemod/SendSettingsDirectlyInsteadOfSplitting
Send directly to extension instead of splitting it
|
2015-05-28 11:54:11 +02:00 |
|
Bracconiere
|
355f22351b
|
README_PL: Updated shields
|
2015-05-28 12:36:14 +03:00 |
|
PabstMirror
|
2cf9519702
|
Send to extension directly
|
2015-05-28 04:33:13 -05:00 |
|
Bracconiere
|
30a48bad7d
|
Shields back up
Also, changed the download link from source code to the official compiled version.
|
2015-05-28 12:18:31 +03:00 |
|
PabstMirror
|
bfa75b833d
|
Merge branch 'master' into debugButton
|
2015-05-28 04:12:30 -05:00 |
|
PabstMirror
|
b29a75b7f6
|
Use new ace version html
|
2015-05-28 03:22:19 -05:00 |
|
PabstMirror
|
0c31adab61
|
Merge branch 'master' into mainMenuVersionHTML
|
2015-05-28 03:15:38 -05:00 |
|
PabstMirror
|
236ae767b5
|
Goggles - Cache Surface Dust
|
2015-05-28 00:18:45 -05:00 |
|
PabstMirror
|
3a4a02e524
|
#1407 - Make Saline 500ml match mass blood/plasma
|
2015-05-27 16:23:25 -05:00 |
|
jonpas
|
700c4cb962
|
Removed mistakenly added quotes in realisticnames comments
|
2015-05-27 22:57:50 +02:00 |
|
jonpas
|
b85ae8f194
|
Fixed missed external strings
|
2015-05-27 22:34:57 +02:00 |
|
jonpas
|
0b0f7274d7
|
Applied ESTRING and ECSTRING macros
|
2015-05-27 22:04:41 +02:00 |
|
jonpas
|
a99c02ff02
|
Added ESTRING and ECSTRING for external module references
|
2015-05-27 22:02:03 +02:00 |
|
jonpas
|
1c58ff823d
|
Stringtable fixes medical
|
2015-05-27 21:58:35 +02:00 |
|
jonpas
|
6f6f2a55f0
|
Stringtable fixes except medical
|
2015-05-27 21:43:30 +02:00 |
|
jonpas
|
87db721d4f
|
Stringtable fixes up to medical
|
2015-05-27 21:19:14 +02:00 |
|
PabstMirror
|
5f2bee09e4
|
Create Defuse Helpers on demand
|
2015-05-27 14:09:06 -05:00 |
|
Glowbal
|
7dd01ebb69
|
Merge pull request #1389 from acemod/possibleFixMedicalUnloadPatient
Possible fix medical unload patient
|
2015-05-27 19:34:23 +02:00 |
|
PabstMirror
|
9ed15d9702
|
Merge pull request #1302 from acemod/nameTagFixes
Nametags - Use EyePos of target / windows
|
2015-05-27 12:19:17 -05:00 |
|
Macusercom
|
5cb0953094
|
Fixed German translations
Fixed some typos and phrases
|
2015-05-27 19:11:32 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
PabstMirror
|
30adc2d463
|
Patch Merge of PR #1156 - Optics for tripplehead
|
2015-05-27 11:28:06 -05:00 |
|
Nicolás Badano
|
c365008330
|
Merge pull request #1275 from acemod/fixUAVandInteractionInhert
Fix UAV and Interaction Compile Inheritance
|
2015-05-27 12:20:46 -03:00 |
|
jonpas
|
600fe61f72
|
Added STRING and CSTRING Macros
|
2015-05-27 17:10:34 +02:00 |
|
Nicolás Badano
|
d3a50bce53
|
Merge pull request #1214 from acemod/reliableSettings
Reliable settings framework
|
2015-05-27 12:10:08 -03:00 |
|